diff --git a/.gitignore b/.gitignore index 3cc8a1d8a4..e8dac890f7 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ Source/Core/Common/Src/scmrev.h *.ipch .sconsign.dblite Externals/scons-local/* +.DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e4f14f5e..ea531f030c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,20 @@ # cmake_minimum_required(VERSION 2.6) +option(USE_GLES "Enables GLES And EGL, disables OGL" OFF) +option(USE_EGL "Enables EGL OpenGL Interface" OFF) +option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) + +option(FASTLOG "Enable all logs" OFF) +option(OPROFILING "Enable profiling" OFF) +option(OPENMP "Enable OpenMP parallelization" ON) +option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) +######################################## +# Optional Targets +# TODO: Add DSPSpy and TestSuite. +option(DSPTOOL "Build dsptool" OFF) +option(UNITTESTS "Build unitests" OFF) + # Update compiler before calling project() if (APPLE) # Use clang compiler @@ -86,43 +100,64 @@ endif() # version number set(DOLPHIN_VERSION_MAJOR "3") -set(DOLPHIN_VERSION_MINOR "0") +set(DOLPHIN_VERSION_MINOR "5") if(DOLPHIN_IS_STABLE) set(DOLPHIN_VERSION_PATCH "0") else() set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION}) endif() +message(${CMAKE_SYSTEM_PROCESSOR}) +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") + set(_M_GENERIC 1) + set(_M_ARM 1) + add_definitions(-marm -march=armv7-a) + add_definitions(-D_M_ARM=1) + add_definitions(-D_M_GENERIC=1) +endif() +# Set these next two lines to test generic +#set(_M_GENERIC 1) +#add_definitions(-D_M_GENERIC=1) # Various compile flags -add_definitions(-msse2) +if(NOT _M_GENERIC) + add_definitions(-msse2) +endif() + +include(CheckCXXCompilerFlag) +macro(check_and_add_flag var flag) + CHECK_CXX_COMPILER_FLAG(${flag} FLAG_${var}) + if(FLAG_${var}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + endif() +endmacro() # Enabling all warnings in MSVC spams too much if(NOT MSVC) add_definitions(-Wall) + + # TODO: would like these but they produce overwhelming amounts of warnings + #check_and_add_flag(EXTRA -Wextra) + #check_and_add_flag(MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers) + #check_and_add_flag(SWITCH_DEFAULT -Wswitch-default) + #check_and_add_flag(FLOAT_EQUAL -Wfloat-equal) + #check_and_add_flag(CONVERSION -Wconversion) + #check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant) + check_and_add_flag(TYPE_LIMITS -Wtype-limits) + check_and_add_flag(SIGN_COMPARE -Wsign-compare) + check_and_add_flag(IGNORED_QUALIFIERS -Wignored-qualifiers) + check_and_add_flag(UNINITIALIZED -Wuninitialized) + check_and_add_flag(LOGICAL_OP -Wlogical-op) + check_and_add_flag(SHADOW -Wshadow) + check_and_add_flag(INIT_SELF -Winit-self) endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag add_definitions(-fno-strict-aliasing -fno-exceptions) -include(CheckCXXCompilerFlag) - -# We call fread numerous times without checking return values. Hide the -# corresponding compiler warnings if the compiler supports doing so. -CHECK_CXX_COMPILER_FLAG(-Wunused-result NO_UNUSED_RESULT) -if(NO_UNUSED_RESULT) - add_definitions(-Wno-unused-result) -endif(NO_UNUSED_RESULT) - -CHECK_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden VISIBILITY_INLINES_HIDDEN) -if(VISIBILITY_INLINES_HIDDEN) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") -endif(VISIBILITY_INLINES_HIDDEN) +check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden) if(UNIX AND NOT APPLE) - CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden VISIBILITY_HIDDEN) - if(VISIBILITY_HIDDEN) - add_definitions(-fvisibility=hidden) - endif(VISIBILITY_HIDDEN) + check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden) endif() if(APPLE) @@ -178,6 +213,10 @@ if(APPLE) # page on x86_64 is 4GB in size. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000") + if(NOT DISABLE_WX) + add_definitions(-DUSE_WX -DHAVE_WX) + set(USE_WX TRUE) + endif() find_library(APPKIT_LIBRARY AppKit) find_library(APPSERV_LIBRARY ApplicationServices) find_library(ATB_LIBRARY AudioToolbox) @@ -213,145 +252,160 @@ if(CMAKE_BUILD_TYPE STREQUAL Release) add_definitions(-fomit-frame-pointer) endif(CMAKE_BUILD_TYPE STREQUAL Release) -option(FASTLOG "Enable all logs" OFF) if(FASTLOG) add_definitions(-DDEBUGFAST) endif() +# For now GLES and EGL are tied to each other. +# Enabling GLES also disables the OpenGL plugin. +if(USE_GLES) + message("GLES rendering enabled") + add_definitions(-DUSE_GLES=1) + add_definitions(-DUSE_EGL=1) + set(USE_EGL True) +endif() + +if(USE_EGL) + message("EGL OpenGL interface enabled") + add_definitions(-DUSE_EGL=1) +endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) +option(ANDROID "Enables a build for Android" OFF) +if(ANDROID) + message("Building for Android") + add_definitions(-DANDROID) +endif() ######################################## # Dependency checking # # TODO: We should have options for dependencies included in the externals to # override autodetection of system libraries and force the usage of the # externals. +if(NOT ANDROID) + include(CheckLib) -include(CheckLib) - -include(FindOpenGL) -include_directories(${OPENGL_INCLUDE_DIR}) -if(NOT OPENGL_GLU_FOUND) - message(FATAL_ERROR "GLU is required but not found") -endif() - -option(OPENMP "Enable OpenMP parallelization" ON) -if(OPENMP) - include(FindOpenMP OPTIONAL) - if(OPENMP_FOUND) - message("OpenMP parallelization enabled") - add_definitions("${OpenMP_CXX_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}") + include(FindOpenGL) + include_directories(${OPENGL_INCLUDE_DIR}) + if(NOT OPENGL_GLU_FOUND) + message(FATAL_ERROR "GLU is required but not found") endif() -endif() -if(NOT OPENMP_FOUND) - add_definitions(-Wno-unknown-pragmas) - message("OpenMP parallelization disabled") -endif() -include(FindALSA OPTIONAL) -if(ALSA_FOUND) - add_definitions(-DHAVE_ALSA=1) - message("ALSA found, enabling ALSA sound backend") -else() - add_definitions(-DHAVE_ALSA=0) - message("ALSA NOT found, disabling ALSA sound backend") -endif(ALSA_FOUND) + if(OPENMP) + include(FindOpenMP OPTIONAL) + if(OPENMP_FOUND) + message("OpenMP parallelization enabled") + add_definitions("${OpenMP_CXX_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + endif() + if(NOT OPENMP_FOUND) + add_definitions(-Wno-unknown-pragmas) + message("OpenMP parallelization disabled") + endif() -check_lib(AO ao QUIET) -if(AO_FOUND) - add_definitions(-DHAVE_AO=1) - message("ao found, enabling ao sound backend") -else() - add_definitions(-DHAVE_AO=0) - message("ao NOT found, disabling ao sound backend") -endif(AO_FOUND) + include(FindALSA OPTIONAL) + if(ALSA_FOUND) + add_definitions(-DHAVE_ALSA=1) + message("ALSA found, enabling ALSA sound backend") + else() + add_definitions(-DHAVE_ALSA=0) + message("ALSA NOT found, disabling ALSA sound backend") + endif(ALSA_FOUND) -check_lib(BLUEZ bluez QUIET) -if(BLUEZ_FOUND) - add_definitions(-DHAVE_BLUEZ=1) - message("bluez found, enabling bluetooth support") -else() - add_definitions(-DHAVE_BLUEZ=0) - message("bluez NOT found, disabling bluetooth support") -endif(BLUEZ_FOUND) + check_lib(AO ao QUIET) + if(AO_FOUND) + add_definitions(-DHAVE_AO=1) + message("ao found, enabling ao sound backend") + else() + add_definitions(-DHAVE_AO=0) + message("ao NOT found, disabling ao sound backend") + endif(AO_FOUND) -check_lib(PULSEAUDIO libpulse QUIET) -if(PULSEAUDIO_FOUND) - add_definitions(-DHAVE_PULSEAUDIO=1) - message("PulseAudio found, enabling PulseAudio sound backend") -else() - add_definitions(-DHAVE_PULSEAUDIO=0) - message("PulseAudio NOT found, disabling PulseAudio sound backend") -endif(PULSEAUDIO_FOUND) + check_lib(BLUEZ bluez QUIET) + if(BLUEZ_FOUND) + add_definitions(-DHAVE_BLUEZ=1) + message("bluez found, enabling bluetooth support") + else() + add_definitions(-DHAVE_BLUEZ=0) + message("bluez NOT found, disabling bluetooth support") + endif(BLUEZ_FOUND) -include(FindOpenAL OPTIONAL) -if(OPENAL_FOUND) - add_definitions(-DHAVE_OPENAL=1) - include_directories(${OPENAL_INCLUDE_DIR}) - message("OpenAL found, enabling OpenAL sound backend") -else() - add_definitions(-DHAVE_OPENAL=0) - message("OpenAL NOT found, disabling OpenAL sound backend") -endif(OPENAL_FOUND) + check_lib(PULSEAUDIO libpulse QUIET) + if(PULSEAUDIO_FOUND) + add_definitions(-DHAVE_PULSEAUDIO=1) + message("PulseAudio found, enabling PulseAudio sound backend") + else() + add_definitions(-DHAVE_PULSEAUDIO=0) + message("PulseAudio NOT found, disabling PulseAudio sound backend") + endif(PULSEAUDIO_FOUND) + + include(FindOpenAL OPTIONAL) + if(OPENAL_FOUND) + add_definitions(-DHAVE_OPENAL=1) + include_directories(${OPENAL_INCLUDE_DIR}) + message("OpenAL found, enabling OpenAL sound backend") + else() + add_definitions(-DHAVE_OPENAL=0) + message("OpenAL NOT found, disabling OpenAL sound backend") + endif(OPENAL_FOUND) # Note: We do not need to explicitly check for X11 as it is done in the cmake # FindOpenGL module on linux. -if(UNIX AND NOT APPLE) + if(UNIX AND NOT APPLE) + if(X11_FOUND) + add_definitions(-DHAVE_X11=1) + include_directories(${X11_INCLUDE_DIR}) + message("X11 found") + else() + message(FATAL_ERROR "X11 is required but not found") + endif(X11_FOUND) + else() + add_definitions(-DHAVE_X11=0) + endif() + if(X11_FOUND) - add_definitions(-DHAVE_X11=1) - include_directories(${X11_INCLUDE_DIR}) - message("X11 found") + check_lib(XRANDR Xrandr) + endif() + if(XRANDR_FOUND) + add_definitions(-DHAVE_XRANDR=1) else() - message(FATAL_ERROR "X11 is required but not found") - endif(X11_FOUND) -else() - add_definitions(-DHAVE_X11=0) -endif() + add_definitions(-DHAVE_XRANDR=0) + endif(XRANDR_FOUND) -if(X11_FOUND) - check_lib(XRANDR Xrandr) -endif() -if(XRANDR_FOUND) - add_definitions(-DHAVE_XRANDR=1) -else() - add_definitions(-DHAVE_XRANDR=0) -endif(XRANDR_FOUND) + if(ENCODE_FRAMEDUMPS) + check_libav() + endif() -option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) -if(ENCODE_FRAMEDUMPS) - check_libav() -endif() - -include(CheckCXXSourceRuns) -set(CMAKE_REQUIRED_LIBRARIES portaudio) -CHECK_CXX_SOURCE_RUNS( - "#include - int main(int argc, char **argv) - { if(Pa_GetVersion() >= 1890) return 0; else return 1; }" - PORTAUDIO) -if(PORTAUDIO) - message("PortAudio found, enabling mic support") - add_definitions(-DHAVE_PORTAUDIO=1) - set(PORTAUDIO_FOUND TRUE) -else() - message("PortAudio not found, disabling mic support") - add_definitions(-DHAVE_PORTAUDIO=0) - set(PORTAUDIO_FOUND FALSE) -endif(PORTAUDIO) - -option(OPROFILING "Enable profiling" OFF) -if(OPROFILING) - check_lib(OPROFILE opagent opagent.h) - check_lib(BFD bfd bfd.h) - if(OPROFILE_FOUND AND BFD_FOUND) - message("oprofile found, enabling profiling support") - add_definitions(-DUSE_OPROFILE=1) + include(CheckCXXSourceRuns) + set(CMAKE_REQUIRED_LIBRARIES portaudio) + CHECK_CXX_SOURCE_RUNS( + "#include + int main(int argc, char **argv) + { if(Pa_GetVersion() >= 1890) return 0; else return 1; }" + PORTAUDIO) + if(PORTAUDIO) + message("PortAudio found, enabling mic support") + add_definitions(-DHAVE_PORTAUDIO=1) + set(PORTAUDIO_FOUND TRUE) else() - message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.") + message("PortAudio not found, disabling mic support") + add_definitions(-DHAVE_PORTAUDIO=0) + set(PORTAUDIO_FOUND FALSE) + endif(PORTAUDIO) + + option(OPROFILING "Enable profiling" OFF) + if(OPROFILING) + check_lib(OPROFILE opagent opagent.h) + check_lib(BFD bfd bfd.h) + if(OPROFILE_FOUND AND BFD_FOUND) + message("oprofile found, enabling profiling support") + add_definitions(-DUSE_OPROFILE=1) + else() + message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.") + endif() endif() endif() - ######################################## # Setup include directories (and make sure they are preferred over the Externals) # @@ -366,7 +420,6 @@ include_directories(Source/Core/InputCommon/Src) include_directories(Source/Core/VideoCommon/Src) include_directories(Source/Core/VideoUICommon/Src) - ######################################## # Process externals and setup their include directories # @@ -380,7 +433,7 @@ include_directories(Source/Core/VideoUICommon/Src) add_subdirectory(Externals/Bochs_disasm) include_directories(Externals/Bochs_disasm) -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) check_lib(LZO lzo2 lzo/lzo1x.h QUIET) endif() if(LZO_FOUND) @@ -392,15 +445,29 @@ else() set(LZO lzo2) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - include(FindSDL2 OPTIONAL) -endif() -if(SDL2_FOUND) - message("Using shared SDL2") - include_directories(${SDL2_INCLUDE_DIR}) -else(SDL2_FOUND) - # SDL2 not found, try SDL +if(OPENAL_FOUND) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET) + endif() + if (SOUNDTOUCH_FOUND) + message("Using shared soundtouch") + else() + message("Using static soundtouch from Externals") + add_subdirectory(Externals/soundtouch) + include_directories(Externals) + endif() +endif() + +if(NOT ANDROID) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(FindSDL2 OPTIONAL) + endif() + if(SDL2_FOUND) + message("Using shared SDL2") + include_directories(${SDL2_INCLUDE_DIR}) + else(SDL2_FOUND) + # SDL2 not found, try SDL + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindSDL OPTIONAL) endif() if(SDL_FOUND) @@ -409,15 +476,16 @@ else(SDL2_FOUND) else(SDL_FOUND) # TODO: Use the prebuilt one on Windows message("Using static SDL from Externals") - include_directories(Externals/SDL Externals/SDL/include) + include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include) add_subdirectory(Externals/SDL) endif(SDL_FOUND) -endif(SDL2_FOUND) + endif(SDL2_FOUND) +endif() set(SFML_FIND_VERSION TRUE) set(SFML_FIND_VERSION_MAJOR 1) set(SFML_FIND_VERSION_MINOR 5) -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) include(FindSFML OPTIONAL) endif() if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR @@ -428,7 +496,7 @@ else() include_directories(Externals/SFML/include) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) check_lib(SOIL SOIL SOIL/SOIL.h QUIET) endif() if(SOIL_FOUND) @@ -458,26 +526,19 @@ if(WIN32) find_library(GLEW glew32s PATHS Externals/GLew) include_directories(Externals/GLew/include) else() - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(GLEW GLEW GL/glew.h) + if(NOT ANDROID) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(GLEW GLEW GL/glew.h) + endif() + if(NOT GLEW_FOUND) + message("Using static GLEW from Externals") + add_subdirectory(Externals/GLew) + include_directories(Externals/GLew/include) + endif(NOT GLEW_FOUND) endif() - if(NOT GLEW_FOUND) - message("Using static GLEW from Externals") - add_subdirectory(Externals/GLew) - include_directories(Externals/GLew/include) - endif(NOT GLEW_FOUND) - - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(CG Cg Cg/cg.h) - endif() - if(NOT CG_FOUND) - message("Using static Cg from Externals") - include_directories(Externals) - endif(NOT CG_FOUND) - check_lib(CGGL CgGL Cg/cgGL.h) endif() -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) find_library(CL OpenCL) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL") else() @@ -485,11 +546,25 @@ else() add_subdirectory(Externals/CLRun) endif() -option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) -if(NOT DISABLE_WX) +if(NOT DISABLE_WX AND NOT ANDROID) include(FindwxWidgets OPTIONAL) FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) + if(wxWidgets_FOUND) + EXECUTE_PROCESS( + COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" + ${wxWidgets_CONFIG_OPTIONS} --version + OUTPUT_VARIABLE wxWidgets_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + message("Found wxWidgets version ${wxWidgets_VERSION}") + if(${wxWidgets_VERSION} VERSION_LESS "2.8.9") + message("At least 2.8.9 is required; ignoring found version") + unset(wxWidgets_FOUND) + endif() + endif(wxWidgets_FOUND) + if(wxWidgets_FOUND) EXECUTE_PROCESS( COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" @@ -510,26 +585,26 @@ if(NOT DISABLE_WX) endif() endif(wxWidgets_FOUND) - if(UNIX AND NOT APPLE) - # There is a bug in the FindGTK module in cmake version 2.8.2 that - # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 - # users have complained that pkg-config does not find - # gdk-pixbuf-2.0. On yet another hand, cmake version 2.8.3 in - # Ubuntu Natty does not find the glib libraries correctly. - # Ugly!!! - execute_process(COMMAND lsb_release -c -s - OUTPUT_VARIABLE DIST_NAME - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} - VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty") - check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED) - else() - include(FindGTK2) - if(GTK2_FOUND) - include_directories(${GTK2_INCLUDE_DIRS}) + if(UNIX AND NOT APPLE) + # There is a bug in the FindGTK module in cmake version 2.8.2 that + # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 + # users have complained that pkg-config does not find + # gdk-pixbuf-2.0. On yet another hand, cmake version 2.8.3 in + # Ubuntu Natty does not find the glib libraries correctly. + # Ugly!!! + execute_process(COMMAND lsb_release -c -s + OUTPUT_VARIABLE DIST_NAME + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} + VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty") + check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED) + else() + include(FindGTK2) + if(GTK2_FOUND) + include_directories(${GTK2_INCLUDE_DIRS}) + endif() endif() endif() - endif() if(wxWidgets_FOUND) include(${wxWidgets_USE_FILE}) @@ -561,7 +636,7 @@ if(NOT DISABLE_WX) set(wxWidgets_LIBRARIES "wx") endif(wxWidgets_FOUND) add_definitions(-DHAVE_WX=1) -endif(NOT DISABLE_WX) +endif(NOT DISABLE_WX AND NOT ANDROID) ######################################## @@ -581,13 +656,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h ) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") - -######################################## -# Optional Targets -# TODO: Add DSPSpy and TestSuite. -option(DSPTOOL "Build dsptool" OFF) -option(UNITTESTS "Build unitests" OFF) - ######################################## # Start compiling our code # @@ -610,6 +678,13 @@ endif() if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")) install(FILES Data/license.txt DESTINATION ${datadir}) endif() +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + # Install the application icon and menu item + install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm) + install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +endif() # packaging information set(CPACK_PACKAGE_NAME "dolphin-emu") @@ -617,21 +692,22 @@ set(CPACK_PACKAGE_VENDOR "Dolphin Team") set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH}) +set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Gamecube, Wii and Triforce emulator") -# TODO: CPACK_PACKAGE_DESCRIPTION_FILE -# TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY +set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other) +set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0) # TODO: CPACK_RESOURCE_FILE_README # TODO: CPACK_RESOURCE_FILE_WELCOME -# TODO: CPACK_PACKAGE_EXECUTABLES # TODO: CPACK_PACKAGE_ICON # TODO: CPACK_NSIS_* # TODO: Use CPack components for DSPSpy, etc => cpack_add_component set(CPACK_SET_DESTDIR ON) set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP") -set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.svn") +set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.git") list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}") # CPack must be included after the CPACK_* variables are set in order for those # variables to take effect. -include(CPack) +Include(CPack) diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index 43f9370188..7b2525adae 100644 --- a/CMakeTests/CheckLib.cmake +++ b/CMakeTests/CheckLib.cmake @@ -55,8 +55,8 @@ endmacro() macro(check_libav) if(PKG_CONFIG_FOUND) - pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0 - libswscale>=2.0.0 libavutil>=51.7.0) + pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0 + libswscale>=2.1.0 libavutil>=51.22.1) else() message("pkg-config is required to check for libav") endif() diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt new file mode 100644 index 0000000000..8c04855554 Binary files /dev/null and b/Data/Sys/Wii/setting-kor.txt differ diff --git a/Data/Sys/totaldb.dsy b/Data/Sys/totaldb.dsy index 790a942eae..8eb9c28bf7 100644 Binary files a/Data/Sys/totaldb.dsy and b/Data/Sys/totaldb.dsy differ diff --git a/Data/User/GameConfig/G2RE52.ini b/Data/User/GameConfig/G2RE52.ini new file mode 100644 index 0000000000..36b3a33431 --- /dev/null +++ b/Data/User/GameConfig/G2RE52.ini @@ -0,0 +1,16 @@ +# G2RE52 - Shrek SuperSlam +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G2TE52.ini b/Data/User/GameConfig/G2TE52.ini index 506768e485..b90db9f401 100644 --- a/Data/User/GameConfig/G2TE52.ini +++ b/Data/User/GameConfig/G2TE52.ini @@ -1,7 +1,16 @@ # G2TE52 - Tony Hawk's Underground 2 [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/User/GameConfig/G3AP69.ini index ed15e3bbba..04ea1cba46 100644 --- a/Data/User/GameConfig/G3AP69.ini +++ b/Data/User/GameConfig/G3AP69.ini @@ -1,4 +1,4 @@ -# G3AE69 - The Lord of the Rings, The Third Age +# G3AP69 - The Lord of the Rings, The Third Age [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/User/GameConfig/G3QEA4.ini b/Data/User/GameConfig/G3QEA4.ini index 19f71c3f7a..34471c842e 100644 --- a/Data/User/GameConfig/G3QEA4.ini +++ b/Data/User/GameConfig/G3QEA4.ini @@ -1,7 +1,18 @@ -# G3QEA4 - TMNT3 -[Core] Values set here will override the main dolphin settings. -TLBHack=1 -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. +# G3QEA4 - TMNT3 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G3RD52.ini b/Data/User/GameConfig/G3RD52.ini new file mode 100644 index 0000000000..e939d6e28a --- /dev/null +++ b/Data/User/GameConfig/G3RD52.ini @@ -0,0 +1,16 @@ +# G3RD52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RE52.ini b/Data/User/GameConfig/G3RE52.ini new file mode 100644 index 0000000000..15a742f636 --- /dev/null +++ b/Data/User/GameConfig/G3RE52.ini @@ -0,0 +1,16 @@ +# G3RE52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RF52.ini b/Data/User/GameConfig/G3RF52.ini new file mode 100644 index 0000000000..cde2d9a8ca --- /dev/null +++ b/Data/User/GameConfig/G3RF52.ini @@ -0,0 +1,16 @@ +# G3RF52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RP52.ini b/Data/User/GameConfig/G3RP52.ini new file mode 100644 index 0000000000..bb42289bd9 --- /dev/null +++ b/Data/User/GameConfig/G3RP52.ini @@ -0,0 +1,16 @@ +# G3RP52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G5SE7D.ini b/Data/User/GameConfig/G5SE7D.ini new file mode 100644 index 0000000000..eeaed0f7ad --- /dev/null +++ b/Data/User/GameConfig/G5SE7D.ini @@ -0,0 +1,18 @@ +# G5SE7D - Spyro +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs efb to Ram for proper lighting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/G5SP7D.ini b/Data/User/GameConfig/G5SP7D.ini new file mode 100644 index 0000000000..d972f28a22 --- /dev/null +++ b/Data/User/GameConfig/G5SP7D.ini @@ -0,0 +1,18 @@ +# G5SP7D - Spyro +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs efb to Ram for proper lighting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/G6NE69.ini b/Data/User/GameConfig/G6NE69.ini index 832bea8e5f..9759e5911d 100644 --- a/Data/User/GameConfig/G6NE69.ini +++ b/Data/User/GameConfig/G6NE69.ini @@ -2,6 +2,15 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G6NP69.ini b/Data/User/GameConfig/G6NP69.ini index 8a35467139..314a7ae4f5 100644 --- a/Data/User/GameConfig/G6NP69.ini +++ b/Data/User/GameConfig/G6NP69.ini @@ -2,6 +2,15 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G9TD52.ini b/Data/User/GameConfig/G9TD52.ini new file mode 100644 index 0000000000..95f5d1837b --- /dev/null +++ b/Data/User/GameConfig/G9TD52.ini @@ -0,0 +1,18 @@ +# G9TD52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TE52.ini b/Data/User/GameConfig/G9TE52.ini new file mode 100644 index 0000000000..8ce046e142 --- /dev/null +++ b/Data/User/GameConfig/G9TE52.ini @@ -0,0 +1,18 @@ +# G9TE52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TF52.ini b/Data/User/GameConfig/G9TF52.ini new file mode 100644 index 0000000000..625316cf7e --- /dev/null +++ b/Data/User/GameConfig/G9TF52.ini @@ -0,0 +1,18 @@ +# G9TF52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TI52.ini b/Data/User/GameConfig/G9TI52.ini new file mode 100644 index 0000000000..b4e063dc8e --- /dev/null +++ b/Data/User/GameConfig/G9TI52.ini @@ -0,0 +1,18 @@ +# G9TI52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TP52.ini b/Data/User/GameConfig/G9TP52.ini new file mode 100644 index 0000000000..a00d3fb255 --- /dev/null +++ b/Data/User/GameConfig/G9TP52.ini @@ -0,0 +1,18 @@ +# G9TP52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GAXE5D.ini b/Data/User/GameConfig/GAXE5D.ini new file mode 100644 index 0000000000..6c9c6a4532 --- /dev/null +++ b/Data/User/GameConfig/GAXE5D.ini @@ -0,0 +1,16 @@ +# GAXE5D - The Ant Bully +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZD69.ini b/Data/User/GameConfig/GAZD69.ini new file mode 100644 index 0000000000..c8516a71ea --- /dev/null +++ b/Data/User/GameConfig/GAZD69.ini @@ -0,0 +1,16 @@ +# GAZD69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZE69.ini b/Data/User/GameConfig/GAZE69.ini index 5168f7c0a0..0e84a9479a 100644 --- a/Data/User/GameConfig/GAZE69.ini +++ b/Data/User/GameConfig/GAZE69.ini @@ -1,7 +1,16 @@ # GAZE69 - Harry Potter : POA [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZF69.ini b/Data/User/GameConfig/GAZF69.ini new file mode 100644 index 0000000000..e933511c09 --- /dev/null +++ b/Data/User/GameConfig/GAZF69.ini @@ -0,0 +1,16 @@ +# GAZF69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZH69.ini b/Data/User/GameConfig/GAZH69.ini new file mode 100644 index 0000000000..f00c317941 --- /dev/null +++ b/Data/User/GameConfig/GAZH69.ini @@ -0,0 +1,16 @@ +# GAZH69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZI69.ini b/Data/User/GameConfig/GAZI69.ini new file mode 100644 index 0000000000..2e56ee50ec --- /dev/null +++ b/Data/User/GameConfig/GAZI69.ini @@ -0,0 +1,16 @@ +# GAZI69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZJ69.ini b/Data/User/GameConfig/GAZJ69.ini new file mode 100644 index 0000000000..91a6e20741 --- /dev/null +++ b/Data/User/GameConfig/GAZJ69.ini @@ -0,0 +1,16 @@ +# GAZJ69 - Harry Potter to Azkaban no Shuujin +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZM69.ini b/Data/User/GameConfig/GAZM69.ini new file mode 100644 index 0000000000..edcde989b1 --- /dev/null +++ b/Data/User/GameConfig/GAZM69.ini @@ -0,0 +1,16 @@ +# GAZM69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZP69.ini b/Data/User/GameConfig/GAZP69.ini new file mode 100644 index 0000000000..62e235c67b --- /dev/null +++ b/Data/User/GameConfig/GAZP69.ini @@ -0,0 +1,16 @@ +# GAZP69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZS69.ini b/Data/User/GameConfig/GAZS69.ini new file mode 100644 index 0000000000..493976126f --- /dev/null +++ b/Data/User/GameConfig/GAZS69.ini @@ -0,0 +1,16 @@ +# GAZS69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GBHDC8.ini b/Data/User/GameConfig/GBHDC8.ini new file mode 100644 index 0000000000..dbc0e46f56 --- /dev/null +++ b/Data/User/GameConfig/GBHDC8.ini @@ -0,0 +1,18 @@ +# GBHDC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHEC8.ini b/Data/User/GameConfig/GBHEC8.ini index e086dcbc61..30fa0f7380 100644 --- a/Data/User/GameConfig/GBHEC8.ini +++ b/Data/User/GameConfig/GBHEC8.ini @@ -1,147 +1,119 @@ # GBHEC8 - Mystic Heroes - [EmuState] #The Emulation State (as of Dolphin r1027) EmulationStateId = 4 - +EmulationIssues = Needs Real xfb for the videos to display. [OnFrame] -#Add memory patches here. - -#Add decrypted action replay cheats here. [ActionReplay] - -$(m) +$(m) 01180C36 88000000 C4201E68 0000FF00 - -$Max Health +$Max Health 01180C37 08000000 02264788 0000270F - -$Max Magic +$Max Magic 01180C38 08000000 0226478A 0000270F - -$Max Attack +$Max Attack 01180C39 08000000 0226478C 0000270F - -$Max Defense +$Max Defense 01180C3A 08000000 0226478E 0000270F - -$Max Rune Attack +$Max Rune Attack 01180C3B 08000000 02264790 0000270F - -$Max Rune Defense +$Max Rune Defense 01180C3C 08000000 02264792 0000270F - -$Have All Runes +$Have All Runes 01180C3D 08000000 022647C0 0005FFFF - -$Max Level All Magic Slots +$Max Level All Magic Slots 01180C3E 08000000 042647A8 09090909 - -$Start On Level 1-2 +$Start On Level 1-2 01180C3F 08000000 0226475A 00000102 - -$Start On Level 1-3 +$Start On Level 1-3 01180C40 08000000 0226475A 00000103 - -$Start On Level 2-1 +$Start On Level 2-1 01180C41 08000000 0226475A 00000201 - -$Start On Level 2-2 +$Start On Level 2-2 01180C42 08000000 0226475A 00000202 - -$Start On Level 2-3 +$Start On Level 2-3 01180C43 08000000 0226475A 00000203 - -$Start On Level 3-1 +$Start On Level 3-1 01180C44 08000000 0226475A 00000301 - -$Start On Level 3-2 +$Start On Level 3-2 01180C45 08000000 0226475A 00000302 - -$Start On Level 3-3 +$Start On Level 3-3 01180C46 08000000 0226475A 00000303 - -$Start On Level 4-1 +$Start On Level 4-1 01180C47 08000000 0226475A 00000401 - -$Start On Level 4-2 +$Start On Level 4-2 01180C48 08000000 0226475A 00000402 - -$Start On Level 4-3 +$Start On Level 4-3 01180C49 08000000 0226475A 00000403 - -$Start On Level 5-1 +$Start On Level 5-1 01180C4A 08000000 0226475A 00000501 - -$Start On Level 5-2 +$Start On Level 5-2 01180C4B 08000000 0226475A 00000502 - -$Start On Level 5-3 +$Start On Level 5-3 01180C4C 08000000 0226475A 00000503 - -$Start On Level 6-1 +$Start On Level 6-1 01180C4D 08000000 0226475A 00000601 - -$Start On Level 6-2 +$Start On Level 6-2 01180C4E 08000000 0226475A 00000602 - -$Start On Level 6-3 +$Start On Level 6-3 01180C4F 08000000 0226475A 00000603 - -$Start On Level 7-1 +$Start On Level 7-1 01180C50 08000000 0226475A 00000701 - -$Start On Level 7-2 +$Start On Level 7-2 01180C51 08000000 0226475A 00000702 - -$Start On Level 7-3 +$Start On Level 7-3 01180C52 08000000 0226475A 00000703 - -$Start On Level 7-4 +$Start On Level 7-4 01180C53 08000000 0226475A 00000704 - -$Start On Level 8-1 +$Start On Level 8-1 01180C54 08000000 0226475A 00000801 - -$Start On Level 8-2 +$Start On Level 8-2 01180C55 08000000 0226475A 00000802 - -$Start On Level 8-3 +$Start On Level 8-3 01180C56 08000000 0226475A 00000803 - -$Start On Level 8-4 +$Start On Level 8-4 01180C57 08000000 -0226475A 00000804 \ No newline at end of file +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHFC8.ini b/Data/User/GameConfig/GBHFC8.ini new file mode 100644 index 0000000000..e0ac6b2976 --- /dev/null +++ b/Data/User/GameConfig/GBHFC8.ini @@ -0,0 +1,18 @@ +# GBHFC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHPC8.ini b/Data/User/GameConfig/GBHPC8.ini new file mode 100644 index 0000000000..59c0c5dd54 --- /dev/null +++ b/Data/User/GameConfig/GBHPC8.ini @@ -0,0 +1,18 @@ +# GBHPC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/User/GameConfig/GBSE8P.ini index b774901496..5b91e4fe54 100644 --- a/Data/User/GameConfig/GBSE8P.ini +++ b/Data/User/GameConfig/GBSE8P.ini @@ -1,7 +1,16 @@ # GBSE8P - BEACH SPIKERS [Core] Values set here will override the main dolphin settings. +EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Controlls don't work ingame only walking works +EmulationStateId = 4 +EmulationIssues = Needs lle audio to solve sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/User/GameConfig/GBSP8P.ini index 5ceadc46f8..c21ff6f50b 100644 --- a/Data/User/GameConfig/GBSP8P.ini +++ b/Data/User/GameConfig/GBSP8P.ini @@ -1,6 +1,16 @@ # GBSP8P - BEACH SPIKERS [Core] Values set here will override the main dolphin settings. +EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 +EmulationIssues = Needs lle audio to solve sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/User/GameConfig/GC6E01.ini index 6b8e2c10c3..b745ef89b2 100644 --- a/Data/User/GameConfig/GC6E01.ini +++ b/Data/User/GameConfig/GC6E01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE music drops notes, if EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur +EmulationIssues = If EFB scale is not integral, serious texture glitches occur. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,4 +16,3 @@ PH_ZFar = [Video_Settings] EFBScale = 1 SafeTextureCacheColorSamples = 0 - diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/User/GameConfig/GC6P01.ini index e5ed8f4587..4ebad29a0f 100644 --- a/Data/User/GameConfig/GC6P01.ini +++ b/Data/User/GameConfig/GC6P01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE music drops notes, if EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur +EmulationIssues = If EFB scale is not integral, serious texture glitches occur. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GDSE78.ini b/Data/User/GameConfig/GDSE78.ini index 36adee24cc..d315811b96 100644 --- a/Data/User/GameConfig/GDSE78.ini +++ b/Data/User/GameConfig/GDSE78.ini @@ -1,8 +1,19 @@ # GDSE78 - Dark Summit [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GDSP78.ini b/Data/User/GameConfig/GDSP78.ini new file mode 100644 index 0000000000..acebf51c09 --- /dev/null +++ b/Data/User/GameConfig/GDSP78.ini @@ -0,0 +1,19 @@ +# GDSP78 - Dark Summit +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GE4E7D.ini b/Data/User/GameConfig/GE4E7D.ini index 234c5a4812..66d98e1fe3 100644 --- a/Data/User/GameConfig/GE4E7D.ini +++ b/Data/User/GameConfig/GE4E7D.ini @@ -1,8 +1,17 @@ # GE4E7D - 4x4 Evolution 2 [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Stuck at +EmulationStateId = 4 +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini index 5c2856e1ca..3cf24a25c5 100644 --- a/Data/User/GameConfig/GEAE8P.ini +++ b/Data/User/GameConfig/GEAE8P.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. +EmulationIssues = Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = 1.99998 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini index 08b7a7969e..e9fcefdcea 100644 --- a/Data/User/GameConfig/GEAP8P.ini +++ b/Data/User/GameConfig/GEAP8P.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. +EmulationIssues = Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = 1.99998 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GF4E52.ini b/Data/User/GameConfig/GF4E52.ini index 1d062e1846..9135101401 100644 --- a/Data/User/GameConfig/GF4E52.ini +++ b/Data/User/GameConfig/GF4E52.ini @@ -1,7 +1,19 @@ -# GF4E52 - Fantastic Four -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Can be slow -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. +# GF4E52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GF4F52.ini b/Data/User/GameConfig/GF4F52.ini new file mode 100644 index 0000000000..479efe3d49 --- /dev/null +++ b/Data/User/GameConfig/GF4F52.ini @@ -0,0 +1,19 @@ +# GF4F52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GF4P52.ini b/Data/User/GameConfig/GF4P52.ini new file mode 100644 index 0000000000..196d565967 --- /dev/null +++ b/Data/User/GameConfig/GF4P52.ini @@ -0,0 +1,19 @@ +# GF4P52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/User/GameConfig/GF8E69.ini index 858a62d3d8..5fa4328270 100644 --- a/Data/User/GameConfig/GF8E69.ini +++ b/Data/User/GameConfig/GF8E69.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = The videos are messed up, skip them. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code @@ -40,3 +40,9 @@ $Away Team Never Scores 00416F8C 00000000 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GF8P69.ini b/Data/User/GameConfig/GF8P69.ini new file mode 100644 index 0000000000..3d6f730434 --- /dev/null +++ b/Data/User/GameConfig/GF8P69.ini @@ -0,0 +1,16 @@ +# GF8P69 - FIFA Street +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = The videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini index 450553aa06..32b1e195c0 100644 --- a/Data/User/GameConfig/GFZE01.ini +++ b/Data/User/GameConfig/GFZE01.ini @@ -43,7 +43,4 @@ $All Vehicles Unlocked 840030C8 FFDC6F00 [Gecko] [Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False -EFBCopyCacheEnable = True [Video_Settings] diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/User/GameConfig/GFZP01.ini index 70c517ef4a..0586d53d3f 100644 --- a/Data/User/GameConfig/GFZP01.ini +++ b/Data/User/GameConfig/GFZP01.ini @@ -24,7 +24,4 @@ $Make Save Copyable 04C3110C 4B400410 [Gecko] [Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False -EFBCopyCacheEnable = True [Video_Settings] diff --git a/Data/User/GameConfig/GH2E69.ini b/Data/User/GameConfig/GH2E69.ini index 8f8edf2532..b1f64e6ef7 100644 --- a/Data/User/GameConfig/GH2E69.ini +++ b/Data/User/GameConfig/GH2E69.ini @@ -1,12 +1,18 @@ -# GH2E69 - NFS: HP2 -[Core] Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Intro videos are messed up, skip them. Game is slow (r6651) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] - +# GH2E69 - NFS: HP2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GH2P69.ini b/Data/User/GameConfig/GH2P69.ini new file mode 100644 index 0000000000..006dad78dc --- /dev/null +++ b/Data/User/GameConfig/GH2P69.ini @@ -0,0 +1,18 @@ +# GH2P69 - NFS: HP2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GH4D69.ini b/Data/User/GameConfig/GH4D69.ini new file mode 100644 index 0000000000..aa043328ab --- /dev/null +++ b/Data/User/GameConfig/GH4D69.ini @@ -0,0 +1,16 @@ +# GH4D69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4E69.ini b/Data/User/GameConfig/GH4E69.ini index 717593cf73..53f2bf092e 100644 --- a/Data/User/GameConfig/GH4E69.ini +++ b/Data/User/GameConfig/GH4E69.ini @@ -1,7 +1,16 @@ -# GH4E69 - Goblet Of Fire +# GH4E69 - Harry Potter and the Goblet of Fire [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4F69.ini b/Data/User/GameConfig/GH4F69.ini new file mode 100644 index 0000000000..162bbcd94d --- /dev/null +++ b/Data/User/GameConfig/GH4F69.ini @@ -0,0 +1,16 @@ +# GH4F69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4H69.ini b/Data/User/GameConfig/GH4H69.ini new file mode 100644 index 0000000000..f348f1f777 --- /dev/null +++ b/Data/User/GameConfig/GH4H69.ini @@ -0,0 +1,16 @@ +# GH4H69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4I69.ini b/Data/User/GameConfig/GH4I69.ini new file mode 100644 index 0000000000..b3bb4acb13 --- /dev/null +++ b/Data/User/GameConfig/GH4I69.ini @@ -0,0 +1,16 @@ +# GH4I69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4J69.ini b/Data/User/GameConfig/GH4J69.ini new file mode 100644 index 0000000000..8427cb7a75 --- /dev/null +++ b/Data/User/GameConfig/GH4J69.ini @@ -0,0 +1,16 @@ +# GH4J69 - Harry Potter to Honoo no Goblet +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4M69.ini b/Data/User/GameConfig/GH4M69.ini new file mode 100644 index 0000000000..d26c2c8bf7 --- /dev/null +++ b/Data/User/GameConfig/GH4M69.ini @@ -0,0 +1,16 @@ +# GH4M69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4P69.ini b/Data/User/GameConfig/GH4P69.ini new file mode 100644 index 0000000000..7f59479c96 --- /dev/null +++ b/Data/User/GameConfig/GH4P69.ini @@ -0,0 +1,16 @@ +# GH4P69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4S69.ini b/Data/User/GameConfig/GH4S69.ini new file mode 100644 index 0000000000..277c978f4a --- /dev/null +++ b/Data/User/GameConfig/GH4S69.ini @@ -0,0 +1,16 @@ +# GH4S69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLE69.ini b/Data/User/GameConfig/GHLE69.ini index 2b8afab705..907ea760cb 100644 --- a/Data/User/GameConfig/GHLE69.ini +++ b/Data/User/GameConfig/GHLE69.ini @@ -1,7 +1,16 @@ # GHLE69 - Harry Potter and the Sorcerer's Stone [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Missing text sometimes +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLJ69.ini b/Data/User/GameConfig/GHLJ69.ini new file mode 100644 index 0000000000..5f9ecffaaa --- /dev/null +++ b/Data/User/GameConfig/GHLJ69.ini @@ -0,0 +1,16 @@ +# GHLJ69 - Harry Potter to Kenja no Ishi +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLP69.ini b/Data/User/GameConfig/GHLP69.ini new file mode 100644 index 0000000000..9cc3ba9db2 --- /dev/null +++ b/Data/User/GameConfig/GHLP69.ini @@ -0,0 +1,16 @@ +# GHLP69 - Harry Potter and the Philosopher's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLX69.ini b/Data/User/GameConfig/GHLX69.ini new file mode 100644 index 0000000000..5bf5d65db3 --- /dev/null +++ b/Data/User/GameConfig/GHLX69.ini @@ -0,0 +1,16 @@ +# GHLX69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLY69.ini b/Data/User/GameConfig/GHLY69.ini new file mode 100644 index 0000000000..b6ecff05dc --- /dev/null +++ b/Data/User/GameConfig/GHLY69.ini @@ -0,0 +1,16 @@ +# GHLY69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLZ69.ini b/Data/User/GameConfig/GHLZ69.ini new file mode 100644 index 0000000000..a84cd6a874 --- /dev/null +++ b/Data/User/GameConfig/GHLZ69.ini @@ -0,0 +1,16 @@ +# GHLZ69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHSE69.ini b/Data/User/GameConfig/GHSE69.ini index 8640caac26..ca829d891b 100644 --- a/Data/User/GameConfig/GHSE69.ini +++ b/Data/User/GameConfig/GHSE69.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE sound glitches, videos require real XFB +EmulationIssues = Needs Real Xfb for videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GHSJ69.ini b/Data/User/GameConfig/GHSJ69.ini new file mode 100644 index 0000000000..44b9d741fd --- /dev/null +++ b/Data/User/GameConfig/GHSJ69.ini @@ -0,0 +1,18 @@ +# GHSJ69 - Harry Potter to Himitsu no Heya +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSP69.ini b/Data/User/GameConfig/GHSP69.ini new file mode 100644 index 0000000000..06ea951767 --- /dev/null +++ b/Data/User/GameConfig/GHSP69.ini @@ -0,0 +1,18 @@ +# GHSP69 - Harry Potter: Chamber Of Secrets +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSX69.ini b/Data/User/GameConfig/GHSX69.ini new file mode 100644 index 0000000000..b030198aff --- /dev/null +++ b/Data/User/GameConfig/GHSX69.ini @@ -0,0 +1,18 @@ +# GHSX69 - Harry Potter: Chamber Of Secrets +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSY69.ini b/Data/User/GameConfig/GHSY69.ini index 7fc51c7467..1d484a2598 100644 --- a/Data/User/GameConfig/GHSY69.ini +++ b/Data/User/GameConfig/GHSY69.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE sound glitches, videos require real XFB +EmulationIssues = Needs Real Xfb for videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GIQE78.ini b/Data/User/GameConfig/GIQE78.ini index e6763d7e9f..3cb9063eb1 100644 --- a/Data/User/GameConfig/GIQE78.ini +++ b/Data/User/GameConfig/GIQE78.ini @@ -1,8 +1,8 @@ # GIQE78 - The Incredibles 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real XFB for videos to show up(r6898) -EmulationStateId = 3 +EmulationIssues = Needs real XFB for videos to show up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code diff --git a/Data/User/GameConfig/GITE01.ini b/Data/User/GameConfig/GITE01.ini index b35cf1c579..568c971361 100644 --- a/Data/User/GameConfig/GITE01.ini +++ b/Data/User/GameConfig/GITE01.ini @@ -1,7 +1,16 @@ # GITE01 - Geist [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Very slow +EmulationIssues = EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GITP01.ini b/Data/User/GameConfig/GITP01.ini index 141ccddb47..5895802f4b 100644 --- a/Data/User/GameConfig/GITP01.ini +++ b/Data/User/GameConfig/GITP01.ini @@ -1,6 +1,16 @@ # GITP01 - Geist [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationIssues = +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GKHEA4.ini b/Data/User/GameConfig/GKHEA4.ini index 635d743f83..4973a2955f 100644 --- a/Data/User/GameConfig/GKHEA4.ini +++ b/Data/User/GameConfig/GKHEA4.ini @@ -1,7 +1,17 @@ # GKHEA4 - King Arthur [Core] Values set here will override the main dolphin settings. +SkipIdle = 0 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Slow and screen on right side is cut off +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GKHPA4.ini b/Data/User/GameConfig/GKHPA4.ini index f3a70877f4..ab44a39965 100644 --- a/Data/User/GameConfig/GKHPA4.ini +++ b/Data/User/GameConfig/GKHPA4.ini @@ -1,6 +1,17 @@ # GKHPA4 - King Arthur [Core] Values set here will override the main dolphin settings. +SkipIdle = 0 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GKYE01.ini b/Data/User/GameConfig/GKYE01.ini index 36e4128b6c..bb79983dd3 100644 --- a/Data/User/GameConfig/GKYE01.ini +++ b/Data/User/GameConfig/GKYE01.ini @@ -6,5 +6,12 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GKYJ01.ini b/Data/User/GameConfig/GKYJ01.ini new file mode 100644 index 0000000000..623a0be1e3 --- /dev/null +++ b/Data/User/GameConfig/GKYJ01.ini @@ -0,0 +1,17 @@ +# GKYJ01 - Kirby Air Ride +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GKYP01.ini b/Data/User/GameConfig/GKYP01.ini index f3bf060e4f..f5366146a0 100644 --- a/Data/User/GameConfig/GKYP01.ini +++ b/Data/User/GameConfig/GKYP01.ini @@ -1,6 +1,17 @@ # GKYP01 - Kirby Air Ride [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GLYE69.ini b/Data/User/GameConfig/GLYE69.ini index 160e0444b8..da2c0b1537 100644 --- a/Data/User/GameConfig/GLYE69.ini +++ b/Data/User/GameConfig/GLYE69.ini @@ -1,6 +1,16 @@ # GLYE69 - NBA LIVE 2005 [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GLYP69.ini b/Data/User/GameConfig/GLYP69.ini new file mode 100644 index 0000000000..84392be595 --- /dev/null +++ b/Data/User/GameConfig/GLYP69.ini @@ -0,0 +1,16 @@ +# GLYP69 - NBA LIVE 2005 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/User/GameConfig/GM8E01.ini index 122e83ccfe..0cc96edc53 100644 --- a/Data/User/GameConfig/GM8E01.ini +++ b/Data/User/GameConfig/GM8E01.ini @@ -38,7 +38,6 @@ $Have Wave Beam $Have Plasma Beam 4200183C 00230001 $Have Phazon Beam -01165C8D 08000000 70458245 00000080 087A55A9 000000C5 00458245 0000007C @@ -100,4 +99,3 @@ SafeTextureCacheColorSamples = 512 EFBCopyEnable = True EFBToTextureEnable = False [Video_Enhancements] - diff --git a/Data/User/GameConfig/GMIE70.ini b/Data/User/GameConfig/GMIE70.ini index f32657ffaa..7e3be02a66 100644 --- a/Data/User/GameConfig/GMIE70.ini +++ b/Data/User/GameConfig/GMIE70.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,3 +17,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GMIP70.ini b/Data/User/GameConfig/GMIP70.ini index 2738d6e0c4..1fb1521e83 100644 --- a/Data/User/GameConfig/GMIP70.ini +++ b/Data/User/GameConfig/GMIP70.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,3 +17,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GN8E69.ini b/Data/User/GameConfig/GN8E69.ini new file mode 100644 index 0000000000..3129860bb7 --- /dev/null +++ b/Data/User/GameConfig/GN8E69.ini @@ -0,0 +1,15 @@ +# GN8E69 - NBA LIVE 2004 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GN8P69.ini b/Data/User/GameConfig/GN8P69.ini new file mode 100644 index 0000000000..f56f46bfcd --- /dev/null +++ b/Data/User/GameConfig/GN8P69.ini @@ -0,0 +1,15 @@ +# GN8P69 - NBA LIVE 2004 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GNJEAF.ini b/Data/User/GameConfig/GNJEAF.ini index 2c46ed2f8b..7b86e03933 100644 --- a/Data/User/GameConfig/GNJEAF.ini +++ b/Data/User/GameConfig/GNJEAF.ini @@ -3,6 +3,17 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Cutscenes are black +EmulationIssues = Needs Real Xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GNLE69.ini b/Data/User/GameConfig/GNLE69.ini new file mode 100644 index 0000000000..68dcf3183b --- /dev/null +++ b/Data/User/GameConfig/GNLE69.ini @@ -0,0 +1,15 @@ +# GNLE69 - NBA Live 2003 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GOSE41.ini b/Data/User/GameConfig/GOSE41.ini index 4682f2275c..adc124119f 100644 --- a/Data/User/GameConfig/GOSE41.ini +++ b/Data/User/GameConfig/GOSE41.ini @@ -1,9 +1,11 @@ # GOSE41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GOSP41.ini b/Data/User/GameConfig/GOSP41.ini index 40fc6ad1f1..cb12055384 100644 --- a/Data/User/GameConfig/GOSP41.ini +++ b/Data/User/GameConfig/GOSP41.ini @@ -1,9 +1,11 @@ # GOSP41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GOSX41.ini b/Data/User/GameConfig/GOSX41.ini index 92662f0a4c..8790cdfd8c 100644 --- a/Data/User/GameConfig/GOSX41.ini +++ b/Data/User/GameConfig/GOSX41.ini @@ -1,9 +1,11 @@ # GOSX41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GP5E01.ini b/Data/User/GameConfig/GP5E01.ini index 589be35233..96b6520c59 100644 --- a/Data/User/GameConfig/GP5E01.ini +++ b/Data/User/GameConfig/GP5E01.ini @@ -2,7 +2,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -Issues="Some graphical bugs" +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] @@ -381,3 +381,14 @@ $Press L+X: Player Stops Moving 0022A392 00000001 00000000 40000000 [Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GP5J01.ini b/Data/User/GameConfig/GP5J01.ini new file mode 100644 index 0000000000..0bb483a730 --- /dev/null +++ b/Data/User/GameConfig/GP5J01.ini @@ -0,0 +1,21 @@ +# GP5J01 - Mario Party 5 +[EmuState] +#The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnLoad] +#Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GP5P01.ini b/Data/User/GameConfig/GP5P01.ini new file mode 100644 index 0000000000..f05d88efae --- /dev/null +++ b/Data/User/GameConfig/GP5P01.ini @@ -0,0 +1,21 @@ +# GP5P01 - Mario Party 5 +[EmuState] +#The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnLoad] +#Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GPAE01.ini b/Data/User/GameConfig/GPAE01.ini new file mode 100644 index 0000000000..2c4a579eca --- /dev/null +++ b/Data/User/GameConfig/GPAE01.ini @@ -0,0 +1,18 @@ +# GPAE01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAJ01.ini b/Data/User/GameConfig/GPAJ01.ini new file mode 100644 index 0000000000..2c41ef72f0 --- /dev/null +++ b/Data/User/GameConfig/GPAJ01.ini @@ -0,0 +1,18 @@ +# GPAJ01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAP01.ini b/Data/User/GameConfig/GPAP01.ini new file mode 100644 index 0000000000..15bc8aa8cf --- /dev/null +++ b/Data/User/GameConfig/GPAP01.ini @@ -0,0 +1,18 @@ +# GPAP01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAU01.ini b/Data/User/GameConfig/GPAU01.ini new file mode 100644 index 0000000000..21a7a58e23 --- /dev/null +++ b/Data/User/GameConfig/GPAU01.ini @@ -0,0 +1,18 @@ +# GPAU01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/User/GameConfig/GQSDAF.ini index bf754eb2c5..1b7d9a176c 100644 --- a/Data/User/GameConfig/GQSDAF.ini +++ b/Data/User/GameConfig/GQSDAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini index 5ab40734e7..df7fae9cf3 100644 --- a/Data/User/GameConfig/GQSEAF.ini +++ b/Data/User/GameConfig/GQSEAF.ini @@ -426,7 +426,7 @@ EmulationStateId = 4 # Max Affection codes # use only one of these codes at a time for your # favorite character to have max affection. -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] $(M) (Datel) @@ -790,4 +790,3 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False - diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/User/GameConfig/GQSFAF.ini index 56bc287e7e..8eb054e980 100644 --- a/Data/User/GameConfig/GQSFAF.ini +++ b/Data/User/GameConfig/GQSFAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/User/GameConfig/GQSPAF.ini index 64132e6ca7..b7b70f5476 100644 --- a/Data/User/GameConfig/GQSPAF.ini +++ b/Data/User/GameConfig/GQSPAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GQWE69.ini b/Data/User/GameConfig/GQWE69.ini index 4bcef05b38..6fe5409d4f 100644 --- a/Data/User/GameConfig/GQWE69.ini +++ b/Data/User/GameConfig/GQWE69.ini @@ -1,7 +1,16 @@ # GQWE69 - Quidditch World Cup [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Black screen -EmulationStateId = 1 +EmulationIssues = +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWJ69.ini b/Data/User/GameConfig/GQWJ69.ini new file mode 100644 index 0000000000..5ab51bb3b7 --- /dev/null +++ b/Data/User/GameConfig/GQWJ69.ini @@ -0,0 +1,16 @@ +# GQWJ69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWP69.ini b/Data/User/GameConfig/GQWP69.ini new file mode 100644 index 0000000000..b380c45e79 --- /dev/null +++ b/Data/User/GameConfig/GQWP69.ini @@ -0,0 +1,16 @@ +# GQWP69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWX69.ini b/Data/User/GameConfig/GQWX69.ini new file mode 100644 index 0000000000..64692b9bc1 --- /dev/null +++ b/Data/User/GameConfig/GQWX69.ini @@ -0,0 +1,16 @@ +# GQWX69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GRQE41.ini b/Data/User/GameConfig/GRQE41.ini index c4fbb2e36f..b03f78efd5 100644 --- a/Data/User/GameConfig/GRQE41.ini +++ b/Data/User/GameConfig/GRQE41.ini @@ -1,7 +1,18 @@ # GRQE41 - CITY RACER [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Nothing +EmulationStateId = 2 +EmulationIssues = Needs lle audio for sound and real XFB for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2D78.ini b/Data/User/GameConfig/GS2D78.ini new file mode 100644 index 0000000000..85bcce0ad9 --- /dev/null +++ b/Data/User/GameConfig/GS2D78.ini @@ -0,0 +1,18 @@ +# GS2D78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2E78.ini b/Data/User/GameConfig/GS2E78.ini new file mode 100644 index 0000000000..ed66cb0da2 --- /dev/null +++ b/Data/User/GameConfig/GS2E78.ini @@ -0,0 +1,18 @@ +# GS2E78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2F78.ini b/Data/User/GameConfig/GS2F78.ini new file mode 100644 index 0000000000..baa39b549c --- /dev/null +++ b/Data/User/GameConfig/GS2F78.ini @@ -0,0 +1,18 @@ +# GS2F78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2P78.ini b/Data/User/GameConfig/GS2P78.ini new file mode 100644 index 0000000000..79fdc07d89 --- /dev/null +++ b/Data/User/GameConfig/GS2P78.ini @@ -0,0 +1,18 @@ +# GS2P78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSE8P.ini b/Data/User/GameConfig/GSSE8P.ini index f45b8c0ae8..91802d2e33 100644 --- a/Data/User/GameConfig/GSSE8P.ini +++ b/Data/User/GameConfig/GSSE8P.ini @@ -1,8 +1,8 @@ # GSSE8P - Sega Soccer Slam [Core] Values set here will override the main dolphin settings. -TLBHack = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code @@ -19,3 +19,14 @@ $SubZero Have Tons Of Cash 0423C204 05F5E0FF $Volta Have Tons Of Cash 0423CEA8 05F5E0FF +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSJ8P.ini b/Data/User/GameConfig/GSSJ8P.ini new file mode 100644 index 0000000000..4a335940ce --- /dev/null +++ b/Data/User/GameConfig/GSSJ8P.ini @@ -0,0 +1,18 @@ +# GSSJ8P - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSP70.ini b/Data/User/GameConfig/GSSP70.ini new file mode 100644 index 0000000000..80830290cf --- /dev/null +++ b/Data/User/GameConfig/GSSP70.ini @@ -0,0 +1,18 @@ +# GSSP70 - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSP8P.ini b/Data/User/GameConfig/GSSP8P.ini new file mode 100644 index 0000000000..233ab70ade --- /dev/null +++ b/Data/User/GameConfig/GSSP8P.ini @@ -0,0 +1,18 @@ +# GSSP8P - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GTZE41.ini b/Data/User/GameConfig/GTZE41.ini index bf6dbaac1d..be20078a64 100644 --- a/Data/User/GameConfig/GTZE41.ini +++ b/Data/User/GameConfig/GTZE41.ini @@ -1,7 +1,18 @@ # GTZE41 - DISNEY'S TARZAN [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GTZP41.ini b/Data/User/GameConfig/GTZP41.ini new file mode 100644 index 0000000000..4a350e41c6 --- /dev/null +++ b/Data/User/GameConfig/GTZP41.ini @@ -0,0 +1,18 @@ +# GTZP41 - DISNEY'S TARZAN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GUME52.ini b/Data/User/GameConfig/GUME52.ini index 396010c826..f53bfb3282 100644 --- a/Data/User/GameConfig/GUME52.ini +++ b/Data/User/GameConfig/GUME52.ini @@ -2,8 +2,8 @@ [Core] Values set here will override the main dolphin settings. MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. -EmulationStateId = 2 +EmulationIssues = Needs MMU to run, and it runs slow. +EmulationStateId = 3 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GUMP52.ini b/Data/User/GameConfig/GUMP52.ini index 4265749160..fc0867e23f 100644 --- a/Data/User/GameConfig/GUMP52.ini +++ b/Data/User/GameConfig/GUMP52.ini @@ -2,8 +2,8 @@ [Core] Values set here will override the main dolphin settings. MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. -EmulationStateId = 2 +EmulationIssues = Needs MMU to run, and it runs slow. +EmulationStateId = 3 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GVLD69.ini b/Data/User/GameConfig/GVLD69.ini new file mode 100644 index 0000000000..59306d751d --- /dev/null +++ b/Data/User/GameConfig/GVLD69.ini @@ -0,0 +1,17 @@ +# GVLD69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLE69.ini b/Data/User/GameConfig/GVLE69.ini index c823a972a1..b7a55cecaf 100644 --- a/Data/User/GameConfig/GVLE69.ini +++ b/Data/User/GameConfig/GVLE69.ini @@ -1,7 +1,17 @@ # GVLE69 - Marvel Nemesis: Rise of the Imperfects [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLF69.ini b/Data/User/GameConfig/GVLF69.ini new file mode 100644 index 0000000000..1f5785f150 --- /dev/null +++ b/Data/User/GameConfig/GVLF69.ini @@ -0,0 +1,17 @@ +# GVLF69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLP69.ini b/Data/User/GameConfig/GVLP69.ini new file mode 100644 index 0000000000..b7a55cecaf --- /dev/null +++ b/Data/User/GameConfig/GVLP69.ini @@ -0,0 +1,17 @@ +# GVLE69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GW2E78.ini b/Data/User/GameConfig/GW2E78.ini index 1552c4b1c3..9137f3bd0b 100644 --- a/Data/User/GameConfig/GW2E78.ini +++ b/Data/User/GameConfig/GW2E78.ini @@ -1,7 +1,18 @@ # GW2E78 - WWE Day of Reckoning 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = DSP/ARAM/Audio Streaming problem +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GW2P78.ini b/Data/User/GameConfig/GW2P78.ini index eabb9a40a1..b3783f9a2a 100644 --- a/Data/User/GameConfig/GW2P78.ini +++ b/Data/User/GameConfig/GW2P78.ini @@ -1,10 +1,18 @@ # GW2P78 - WWE Day of Reckoning 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = DSP/ARAM/Audio Streaming problem +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWOE5G.ini b/Data/User/GameConfig/GWOE5G.ini index 7960d2dc81..44ebf853ef 100644 --- a/Data/User/GameConfig/GWOE5G.ini +++ b/Data/User/GameConfig/GWOE5G.ini @@ -1,7 +1,17 @@ # GWOE5G - Blowout [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -Issues="Does Nothing" +EmulationStateId = 4 +EmulationIssues = Needs LLE audio to get ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 diff --git a/Data/User/GameConfig/GWPE78.ini b/Data/User/GameConfig/GWPE78.ini index 0cd68a4d4d..0f23b70145 100644 --- a/Data/User/GameConfig/GWPE78.ini +++ b/Data/User/GameConfig/GWPE78.ini @@ -1,7 +1,18 @@ # GWPE78 - WWE Day of Reckoning [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWPJG2.ini b/Data/User/GameConfig/GWPJG2.ini new file mode 100644 index 0000000000..c4ee3c6b1c --- /dev/null +++ b/Data/User/GameConfig/GWPJG2.ini @@ -0,0 +1,18 @@ +# GWPJG2 - WWE Day of Reckoning +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWPP78.ini b/Data/User/GameConfig/GWPP78.ini new file mode 100644 index 0000000000..e5582f167e --- /dev/null +++ b/Data/User/GameConfig/GWPP78.ini @@ -0,0 +1,18 @@ +# GWPP78 - WWE Day of Reckoning +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/User/GameConfig/GWRE01.ini index 0e9d759f37..17d0f32cdf 100644 --- a/Data/User/GameConfig/GWRE01.ini +++ b/Data/User/GameConfig/GWRE01.ini @@ -2,13 +2,8 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = needs the frame cheats from ini +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. -+$Patches -0x800FDCC0:dword:0x60000000 -0x800FB0F0:dword:0x60000000 -0x800FDF20:dword:0x60000000 -0x8002363C:dword:0x60000000 [ActionReplay] Add action replay cheats here. $(m) C4116318 00000800 diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/User/GameConfig/GWRP01.ini index 218585bb63..bdeeeb8654 100644 --- a/Data/User/GameConfig/GWRP01.ini +++ b/Data/User/GameConfig/GWRP01.ini @@ -2,13 +2,8 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = goes to before race with framepatch +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. -+$Patches -0x800FDAD8:dword:0x60000000 -0x800FAF08:dword:0x60000000 -0x800FDD38:dword:0x60000000 -0x800235F0:dword:0x60000000 [Video] ProjectionHack = 0 [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/GZPE70.ini b/Data/User/GameConfig/GZPE70.ini new file mode 100644 index 0000000000..4218ea3b89 --- /dev/null +++ b/Data/User/GameConfig/GZPE70.ini @@ -0,0 +1,18 @@ +# GZPE70 - Zapper +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GZPP70.ini b/Data/User/GameConfig/GZPP70.ini new file mode 100644 index 0000000000..08bb058920 --- /dev/null +++ b/Data/User/GameConfig/GZPP70.ini @@ -0,0 +1,18 @@ +# GZPP70 - Zapper +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/User/GameConfig/PH_PRESETS.ini index 007e18ce07..f5e7a4aacf 100644 --- a/Data/User/GameConfig/PH_PRESETS.ini +++ b/Data/User/GameConfig/PH_PRESETS.ini @@ -33,8 +33,7 @@ PH_ExtraParam = 1 [5] Title = Tales of Symphonia GC -PH_ZNear = 0.5 -PH_ZFar = 1 +PH_ZNear = 0.00026 # --------------------------------------------------- diff --git a/Data/User/GameConfig/R22E01.ini b/Data/User/GameConfig/R22E01.ini index dfe3542671..c494ee5e12 100644 --- a/Data/User/GameConfig/R22E01.ini +++ b/Data/User/GameConfig/R22E01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R22J01.ini b/Data/User/GameConfig/R22J01.ini index c38ff20966..94aeac02f3 100644 --- a/Data/User/GameConfig/R22J01.ini +++ b/Data/User/GameConfig/R22J01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R22P01.ini b/Data/User/GameConfig/R22P01.ini index 6153cb0d06..8fb637216f 100644 --- a/Data/User/GameConfig/R22P01.ini +++ b/Data/User/GameConfig/R22P01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R2GEXJ.ini b/Data/User/GameConfig/R2GEXJ.ini index e23427e158..40208d8153 100644 --- a/Data/User/GameConfig/R2GEXJ.ini +++ b/Data/User/GameConfig/R2GEXJ.ini @@ -1,7 +1,7 @@ # R2GEXJ - FRAGILE DREAMS [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -18,3 +18,4 @@ UseXFB = True UseRealXFB = False [Video_Hacks] DlistCachingEnable = False +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R2GJAF.ini b/Data/User/GameConfig/R2GJAF.ini index d93e14ce7a..ff4a1885cd 100644 --- a/Data/User/GameConfig/R2GJAF.ini +++ b/Data/User/GameConfig/R2GJAF.ini @@ -1,7 +1,7 @@ # R2GJAF - FRAGILE [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,6 +16,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False -[Video_Enhancements] [Video_Hacks] DlistCachingEnable = False +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R2GP99.ini b/Data/User/GameConfig/R2GP99.ini index 6f2140a5c2..a35a2d475c 100644 --- a/Data/User/GameConfig/R2GP99.ini +++ b/Data/User/GameConfig/R2GP99.ini @@ -1,7 +1,7 @@ # R2GP99 - FRAGILE DREAMS [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -18,4 +18,4 @@ UseXFB = True UseRealXFB = False [Video_Hacks] DlistCachingEnable = False - +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R3DES5.ini b/Data/User/GameConfig/R3DES5.ini new file mode 100644 index 0000000000..6e986ea0f3 --- /dev/null +++ b/Data/User/GameConfig/R3DES5.ini @@ -0,0 +1,18 @@ +# R3DES5 - Dream Pinball 3d +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Automatic framelimit is problematic. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/R3DPS5.ini b/Data/User/GameConfig/R3DPS5.ini new file mode 100644 index 0000000000..f0d2c21b46 --- /dev/null +++ b/Data/User/GameConfig/R3DPS5.ini @@ -0,0 +1,18 @@ +# R3DPS5 - Dream Pinball 3d +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Automatic framelimit is problematic. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/User/GameConfig/R3ME01.ini index 28547c72d7..4c891c14b1 100644 --- a/Data/User/GameConfig/R3ME01.ini +++ b/Data/User/GameConfig/R3ME01.ini @@ -1,10 +1,19 @@ -# R3ME01 - Metroid Prime Trilogy -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] +# R3ME01 - Metroid Prime Trilogy +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/User/GameConfig/R3MP01.ini new file mode 100644 index 0000000000..71938b821a --- /dev/null +++ b/Data/User/GameConfig/R3MP01.ini @@ -0,0 +1,19 @@ +# R3MP01 - Metroid Prime Trilogy +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/User/GameConfig/R4QE01.ini index 3ae6cb283a..e822d53161 100644 --- a/Data/User/GameConfig/R4QE01.ini +++ b/Data/User/GameConfig/R4QE01.ini @@ -1,20 +1,19 @@ -# R4QE01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QE01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/User/GameConfig/R4QJ01.ini index d97cc37c84..14bef2a3e5 100644 --- a/Data/User/GameConfig/R4QJ01.ini +++ b/Data/User/GameConfig/R4QJ01.ini @@ -1,20 +1,19 @@ -# R4QJ01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QJ01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/User/GameConfig/R4QK01.ini index 2c45a961a0..2fb7675fd4 100644 --- a/Data/User/GameConfig/R4QK01.ini +++ b/Data/User/GameConfig/R4QK01.ini @@ -1,20 +1,19 @@ -# R4QK01 - Mario Power Soccer -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QK01 - Mario Power Soccer +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/User/GameConfig/R4QP01.ini index 8ec96e8cf3..54fa2ec234 100644 --- a/Data/User/GameConfig/R4QP01.ini +++ b/Data/User/GameConfig/R4QP01.ini @@ -1,20 +1,19 @@ -# R4QP01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QP01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/User/GameConfig/R5WEA4.ini index 315f7f340a..48b1c5cd12 100644 --- a/Data/User/GameConfig/R5WEA4.ini +++ b/Data/User/GameConfig/R5WEA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/User/GameConfig/R5WJA4.ini index 30a983b648..25d6076a05 100644 --- a/Data/User/GameConfig/R5WJA4.ini +++ b/Data/User/GameConfig/R5WJA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R6BE78.ini b/Data/User/GameConfig/R6BE78.ini index 5cd3873ab9..963ed05ebb 100644 --- a/Data/User/GameConfig/R6BE78.ini +++ b/Data/User/GameConfig/R6BE78.ini @@ -1,8 +1,8 @@ -# R6BE78 - Blob07 +# R6BE78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,4 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False - +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/User/GameConfig/R6BJ78.ini index dad405fa11..dec4da7dbb 100644 --- a/Data/User/GameConfig/R6BJ78.ini +++ b/Data/User/GameConfig/R6BJ78.ini @@ -1,8 +1,8 @@ # R6BJ78 - Blob Colorful Na Kibou [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/User/GameConfig/R6BK78.ini index 21aa5f90af..1de85fe4c8 100644 --- a/Data/User/GameConfig/R6BK78.ini +++ b/Data/User/GameConfig/R6BK78.ini @@ -1,8 +1,8 @@ -# R6BK78 - Blob07 +# R6BK78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/User/GameConfig/R6BP78.ini index e49b9b4fca..d668b175ba 100644 --- a/Data/User/GameConfig/R6BP78.ini +++ b/Data/User/GameConfig/R6BP78.ini @@ -1,8 +1,8 @@ -# R6BP78 - Blob07 +# R6BP78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/User/GameConfig/R6BX78.ini index d37400d0e0..6448f5d6e0 100644 --- a/Data/User/GameConfig/R6BX78.ini +++ b/Data/User/GameConfig/R6BX78.ini @@ -1,8 +1,8 @@ -# R6BX78 - Blob07 +# R6BX78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R7PE01.ini b/Data/User/GameConfig/R7PE01.ini index 1a052239ae..244ccc1db3 100644 --- a/Data/User/GameConfig/R7PE01.ini +++ b/Data/User/GameConfig/R7PE01.ini @@ -1,19 +1,18 @@ -# R7PE01 - Punch Out -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run -[OnFrame] Add memory patches to be applied every frame here. -+$Patch -0x8011E0F8:dword:0x4E800020 -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# R7PE01 - Punch Out +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run +[OnFrame] Add memory patches to be applied every frame here. ++$Patch +0x8011E0F8:dword:0x4E800020 +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/R7PP01.ini b/Data/User/GameConfig/R7PP01.ini index 302bd1e965..a0113b7415 100644 --- a/Data/User/GameConfig/R7PP01.ini +++ b/Data/User/GameConfig/R7PP01.ini @@ -1,13 +1,12 @@ -# R7PP01 - Punch Out -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 -[OnFrame] Add memory patches to be applied every frame here. -+$Patch -0x8011F1CC:dword:0x4E800020 -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# R7PP01 - Punch Out +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 5 +[OnFrame] Add memory patches to be applied every frame here. ++$Patch +0x8011F1CC:dword:0x4E800020 +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Wii] diff --git a/Data/User/GameConfig/R8AE01.ini b/Data/User/GameConfig/R8AE01.ini new file mode 100644 index 0000000000..56e5afe685 --- /dev/null +++ b/Data/User/GameConfig/R8AE01.ini @@ -0,0 +1,20 @@ +# R8AE01 - Pokepark Wii +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/User/GameConfig/R8AJ01.ini index 594e651a76..d8bb08f0ba 100644 --- a/Data/User/GameConfig/R8AJ01.ini +++ b/Data/User/GameConfig/R8AJ01.ini @@ -2,8 +2,11 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = NPCs sporadically disappear. +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/User/GameConfig/R8AP01.ini index 1c06c00d3d..c677497a7b 100644 --- a/Data/User/GameConfig/R8AP01.ini +++ b/Data/User/GameConfig/R8AP01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = NPCs sporadically disappear. +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 60b08e73c4..a2cad6ff7d 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -1,16 +1,17 @@ -# RBWE01 - Battalion Wars 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] +# RBWE01 - Battalion Wars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini index 8efad9729f..0d799c74fa 100644 --- a/Data/User/GameConfig/RBWJ01.ini +++ b/Data/User/GameConfig/RBWJ01.ini @@ -1,16 +1,17 @@ -# RBWJ01 - Totsugeki Famicom Wars vs. -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] +# RBWJ01 - Totsugeki Famicom Wars vs. +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini index 36b0b3bc98..5422388866 100644 --- a/Data/User/GameConfig/RBWP01.ini +++ b/Data/User/GameConfig/RBWP01.ini @@ -1,16 +1,17 @@ -# RBWP01 - Battalion Wars 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] +# RBWP01 - Battalion Wars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/User/GameConfig/RCJE8P.ini index 845f08de77..79280a5609 100644 --- a/Data/User/GameConfig/RCJE8P.ini +++ b/Data/User/GameConfig/RCJE8P.ini @@ -24,6 +24,5 @@ PH_ZFar = [Video_Enhancements] ForceFiltering = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/RCJP8P.ini b/Data/User/GameConfig/RCJP8P.ini index 6d82c897e5..5a242b5e4e 100644 --- a/Data/User/GameConfig/RCJP8P.ini +++ b/Data/User/GameConfig/RCJP8P.ini @@ -18,6 +18,5 @@ PH_ZFar = [Video_Enhancements] ForceFiltering = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/User/GameConfig/RD2E41.ini index a93f6359e6..92ca3f53b5 100644 --- a/Data/User/GameConfig/RD2E41.ini +++ b/Data/User/GameConfig/RD2E41.ini @@ -1,17 +1,16 @@ -# RD2E41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2E41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/User/GameConfig/RD2J41.ini index 8fccc41c35..2042a71430 100644 --- a/Data/User/GameConfig/RD2J41.ini +++ b/Data/User/GameConfig/RD2J41.ini @@ -1,17 +1,16 @@ -# RD2J41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2J41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/User/GameConfig/RD2K41.ini index aa0e90f2b2..93123fa871 100644 --- a/Data/User/GameConfig/RD2K41.ini +++ b/Data/User/GameConfig/RD2K41.ini @@ -1,17 +1,16 @@ -# RD2K41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2K41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/User/GameConfig/RD2P41.ini index 7cbf91b22d..8a7e5f7541 100644 --- a/Data/User/GameConfig/RD2P41.ini +++ b/Data/User/GameConfig/RD2P41.ini @@ -1,17 +1,16 @@ -# RD2P41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2P41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/User/GameConfig/RD2X41.ini index 6748136cad..53f0716869 100644 --- a/Data/User/GameConfig/RD2X41.ini +++ b/Data/User/GameConfig/RD2X41.ini @@ -1,17 +1,16 @@ -# RD2X41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2X41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RFFEGD.ini b/Data/User/GameConfig/RFFEGD.ini index 0db2a572ee..5efa2dd980 100644 --- a/Data/User/GameConfig/RFFEGD.ini +++ b/Data/User/GameConfig/RFFEGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,7 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/User/GameConfig/RFFJGD.ini index 24d3099bc8..850bb88c9d 100644 --- a/Data/User/GameConfig/RFFJGD.ini +++ b/Data/User/GameConfig/RFFJGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,6 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/User/GameConfig/RFFPGD.ini index bb0471ea68..6c9c27abb4 100644 --- a/Data/User/GameConfig/RFFPGD.ini +++ b/Data/User/GameConfig/RFFPGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,6 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RH8E4F.ini b/Data/User/GameConfig/RH8E4F.ini new file mode 100644 index 0000000000..a6e799cbc6 --- /dev/null +++ b/Data/User/GameConfig/RH8E4F.ini @@ -0,0 +1,18 @@ +# RH8E4F - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8JEL.ini b/Data/User/GameConfig/RH8JEL.ini new file mode 100644 index 0000000000..36659d8842 --- /dev/null +++ b/Data/User/GameConfig/RH8JEL.ini @@ -0,0 +1,18 @@ +# RH8JEL - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8P4F.ini b/Data/User/GameConfig/RH8P4F.ini index f8247434b5..a3c1ea611f 100644 --- a/Data/User/GameConfig/RH8P4F.ini +++ b/Data/User/GameConfig/RH8P4F.ini @@ -1,9 +1,18 @@ -# RH8P4F - Tomb Raider Eight +# RH8P4F - Tomb Raider Underworld [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs real Xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8X4F.ini b/Data/User/GameConfig/RH8X4F.ini new file mode 100644 index 0000000000..4a945f5269 --- /dev/null +++ b/Data/User/GameConfig/RH8X4F.ini @@ -0,0 +1,18 @@ +# RH8X4F - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/User/GameConfig/RHDE8P.ini index 4a2fd1499c..31d7a2f620 100644 --- a/Data/User/GameConfig/RHDE8P.ini +++ b/Data/User/GameConfig/RHDE8P.ini @@ -1,20 +1,19 @@ -# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 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 +# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/User/GameConfig/RHDJ8P.ini index 784933d971..014c94aaba 100644 --- a/Data/User/GameConfig/RHDJ8P.ini +++ b/Data/User/GameConfig/RHDJ8P.ini @@ -1,20 +1,19 @@ -# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 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 +# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/User/GameConfig/RHDP8P.ini index f6a1f98430..6183ad8422 100644 --- a/Data/User/GameConfig/RHDP8P.ini +++ b/Data/User/GameConfig/RHDP8P.ini @@ -1,20 +1,19 @@ -# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 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 +# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/User/GameConfig/RHOE8P.ini index c28f341fb6..55d697ca52 100644 --- a/Data/User/GameConfig/RHOE8P.ini +++ b/Data/User/GameConfig/RHOE8P.ini @@ -1,39 +1,38 @@ -# RHOE8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -$Infinte Bomb Usage after Getting 1 [g6flavor] -04159D1C 60000000 -$If Score Increase, MAX [ZiT] -C2142134 00000002 -3CA03B9B 38A5C9FF -90A60178 00000000 -$Infinite LIFE [ZiT] -04130ED4 60000000 -$Infinite Bullet [ZiT] -04159FAC 907D0720 -$CASH MAX [ZiT] -C214B118 00000002 -3CA03B9B 38A5C9FF -90A300D8 00000000 -$CASH MAX [ZiT] -C214B110 00000002 -3CA03B9B 38A5C9FF -90A300DC 00000000 -$If Score Increase, MAX [ZiT] -C2152674 00000002 -3CA03B9B 38A5C9FF -90B60178 00000000 -[Wii] -DisableWiimoteSpeaker = 1 +# RHOE8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +$Infinte Bomb Usage after Getting 1 [g6flavor] +04159D1C 60000000 +$If Score Increase, MAX [ZiT] +C2142134 00000002 +3CA03B9B 38A5C9FF +90A60178 00000000 +$Infinite LIFE [ZiT] +04130ED4 60000000 +$Infinite Bullet [ZiT] +04159FAC 907D0720 +$CASH MAX [ZiT] +C214B118 00000002 +3CA03B9B 38A5C9FF +90A300D8 00000000 +$CASH MAX [ZiT] +C214B110 00000002 +3CA03B9B 38A5C9FF +90A300DC 00000000 +$If Score Increase, MAX [ZiT] +C2152674 00000002 +3CA03B9B 38A5C9FF +90B60178 00000000 +[Wii] diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/User/GameConfig/RHOJ8P.ini index 3e23f6605c..2eb65c9fc9 100644 --- a/Data/User/GameConfig/RHOJ8P.ini +++ b/Data/User/GameConfig/RHOJ8P.ini @@ -1,12 +1,11 @@ -# RHOJ8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RHOJ8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/User/GameConfig/RHOP8P.ini index 8e9d0e879d..85a8e2770a 100644 --- a/Data/User/GameConfig/RHOP8P.ini +++ b/Data/User/GameConfig/RHOP8P.ini @@ -1,12 +1,11 @@ -# RHOP8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RHOP8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/User/GameConfig/RIPEAF.ini index da321f88ce..6373ea5568 100644 --- a/Data/User/GameConfig/RIPEAF.ini +++ b/Data/User/GameConfig/RIPEAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/User/GameConfig/RIPJAF.ini index dbbee55ffb..1cf02a9079 100644 --- a/Data/User/GameConfig/RIPJAF.ini +++ b/Data/User/GameConfig/RIPJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/User/GameConfig/RIPPAF.ini index 64d6ac3fd5..b6b9edb6fb 100644 --- a/Data/User/GameConfig/RIPPAF.ini +++ b/Data/User/GameConfig/RIPPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/User/GameConfig/RIUJAF.ini index e18411c3ff..49dac820e4 100644 --- a/Data/User/GameConfig/RIUJAF.ini +++ b/Data/User/GameConfig/RIUJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIUPAF.ini b/Data/User/GameConfig/RIUPAF.ini index 2192cb63bd..a557f4e1da 100644 --- a/Data/User/GameConfig/RIUPAF.ini +++ b/Data/User/GameConfig/RIUPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/User/GameConfig/RLGE64.ini index 505df3c17d..5e66cda379 100644 --- a/Data/User/GameConfig/RLGE64.ini +++ b/Data/User/GameConfig/RLGE64.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/User/GameConfig/RLGJ52.ini index 52b8648072..37b4f728d1 100644 --- a/Data/User/GameConfig/RLGJ52.ini +++ b/Data/User/GameConfig/RLGJ52.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/User/GameConfig/RLGP64.ini index f82d202584..6404bf0a77 100644 --- a/Data/User/GameConfig/RLGP64.ini +++ b/Data/User/GameConfig/RLGP64.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/User/GameConfig/RM3E01.ini index cb87db9070..182660bd97 100644 --- a/Data/User/GameConfig/RM3E01.ini +++ b/Data/User/GameConfig/RM3E01.ini @@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/User/GameConfig/RM3J01.ini index 97a88c4c69..50c84d87a9 100644 --- a/Data/User/GameConfig/RM3J01.ini +++ b/Data/User/GameConfig/RM3J01.ini @@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/User/GameConfig/RM3P01.ini index 093afc15db..0832325938 100644 --- a/Data/User/GameConfig/RM3P01.ini +++ b/Data/User/GameConfig/RM3P01.ini @@ -23,6 +23,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/User/GameConfig/RNOJ01.ini index f5b790de88..50f94d5f6a 100644 --- a/Data/User/GameConfig/RNOJ01.ini +++ b/Data/User/GameConfig/RNOJ01.ini @@ -1,8 +1,8 @@ # RNOJ01 - Another Code R Kioku no Tobira [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. -EmulationStateId = 3 +EmulationIssues = Efb to Ram is needed for proper scene transition effect. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RNOP01.ini b/Data/User/GameConfig/RNOP01.ini index a90f6378be..7a56630ac2 100644 --- a/Data/User/GameConfig/RNOP01.ini +++ b/Data/User/GameConfig/RNOP01.ini @@ -1,8 +1,8 @@ # RNOP01 - Another Code:R [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. -EmulationStateId = 3 +EmulationIssues = Efb to Ram is needed for proper scene transition effect. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/ROLE8P.ini b/Data/User/GameConfig/ROLE8P.ini index 9fb165c654..607d412d7f 100644 --- a/Data/User/GameConfig/ROLE8P.ini +++ b/Data/User/GameConfig/ROLE8P.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLJ01.ini b/Data/User/GameConfig/ROLJ01.ini index 59e58e525a..43348472b6 100644 --- a/Data/User/GameConfig/ROLJ01.ini +++ b/Data/User/GameConfig/ROLJ01.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLK01.ini b/Data/User/GameConfig/ROLK01.ini index 51ee178104..0b49240afd 100644 --- a/Data/User/GameConfig/ROLK01.ini +++ b/Data/User/GameConfig/ROLK01.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLP8P.ini b/Data/User/GameConfig/ROLP8P.ini index b969360e00..e39bc91547 100644 --- a/Data/User/GameConfig/ROLP8P.ini +++ b/Data/User/GameConfig/ROLP8P.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/User/GameConfig/ROUJAF.ini index 5dea114bf6..ddea43bdf2 100644 --- a/Data/User/GameConfig/ROUJAF.ini +++ b/Data/User/GameConfig/ROUJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/ROUPAF.ini b/Data/User/GameConfig/ROUPAF.ini index 5f9b8e0ce7..82f940a178 100644 --- a/Data/User/GameConfig/ROUPAF.ini +++ b/Data/User/GameConfig/ROUPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini index 91a35e540d..48d52b4320 100644 --- a/Data/User/GameConfig/RQREXJ.ini +++ b/Data/User/GameConfig/RQREXJ.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini index c647c4acee..7ae768c3b4 100644 --- a/Data/User/GameConfig/RQRJAF.ini +++ b/Data/User/GameConfig/RQRJAF.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini index 8052e6084b..752c0fa2bd 100644 --- a/Data/User/GameConfig/RQRPAF.ini +++ b/Data/User/GameConfig/RQRPAF.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/User/GameConfig/RRKE70.ini index 621b0dfd09..ebb3188d0b 100644 --- a/Data/User/GameConfig/RRKE70.ini +++ b/Data/User/GameConfig/RRKE70.ini @@ -16,5 +16,4 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/User/GameConfig/RRKP70.ini index c5fc07ede3..e69e07f92e 100644 --- a/Data/User/GameConfig/RRKP70.ini +++ b/Data/User/GameConfig/RRKP70.ini @@ -16,5 +16,4 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RRZEGY.ini b/Data/User/GameConfig/RRZEGY.ini new file mode 100644 index 0000000000..78a1056318 --- /dev/null +++ b/Data/User/GameConfig/RRZEGY.ini @@ -0,0 +1,18 @@ +# RRZEGY - Rubik's Puzzle World +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/RRZPGY.ini b/Data/User/GameConfig/RRZPGY.ini new file mode 100644 index 0000000000..b7b812a090 --- /dev/null +++ b/Data/User/GameConfig/RRZPGY.ini @@ -0,0 +1,18 @@ +# RRZPGY - Rubik's Puzzle World +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/RS5EC8.ini b/Data/User/GameConfig/RS5EC8.ini new file mode 100644 index 0000000000..cdba3b671b --- /dev/null +++ b/Data/User/GameConfig/RS5EC8.ini @@ -0,0 +1,17 @@ +# RS5EC8 - SAMURAI WARRIORS KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RS5JC8.ini b/Data/User/GameConfig/RS5JC8.ini new file mode 100644 index 0000000000..0ddda2536e --- /dev/null +++ b/Data/User/GameConfig/RS5JC8.ini @@ -0,0 +1,17 @@ +# RS5JC8 - Sengoku Musou KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RS5PC8.ini b/Data/User/GameConfig/RS5PC8.ini new file mode 100644 index 0000000000..7ddeb980d1 --- /dev/null +++ b/Data/User/GameConfig/RS5PC8.ini @@ -0,0 +1,17 @@ +# RS5PC8 - SAMURAI WARRIORS KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RTZE08.ini b/Data/User/GameConfig/RTZE08.ini index ff41b71a06..27524e8236 100644 --- a/Data/User/GameConfig/RTZE08.ini +++ b/Data/User/GameConfig/RTZE08.ini @@ -1,20 +1,19 @@ -# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZJ08.ini b/Data/User/GameConfig/RTZJ08.ini index 5a62e2c8ca..6a5aa8d6ee 100644 --- a/Data/User/GameConfig/RTZJ08.ini +++ b/Data/User/GameConfig/RTZJ08.ini @@ -1,20 +1,19 @@ -# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZK08.ini b/Data/User/GameConfig/RTZK08.ini index 6a7d00e753..ec333d6bce 100644 --- a/Data/User/GameConfig/RTZK08.ini +++ b/Data/User/GameConfig/RTZK08.ini @@ -1,20 +1,19 @@ -# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZP08.ini b/Data/User/GameConfig/RTZP08.ini index 8add9d2869..f3b0834049 100644 --- a/Data/User/GameConfig/RTZP08.ini +++ b/Data/User/GameConfig/RTZP08.ini @@ -1,20 +1,19 @@ -# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/User/GameConfig/RZJD69.ini index 671318fd38..848dcba860 100644 --- a/Data/User/GameConfig/RZJD69.ini +++ b/Data/User/GameConfig/RZJD69.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/User/GameConfig/RZJE69.ini index a37d3f9223..c48c837a27 100644 --- a/Data/User/GameConfig/RZJE69.ini +++ b/Data/User/GameConfig/RZJE69.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/User/GameConfig/RZJJ13.ini index d109d22a98..24aa98035b 100644 --- a/Data/User/GameConfig/RZJJ13.ini +++ b/Data/User/GameConfig/RZJJ13.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/User/GameConfig/RZJP69.ini index 63b230b1da..9fa88eb843 100644 --- a/Data/User/GameConfig/RZJP69.ini +++ b/Data/User/GameConfig/RZJP69.ini @@ -31,6 +31,5 @@ $Rapid Fire [TNTkryzt] [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/User/GameConfig/RZZE8P.ini index 31859ef891..9c74320a0b 100644 --- a/Data/User/GameConfig/RZZE8P.ini +++ b/Data/User/GameConfig/RZZE8P.ini @@ -1,17 +1,16 @@ -# RZZE8P - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZE8P - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/User/GameConfig/RZZJEL.ini index 0e6a08334a..6ace0cb90c 100644 --- a/Data/User/GameConfig/RZZJEL.ini +++ b/Data/User/GameConfig/RZZJEL.ini @@ -1,17 +1,16 @@ -# RZZJEL - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZJEL - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/User/GameConfig/RZZP8P.ini index 6dc117c26f..ac5bed9812 100644 --- a/Data/User/GameConfig/RZZP8P.ini +++ b/Data/User/GameConfig/RZZP8P.ini @@ -1,17 +1,16 @@ -# RZZP8P - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZP8P - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/S72E01.ini b/Data/User/GameConfig/S72E01.ini new file mode 100644 index 0000000000..fba45b8b64 --- /dev/null +++ b/Data/User/GameConfig/S72E01.ini @@ -0,0 +1,18 @@ +# S72E01 - Kirby's Dream Collection Special Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Classic games are unplayable. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/S72J01.ini b/Data/User/GameConfig/S72J01.ini new file mode 100644 index 0000000000..74c8225e3a --- /dev/null +++ b/Data/User/GameConfig/S72J01.ini @@ -0,0 +1,18 @@ +# S72J01 - Hoshi No Kirby: 20th Anniversary Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Classic games are unplayable. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/User/GameConfig/SC2E8P.ini index ff46b91be8..998d51859d 100644 --- a/Data/User/GameConfig/SC2E8P.ini +++ b/Data/User/GameConfig/SC2E8P.ini @@ -1,21 +1,20 @@ -# SC2E8P - Conduit 2 -[Core] -BlockMerging = 1 -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Gecko] -[Video_Hacks] -DlistCachingEnable = False -[Video_Settings] -[Wii] -DisableWiimoteSpeaker = 1 +# SC2E8P - Conduit 2 +[Core] +BlockMerging = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Gecko] +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +[Wii] diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/User/GameConfig/SC2P8P.ini index a065f8a096..b9f5c5989c 100644 --- a/Data/User/GameConfig/SC2P8P.ini +++ b/Data/User/GameConfig/SC2P8P.ini @@ -1,70 +1,69 @@ -# SC2P8P - Conduit 2 -[Core] -BlockMerging = 1 -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Gecko] -$Undead Invincibility Mode [Bully@Wiiplaza] -F6000001 80008100 -8001002C 90180000 -D200000C 00000006 -2C110035 40820020 -2C0800F4 40820018 -2C0300A0 40820010 -3C007FFF 6000FFFF -90040000 80040000 -60000000 00000000 -E0000000 80008000 -**Offline Only* -**You are completely untouchable* -*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/ -$Inf. Ammo [Bully@Wiiplaza] -F6000001 80008100 -80640000 80050000 -D2000008 00000003 -2C110021 4082000C -38600000 7C030050 -60000000 00000000 -E0000000 80008000 -**Offline Only* -$No Flashwhite [Bully@Wiiplaza] -F6000001 80008100 -EC210032 93C10008 -14000114 60000000 -E0000000 80008000 -$Inf. Money [Bully@Wiiplaza] -F6000001 80008100 -7C003A14 38E70001 -D2000010 00000004 -2C11002F 40820014 -2C0401A8 4082000C -3D807FFF 7D84012E -7C04002E 00000000 -E0000000 80008000 -$Profile One Name Changer Jedi Hack & [Mitch] -0487E2D4 XXXXXXXX -0487E2D8 XXXXXXXX -0487E2DC XXXXXXXX -$Profile Two Name Changer Jedi Hack & [Mitch] -0487E320 0000XXXX -0487E324 XXXXXXXX -0487E328 XXXXXXXX -0487E32C XXXX0000 -$Profile Three Name Changer Jedi Hack & [Mitch] -0487E370 XXXXXXXX -0487E374 XXXXXXXX -[Video_Hacks] -DlistCachingEnable = False -[Video_Settings] -[Wii] -DisableWiimoteSpeaker = 1 +# SC2P8P - Conduit 2 +[Core] +BlockMerging = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Gecko] +$Undead Invincibility Mode [Bully@Wiiplaza] +F6000001 80008100 +8001002C 90180000 +D200000C 00000006 +2C110035 40820020 +2C0800F4 40820018 +2C0300A0 40820010 +3C007FFF 6000FFFF +90040000 80040000 +60000000 00000000 +E0000000 80008000 +**Offline Only* +**You are completely untouchable* +*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/ +$Inf. Ammo [Bully@Wiiplaza] +F6000001 80008100 +80640000 80050000 +D2000008 00000003 +2C110021 4082000C +38600000 7C030050 +60000000 00000000 +E0000000 80008000 +**Offline Only* +$No Flashwhite [Bully@Wiiplaza] +F6000001 80008100 +EC210032 93C10008 +14000114 60000000 +E0000000 80008000 +$Inf. Money [Bully@Wiiplaza] +F6000001 80008100 +7C003A14 38E70001 +D2000010 00000004 +2C11002F 40820014 +2C0401A8 4082000C +3D807FFF 7D84012E +7C04002E 00000000 +E0000000 80008000 +$Profile One Name Changer Jedi Hack & [Mitch] +0487E2D4 XXXXXXXX +0487E2D8 XXXXXXXX +0487E2DC XXXXXXXX +$Profile Two Name Changer Jedi Hack & [Mitch] +0487E320 0000XXXX +0487E324 XXXXXXXX +0487E328 XXXXXXXX +0487E32C XXXX0000 +$Profile Three Name Changer Jedi Hack & [Mitch] +0487E370 XXXXXXXX +0487E374 XXXXXXXX +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +[Wii] diff --git a/Data/User/GameConfig/SCYE4Q.ini b/Data/User/GameConfig/SCYE4Q.ini new file mode 100644 index 0000000000..1000cd8bcc --- /dev/null +++ b/Data/User/GameConfig/SCYE4Q.ini @@ -0,0 +1,15 @@ +# SCYE4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYP4Q.ini b/Data/User/GameConfig/SCYP4Q.ini new file mode 100644 index 0000000000..a7f2b779ff --- /dev/null +++ b/Data/User/GameConfig/SCYP4Q.ini @@ -0,0 +1,15 @@ +# SCYP4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYX4Q.ini b/Data/User/GameConfig/SCYX4Q.ini new file mode 100644 index 0000000000..6f1a2cf0b3 --- /dev/null +++ b/Data/User/GameConfig/SCYX4Q.ini @@ -0,0 +1,15 @@ +# SCYX4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYY4Q.ini b/Data/User/GameConfig/SCYY4Q.ini new file mode 100644 index 0000000000..b2637bb69c --- /dev/null +++ b/Data/User/GameConfig/SCYY4Q.ini @@ -0,0 +1,15 @@ +# SCYY4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYZ4Q.ini b/Data/User/GameConfig/SCYZ4Q.ini new file mode 100644 index 0000000000..9fad833875 --- /dev/null +++ b/Data/User/GameConfig/SCYZ4Q.ini @@ -0,0 +1,15 @@ +# SCYZ4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/User/GameConfig/SD2E41.ini index 179c13afb9..ae90ff5196 100644 --- a/Data/User/GameConfig/SD2E41.ini +++ b/Data/User/GameConfig/SD2E41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/User/GameConfig/SD2J01.ini index f29168a46c..3285e7c75a 100644 --- a/Data/User/GameConfig/SD2J01.ini +++ b/Data/User/GameConfig/SD2J01.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/User/GameConfig/SD2P41.ini index 744a354aaf..2111a3c298 100644 --- a/Data/User/GameConfig/SD2P41.ini +++ b/Data/User/GameConfig/SD2P41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/User/GameConfig/SD2Y41.ini index 9daa079aac..59c9fb666b 100644 --- a/Data/User/GameConfig/SD2Y41.ini +++ b/Data/User/GameConfig/SD2Y41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SDBE78.ini b/Data/User/GameConfig/SDBE78.ini new file mode 100644 index 0000000000..f6af5ac5a5 --- /dev/null +++ b/Data/User/GameConfig/SDBE78.ini @@ -0,0 +1,18 @@ +# SDBE78 - de Blob 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/SDBP78.ini b/Data/User/GameConfig/SDBP78.ini new file mode 100644 index 0000000000..cfdb9551ee --- /dev/null +++ b/Data/User/GameConfig/SDBP78.ini @@ -0,0 +1,18 @@ +# SDBP78 - de Blob 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/SDNE41.ini b/Data/User/GameConfig/SDNE41.ini index c3ac08ad38..79dfb707c5 100644 --- a/Data/User/GameConfig/SDNE41.ini +++ b/Data/User/GameConfig/SDNE41.ini @@ -1,6 +1,6 @@ # SDNE41 - Just Dance [Video_Settings] -EFBScale = 0 +EFBScale = 1 [Video_Enhancements] MaxAnisotropy = 0 [Video] @@ -11,7 +11,7 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SDNP41.ini b/Data/User/GameConfig/SDNP41.ini index 07ac7ff92a..612ecdeddf 100644 --- a/Data/User/GameConfig/SDNP41.ini +++ b/Data/User/GameConfig/SDNP41.ini @@ -1,6 +1,6 @@ # SDNP41 - Just Dance [Video_Settings] -EFBScale = 0 +EFBScale = 1 [Video_Enhancements] MaxAnisotropy = 0 [Video] @@ -11,7 +11,7 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini index 9b246a03d9..48056894b9 100644 --- a/Data/User/GameConfig/SEME4Q.ini +++ b/Data/User/GameConfig/SEME4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,12 +13,11 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 - +[Wii] diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini new file mode 100644 index 0000000000..f0740ca7a3 --- /dev/null +++ b/Data/User/GameConfig/SEMJ01.ini @@ -0,0 +1,23 @@ +# SEMJ01 - Disney Epic Mickey: Mickey Mouse and the Magic Brush +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini index 1bb265c49c..f425547cf4 100644 --- a/Data/User/GameConfig/SEMP4Q.ini +++ b/Data/User/GameConfig/SEMP4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,11 +13,11 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini index 09597ac5fa..43232806a2 100644 --- a/Data/User/GameConfig/SEMX4Q.ini +++ b/Data/User/GameConfig/SEMX4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,11 +13,11 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini new file mode 100644 index 0000000000..817f8387e0 --- /dev/null +++ b/Data/User/GameConfig/SEMY4Q.ini @@ -0,0 +1,23 @@ +# SEMY4Q - Disney Epic Mickey +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini new file mode 100644 index 0000000000..515a1bd029 --- /dev/null +++ b/Data/User/GameConfig/SEMZ4Q.ini @@ -0,0 +1,23 @@ +# SEMZ4Q - Disney Epic Mickey +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini new file mode 100644 index 0000000000..fbc9fa9d3c --- /dev/null +++ b/Data/User/GameConfig/SERE4Q.ini @@ -0,0 +1,19 @@ +# SERE4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini new file mode 100644 index 0000000000..cd2fca395e --- /dev/null +++ b/Data/User/GameConfig/SERF4Q.ini @@ -0,0 +1,19 @@ +# SERF4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini new file mode 100644 index 0000000000..7e332b8bcd --- /dev/null +++ b/Data/User/GameConfig/SERP4Q.ini @@ -0,0 +1,19 @@ +# SERP4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/User/GameConfig/SF8E01.ini index e8e185cda9..bb2bce7406 100644 --- a/Data/User/GameConfig/SF8E01.ini +++ b/Data/User/GameConfig/SF8E01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/User/GameConfig/SF8J01.ini index bc0b0c2ba5..1f3ef9bb85 100644 --- a/Data/User/GameConfig/SF8J01.ini +++ b/Data/User/GameConfig/SF8J01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/User/GameConfig/SF8P01.ini index 41a5957888..e17f5f4247 100644 --- a/Data/User/GameConfig/SF8P01.ini +++ b/Data/User/GameConfig/SF8P01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SFIE01.ini b/Data/User/GameConfig/SFIE01.ini index 867859d8c4..7475f94fca 100644 --- a/Data/User/GameConfig/SFIE01.ini +++ b/Data/User/GameConfig/SFIE01.ini @@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/User/GameConfig/SFIP01.ini index 8a198d4fe8..114906aac3 100644 --- a/Data/User/GameConfig/SFIP01.ini +++ b/Data/User/GameConfig/SFIP01.ini @@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/User/GameConfig/SHLPA4.ini index ce64ff21e1..b9eebf93c5 100644 --- a/Data/User/GameConfig/SHLPA4.ini +++ b/Data/User/GameConfig/SHLPA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SILE78.ini b/Data/User/GameConfig/SILE78.ini index 7a7de8fcee..ec3df3964d 100644 --- a/Data/User/GameConfig/SILE78.ini +++ b/Data/User/GameConfig/SILE78.ini @@ -1,9 +1,10 @@ # SILE78 - Worms Battle Islands [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -14,7 +15,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Hardware] -VSync = False [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SILP78.ini b/Data/User/GameConfig/SILP78.ini index 3be5d8870f..0f5c7dd381 100644 --- a/Data/User/GameConfig/SILP78.ini +++ b/Data/User/GameConfig/SILP78.ini @@ -1,9 +1,10 @@ # SILP78 - Worms Battle Islands [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -14,7 +15,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Hardware] -VSync = False [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/User/GameConfig/SJDE41.ini index 1e16ddd21f..64b712f81d 100644 --- a/Data/User/GameConfig/SJDE41.ini +++ b/Data/User/GameConfig/SJDE41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/User/GameConfig/SJDP41.ini index 53f65d5704..450a81c4f8 100644 --- a/Data/User/GameConfig/SJDP41.ini +++ b/Data/User/GameConfig/SJDP41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/User/GameConfig/SJDY41.ini index 107abedfd2..74584766c3 100644 --- a/Data/User/GameConfig/SJDY41.ini +++ b/Data/User/GameConfig/SJDY41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/User/GameConfig/SJDZ41.ini index 53f65d5704..450a81c4f8 100644 --- a/Data/User/GameConfig/SJDZ41.ini +++ b/Data/User/GameConfig/SJDZ41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SLSEXJ.ini b/Data/User/GameConfig/SLSEXJ.ini new file mode 100644 index 0000000000..3250f478c0 --- /dev/null +++ b/Data/User/GameConfig/SLSEXJ.ini @@ -0,0 +1,19 @@ +# SLSEXJ - THE LAST STORY +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/User/GameConfig/SMOE41.ini index 15dc5a693e..3c61475544 100644 --- a/Data/User/GameConfig/SMOE41.ini +++ b/Data/User/GameConfig/SMOE41.ini @@ -1,21 +1,20 @@ -# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/User/GameConfig/SMOP41.ini index 6095cd9174..b9f913a639 100644 --- a/Data/User/GameConfig/SMOP41.ini +++ b/Data/User/GameConfig/SMOP41.ini @@ -1,21 +1,20 @@ -# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini index 88ba03da1c..929a58f076 100644 --- a/Data/User/GameConfig/SMOX41.ini +++ b/Data/User/GameConfig/SMOX41.ini @@ -1,21 +1,20 @@ -# SMOX41 - Michael Jackson The Experience: Walmart Edition -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOX41 - Michael Jackson The Experience: Walmart Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/User/GameConfig/SO3EE9.ini index f8da896a23..c359fede43 100644 --- a/Data/User/GameConfig/SO3EE9.ini +++ b/Data/User/GameConfig/SO3EE9.ini @@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/User/GameConfig/SO3J99.ini index 2ad57e3af2..e29dca5b96 100644 --- a/Data/User/GameConfig/SO3J99.ini +++ b/Data/User/GameConfig/SO3J99.ini @@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/User/GameConfig/SOJE41.ini index 183a8823ca..af6d49b785 100644 --- a/Data/User/GameConfig/SOJE41.ini +++ b/Data/User/GameConfig/SOJE41.ini @@ -1,17 +1,16 @@ -# SOJE41 - Rayman Origins -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 1 -PH_SZNear = 1 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# SOJE41 - Rayman Origins +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/User/GameConfig/SOJP41.ini index 2c835fe6e2..fca55f9117 100644 --- a/Data/User/GameConfig/SOJP41.ini +++ b/Data/User/GameConfig/SOJP41.ini @@ -1,17 +1,16 @@ -# SOJP41 - Rayman Origins -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 1 -PH_SZNear = 1 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# SOJP41 - Rayman Origins +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini index 8461821933..7e37e04936 100644 --- a/Data/User/GameConfig/SOUE01.ini +++ b/Data/User/GameConfig/SOUE01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini index ede7d81148..b02302e15c 100644 --- a/Data/User/GameConfig/SOUJ01.ini +++ b/Data/User/GameConfig/SOUJ01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini index 512bd21408..201ec99315 100644 --- a/Data/User/GameConfig/SOUK01.ini +++ b/Data/User/GameConfig/SOUK01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini index 1b6e47096f..eab4d6b442 100644 --- a/Data/User/GameConfig/SOUP01.ini +++ b/Data/User/GameConfig/SOUP01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/User/GameConfig/SPDE52.ini index e9698d8952..dae5e74567 100644 --- a/Data/User/GameConfig/SPDE52.ini +++ b/Data/User/GameConfig/SPDE52.ini @@ -10,8 +10,8 @@ ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = 0.7 +PH_ZNear = 0.5 +PH_ZFar = 0.5 [Gecko] [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/User/GameConfig/SPDP52.ini index 0a19aeb06b..39f2a95725 100644 --- a/Data/User/GameConfig/SPDP52.ini +++ b/Data/User/GameConfig/SPDP52.ini @@ -10,8 +10,8 @@ ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = 0.7 +PH_ZNear = 0.5 +PH_ZFar = 0.5 [Gecko] [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/SQME52.ini b/Data/User/GameConfig/SQME52.ini index e510a3e524..c78a968d6d 100644 --- a/Data/User/GameConfig/SQME52.ini +++ b/Data/User/GameConfig/SQME52.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs LLE audio for sound ingame. Enabling texture filtering solves some texture issues with direct3d9 backend. +EmulationIssues = Needs LLE audio for sound ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SQMP52.ini b/Data/User/GameConfig/SQMP52.ini index 0819a4f354..544354b081 100644 --- a/Data/User/GameConfig/SQMP52.ini +++ b/Data/User/GameConfig/SQMP52.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs LLE audio for sound ingame. Enabling texture filtering solves some texture issues with direct3d9 backend. +EmulationIssues = Needs LLE audio for sound ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/User/GameConfig/SRQE41.ini index 5060189327..e923433ee8 100644 --- a/Data/User/GameConfig/SRQE41.ini +++ b/Data/User/GameConfig/SRQE41.ini @@ -14,6 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/User/GameConfig/SRQP41.ini index f360aef050..c1001990b1 100644 --- a/Data/User/GameConfig/SRQP41.ini +++ b/Data/User/GameConfig/SRQP41.ini @@ -14,6 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/User/GameConfig/SX3J01.ini index c9a05a2493..3aef192f00 100644 --- a/Data/User/GameConfig/SX3J01.ini +++ b/Data/User/GameConfig/SX3J01.ini @@ -15,3 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 +[Wii] diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/User/GameConfig/SX3P01.ini index f75f762001..a753975414 100644 --- a/Data/User/GameConfig/SX3P01.ini +++ b/Data/User/GameConfig/SX3P01.ini @@ -15,3 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 +[Wii] diff --git a/Data/User/GameConfig/WZIPTW.ini b/Data/User/GameConfig/WZIPTW.ini index 5fb4a23c18..6e7cce2648 100644 --- a/Data/User/GameConfig/WZIPTW.ini +++ b/Data/User/GameConfig/WZIPTW.ini @@ -1,5 +1,6 @@ # WZIPTW - Rubik's: Rush [Core] Values set here will override the main dolphin settings. +DCBZ = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 1 EmulationIssues = Requires data cache emulation diff --git a/Data/User/Themes/Boomy/README.txt b/Data/User/Themes/Boomy/README.txt new file mode 100644 index 0000000000..97a5aecef0 --- /dev/null +++ b/Data/User/Themes/Boomy/README.txt @@ -0,0 +1 @@ +Boomy: Milosz Wlazlo [miloszwl@miloszwl.com] diff --git a/Data/User/Themes/Boomy/browse.png b/Data/User/Themes/Boomy/browse.png new file mode 100644 index 0000000000..3b3c527467 Binary files /dev/null and b/Data/User/Themes/Boomy/browse.png differ diff --git a/Data/User/Themes/Boomy/config.png b/Data/User/Themes/Boomy/config.png new file mode 100644 index 0000000000..8e421b5a08 Binary files /dev/null and b/Data/User/Themes/Boomy/config.png differ diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/User/Themes/Boomy/dsp.png new file mode 100644 index 0000000000..22752cdf74 Binary files /dev/null and b/Data/User/Themes/Boomy/dsp.png differ diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/User/Themes/Boomy/fullscreen.png new file mode 100644 index 0000000000..1a8f7f8de2 Binary files /dev/null and b/Data/User/Themes/Boomy/fullscreen.png differ diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/User/Themes/Boomy/gcpad.png new file mode 100644 index 0000000000..a951d8ccee Binary files /dev/null and b/Data/User/Themes/Boomy/gcpad.png differ diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/User/Themes/Boomy/graphics.png new file mode 100644 index 0000000000..408593c894 Binary files /dev/null and b/Data/User/Themes/Boomy/graphics.png differ diff --git a/Data/User/Themes/Boomy/help.png b/Data/User/Themes/Boomy/help.png new file mode 100644 index 0000000000..e2cfe65991 Binary files /dev/null and b/Data/User/Themes/Boomy/help.png differ diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/User/Themes/Boomy/nobanner.png new file mode 100644 index 0000000000..08a3088431 Binary files /dev/null and b/Data/User/Themes/Boomy/nobanner.png differ diff --git a/Data/User/Themes/Boomy/open.png b/Data/User/Themes/Boomy/open.png new file mode 100644 index 0000000000..4d12dcc995 Binary files /dev/null and b/Data/User/Themes/Boomy/open.png differ diff --git a/Data/User/Themes/Boomy/pause.png b/Data/User/Themes/Boomy/pause.png new file mode 100644 index 0000000000..4615a2ea5f Binary files /dev/null and b/Data/User/Themes/Boomy/pause.png differ diff --git a/Data/User/Themes/Boomy/play.png b/Data/User/Themes/Boomy/play.png new file mode 100644 index 0000000000..782e9adf83 Binary files /dev/null and b/Data/User/Themes/Boomy/play.png differ diff --git a/Data/User/Themes/Boomy/refresh.png b/Data/User/Themes/Boomy/refresh.png new file mode 100644 index 0000000000..35f3c92b73 Binary files /dev/null and b/Data/User/Themes/Boomy/refresh.png differ diff --git a/Data/User/Themes/Boomy/screenshot.png b/Data/User/Themes/Boomy/screenshot.png new file mode 100644 index 0000000000..1a8f7f8de2 Binary files /dev/null and b/Data/User/Themes/Boomy/screenshot.png differ diff --git a/Data/User/Themes/Boomy/stop.png b/Data/User/Themes/Boomy/stop.png new file mode 100644 index 0000000000..da6156103e Binary files /dev/null and b/Data/User/Themes/Boomy/stop.png differ diff --git a/Data/User/Themes/Boomy/wiimote.png b/Data/User/Themes/Boomy/wiimote.png new file mode 100644 index 0000000000..56cd87337a Binary files /dev/null and b/Data/User/Themes/Boomy/wiimote.png differ diff --git a/Data/cpack_package_description.txt b/Data/cpack_package_description.txt new file mode 100644 index 0000000000..318774314d --- /dev/null +++ b/Data/cpack_package_description.txt @@ -0,0 +1 @@ +Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on the Gamecube) emulator which supports many extra features and abilities not present on the original consoles. Gamecube and Wii compatibility is good - one can expect "mainstream" titles to run; lesser known titles can be hit or miss. Triforce compatibility is currently limited to a couple of games - others require more of the Triforce-specific peripheral devices to be emulated. diff --git a/Externals/CLRun/CMakeLists.txt b/Externals/CLRun/CMakeLists.txt index 7810173a81..3a57ae4563 100644 --- a/Externals/CLRun/CMakeLists.txt +++ b/Externals/CLRun/CMakeLists.txt @@ -1,7 +1,10 @@ set(SRCS clrun/clrun.c clrun/dynamiclib.c clrun/gencl.c - clrun/genclgl.c) + clrun/genclgl.c + clrun/genclext.c + clrun/genclglext.c + ) add_library(clrun STATIC ${SRCS}) target_link_libraries(clrun ${CMAKE_DL_LIBS}) diff --git a/Externals/CLRun/clrun/Makefile b/Externals/CLRun/clrun/Makefile index 9f637269e0..f4186ff741 100644 --- a/Externals/CLRun/clrun/Makefile +++ b/Externals/CLRun/clrun/Makefile @@ -10,6 +10,11 @@ compile: genclrun gencl.c genclgl.c genclrun: ../include/CL/cl.h ../include/CL/cl_gl.h ./generateClRun.pl ../include/CL/cl.h > gencl.c ./generateClRun.pl ../include/CL/cl_gl.h > genclgl.c + ./generateClRun.pl ../include/CL/cl_ext.h > genclext.c + ./generateClRun.pl ../include/CL/cl_gl_ext.h > genclglext.c + ./generateClRun.pl ../include/CL/cl_d3d10.h > gencld3d10.c + ./generateClRun.pl ../include/CL/cl_d3d11.h > gencld3d11.c + ./generateClRun.pl ../include/CL/cl_dx9_media_sharing.h > gencldx9.c clean: diff --git a/Externals/CLRun/clrun/gencl.c b/Externals/CLRun/clrun/gencl.c index 9d55b70232..649e3c67b7 100644 --- a/Externals/CLRun/clrun/gencl.c +++ b/Externals/CLRun/clrun/gencl.c @@ -3,398 +3,543 @@ #include "../include/CL/cl.h" -static cl_int (CL_API_CALL *clGetPlatformIDs_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; +static cl_int (*clGetPlatformIDs_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; cl_int CL_API_CALL clGetPlatformIDs (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) { if(!clGetPlatformIDs_ptr) clGetPlatformIDs_ptr = getFunction("clGetPlatformIDs"); return (*clGetPlatformIDs_ptr)(num_entries, platforms, num_platforms); } -static cl_int (CL_API_CALL *clGetPlatformInfo_ptr)(cl_platform_id, cl_platform_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetPlatformInfo_ptr)(cl_platform_id, cl_platform_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetPlatformInfo (cl_platform_id platform,cl_platform_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetPlatformInfo_ptr) clGetPlatformInfo_ptr = getFunction("clGetPlatformInfo"); return (*clGetPlatformInfo_ptr)(platform, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetDeviceIDs_ptr)(cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *) = NULL; +static cl_int (*clGetDeviceIDs_ptr)(cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *) = NULL; cl_int CL_API_CALL clGetDeviceIDs (cl_platform_id platform,cl_device_type device_type,cl_uint num_entries,cl_device_id * devices,cl_uint * num_devices) { if(!clGetDeviceIDs_ptr) clGetDeviceIDs_ptr = getFunction("clGetDeviceIDs"); return (*clGetDeviceIDs_ptr)(platform, device_type, num_entries, devices, num_devices); } -static cl_int (CL_API_CALL *clGetDeviceInfo_ptr)(cl_device_id, cl_device_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetDeviceInfo_ptr)(cl_device_id, cl_device_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetDeviceInfo (cl_device_id device,cl_device_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetDeviceInfo_ptr) clGetDeviceInfo_ptr = getFunction("clGetDeviceInfo"); return (*clGetDeviceInfo_ptr)(device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_context (CL_API_CALL *clCreateContext_ptr)(const cl_context_properties *, cl_uint, const cl_device_id *, void (CL_CALLBACK *)(const char *, const void *, size_t, void *), void *, cl_int *) = NULL; -cl_context CL_API_CALL clCreateContext (const cl_context_properties * properties,cl_uint num_devices,const cl_device_id * devices,void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *),void * user_data,cl_int * errcode_ret) { +static cl_int (*clCreateSubDevices_ptr)(cl_device_id, const cl_device_partition_property *, cl_uint, cl_device_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clCreateSubDevices (cl_device_id in_device,const cl_device_partition_property * properties,cl_uint num_devices,cl_device_id * out_devices,cl_uint * num_devices_ret) { + if(!clCreateSubDevices_ptr) clCreateSubDevices_ptr = getFunction("clCreateSubDevices"); + return (*clCreateSubDevices_ptr)(in_device, properties, num_devices, out_devices, num_devices_ret); +} + +static cl_int (*clRetainDevice_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clRetainDevice (cl_device_id device) { + if(!clRetainDevice_ptr) clRetainDevice_ptr = getFunction("clRetainDevice"); + return (*clRetainDevice_ptr)(device); +} + +static cl_int (*clReleaseDevice_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clReleaseDevice (cl_device_id device) { + if(!clReleaseDevice_ptr) clReleaseDevice_ptr = getFunction("clReleaseDevice"); + return (*clReleaseDevice_ptr)(device); +} + +static cl_context (*clCreateContext_ptr)(const cl_context_properties *, cl_uint, const cl_device_id *, void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL; +cl_context CL_API_CALL clCreateContext(const cl_context_properties * properties, + cl_uint num_devices, + const cl_device_id * devices, + void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), + void * user_data, + cl_int * errcode_ret) { if(!clCreateContext_ptr) clCreateContext_ptr = getFunction("clCreateContext"); return (*clCreateContext_ptr)(properties, num_devices, devices, pfn_notify, user_data, errcode_ret); } -static cl_context (CL_API_CALL *clCreateContextFromType_ptr)(const cl_context_properties *, cl_device_type, void (CL_CALLBACK *)(const char *, const void *, size_t, void *), void *, cl_int *) = NULL; -cl_context CL_API_CALL clCreateContextFromType (const cl_context_properties * properties,cl_device_type device_type,void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *),void * user_data,cl_int * errcode_ret) { +static cl_context (*clCreateContextFromType_ptr)(const cl_context_properties *, cl_device_type, void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL; +cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * properties, + cl_device_type device_type, + void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *), + void * user_data, + cl_int * errcode_ret) { if(!clCreateContextFromType_ptr) clCreateContextFromType_ptr = getFunction("clCreateContextFromType"); return (*clCreateContextFromType_ptr)(properties, device_type, pfn_notify, user_data, errcode_ret); } -static cl_int (CL_API_CALL *clRetainContext_ptr)(cl_context) = NULL; +static cl_int (*clRetainContext_ptr)(cl_context) = NULL; cl_int CL_API_CALL clRetainContext (cl_context context) { if(!clRetainContext_ptr) clRetainContext_ptr = getFunction("clRetainContext"); return (*clRetainContext_ptr)(context); } -static cl_int (CL_API_CALL *clReleaseContext_ptr)(cl_context) = NULL; +static cl_int (*clReleaseContext_ptr)(cl_context) = NULL; cl_int CL_API_CALL clReleaseContext (cl_context context) { if(!clReleaseContext_ptr) clReleaseContext_ptr = getFunction("clReleaseContext"); return (*clReleaseContext_ptr)(context); } -static cl_int (CL_API_CALL *clGetContextInfo_ptr)(cl_context, cl_context_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetContextInfo_ptr)(cl_context, cl_context_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetContextInfo (cl_context context,cl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetContextInfo_ptr) clGetContextInfo_ptr = getFunction("clGetContextInfo"); return (*clGetContextInfo_ptr)(context, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_command_queue (CL_API_CALL *clCreateCommandQueue_ptr)(cl_context, cl_device_id, cl_command_queue_properties, cl_int *) = NULL; +static cl_command_queue (*clCreateCommandQueue_ptr)(cl_context, cl_device_id, cl_command_queue_properties, cl_int *) = NULL; cl_command_queue CL_API_CALL clCreateCommandQueue (cl_context context,cl_device_id device,cl_command_queue_properties properties,cl_int * errcode_ret) { if(!clCreateCommandQueue_ptr) clCreateCommandQueue_ptr = getFunction("clCreateCommandQueue"); return (*clCreateCommandQueue_ptr)(context, device, properties, errcode_ret); } -static cl_int (CL_API_CALL *clRetainCommandQueue_ptr)(cl_command_queue) = NULL; +static cl_int (*clRetainCommandQueue_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clRetainCommandQueue (cl_command_queue command_queue) { if(!clRetainCommandQueue_ptr) clRetainCommandQueue_ptr = getFunction("clRetainCommandQueue"); return (*clRetainCommandQueue_ptr)(command_queue); } -static cl_int (CL_API_CALL *clReleaseCommandQueue_ptr)(cl_command_queue) = NULL; +static cl_int (*clReleaseCommandQueue_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clReleaseCommandQueue (cl_command_queue command_queue) { if(!clReleaseCommandQueue_ptr) clReleaseCommandQueue_ptr = getFunction("clReleaseCommandQueue"); return (*clReleaseCommandQueue_ptr)(command_queue); } -static cl_int (CL_API_CALL *clGetCommandQueueInfo_ptr)(cl_command_queue, cl_command_queue_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetCommandQueueInfo_ptr)(cl_command_queue, cl_command_queue_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetCommandQueueInfo (cl_command_queue command_queue,cl_command_queue_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetCommandQueueInfo_ptr) clGetCommandQueueInfo_ptr = getFunction("clGetCommandQueueInfo"); return (*clGetCommandQueueInfo_ptr)(command_queue, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clSetCommandQueueProperty_ptr)(cl_command_queue, cl_command_queue_properties, cl_bool, cl_command_queue_properties *) = NULL; -cl_int CL_API_CALL clSetCommandQueueProperty (cl_command_queue command_queue,cl_command_queue_properties properties,cl_bool enable,cl_command_queue_properties * old_properties) { - if(!clSetCommandQueueProperty_ptr) clSetCommandQueueProperty_ptr = getFunction("clSetCommandQueueProperty"); - return (*clSetCommandQueueProperty_ptr)(command_queue, properties, enable, old_properties); -} - -static cl_mem (CL_API_CALL *clCreateBuffer_ptr)(cl_context, cl_mem_flags, size_t, void *, cl_int *) = NULL; +static cl_mem (*clCreateBuffer_ptr)(cl_context, cl_mem_flags, size_t, void *, cl_int *) = NULL; cl_mem CL_API_CALL clCreateBuffer (cl_context context,cl_mem_flags flags,size_t size,void * host_ptr,cl_int * errcode_ret) { if(!clCreateBuffer_ptr) clCreateBuffer_ptr = getFunction("clCreateBuffer"); return (*clCreateBuffer_ptr)(context, flags, size, host_ptr, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateImage2D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, void *, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateImage2D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_row_pitch,void * host_ptr,cl_int * errcode_ret) { - if(!clCreateImage2D_ptr) clCreateImage2D_ptr = getFunction("clCreateImage2D"); - return (*clCreateImage2D_ptr)(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); +static cl_mem (*clCreateSubBuffer_ptr)(cl_mem, cl_mem_flags, cl_buffer_create_type, const void *, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateSubBuffer (cl_mem buffer,cl_mem_flags flags,cl_buffer_create_type buffer_create_type,const void * buffer_create_info,cl_int * errcode_ret) { + if(!clCreateSubBuffer_ptr) clCreateSubBuffer_ptr = getFunction("clCreateSubBuffer"); + return (*clCreateSubBuffer_ptr)(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateImage3D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, size_t, size_t, void *, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateImage3D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_depth,size_t image_row_pitch,size_t image_slice_pitch,void * host_ptr,cl_int * errcode_ret) { - if(!clCreateImage3D_ptr) clCreateImage3D_ptr = getFunction("clCreateImage3D"); - return (*clCreateImage3D_ptr)(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); +static cl_mem (*clCreateImage_ptr)(cl_context, cl_mem_flags, const cl_image_format *, const cl_image_desc *, void *, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateImage (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,const cl_image_desc * image_desc,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage_ptr) clCreateImage_ptr = getFunction("clCreateImage"); + return (*clCreateImage_ptr)(context, flags, image_format, image_desc, host_ptr, errcode_ret); } -static cl_int (CL_API_CALL *clRetainMemObject_ptr)(cl_mem) = NULL; +static cl_int (*clRetainMemObject_ptr)(cl_mem) = NULL; cl_int CL_API_CALL clRetainMemObject (cl_mem memobj) { if(!clRetainMemObject_ptr) clRetainMemObject_ptr = getFunction("clRetainMemObject"); return (*clRetainMemObject_ptr)(memobj); } -static cl_int (CL_API_CALL *clReleaseMemObject_ptr)(cl_mem) = NULL; +static cl_int (*clReleaseMemObject_ptr)(cl_mem) = NULL; cl_int CL_API_CALL clReleaseMemObject (cl_mem memobj) { if(!clReleaseMemObject_ptr) clReleaseMemObject_ptr = getFunction("clReleaseMemObject"); return (*clReleaseMemObject_ptr)(memobj); } -static cl_int (CL_API_CALL *clGetSupportedImageFormats_ptr)(cl_context, cl_mem_flags, cl_mem_object_type, cl_uint, cl_image_format *, cl_uint *) = NULL; +static cl_int (*clGetSupportedImageFormats_ptr)(cl_context, cl_mem_flags, cl_mem_object_type, cl_uint, cl_image_format *, cl_uint *) = NULL; cl_int CL_API_CALL clGetSupportedImageFormats (cl_context context,cl_mem_flags flags,cl_mem_object_type image_type,cl_uint num_entries,cl_image_format * image_formats,cl_uint * num_image_formats) { if(!clGetSupportedImageFormats_ptr) clGetSupportedImageFormats_ptr = getFunction("clGetSupportedImageFormats"); return (*clGetSupportedImageFormats_ptr)(context, flags, image_type, num_entries, image_formats, num_image_formats); } -static cl_int (CL_API_CALL *clGetMemObjectInfo_ptr)(cl_mem, cl_mem_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetMemObjectInfo_ptr)(cl_mem, cl_mem_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetMemObjectInfo (cl_mem memobj,cl_mem_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetMemObjectInfo_ptr) clGetMemObjectInfo_ptr = getFunction("clGetMemObjectInfo"); return (*clGetMemObjectInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetImageInfo_ptr)(cl_mem, cl_image_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetImageInfo_ptr)(cl_mem, cl_image_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetImageInfo (cl_mem image,cl_image_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetImageInfo_ptr) clGetImageInfo_ptr = getFunction("clGetImageInfo"); return (*clGetImageInfo_ptr)(image, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_sampler (CL_API_CALL *clCreateSampler_ptr)(cl_context, cl_bool, cl_addressing_mode, cl_filter_mode, cl_int *) = NULL; -cl_sampler CL_API_CALL clCreateSampler (cl_context context,cl_bool normalized_coords,cl_addressing_mode addressing_mode,cl_filter_mode filter_mode,cl_int * errcode_ret) { +/* Sampler APIs */ +static cl_int (*clSetMemObjectDestructorCallback_ptr)(cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data ) = NULL; +cl_int CL_API_CALL clSetMemObjectDestructorCallback (cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data ) +{ + if(!clSetMemObjectDestructorCallback_ptr) clSetMemObjectDestructorCallback_ptr = getFunction("clSetMemObjectDestructorCallback"); + return (*clSetMemObjectDestructorCallback_ptr)(memobj, pfn_notify, user_data); +} + +/* Sampler APIs */ +static cl_sampler (*clCreateSampler_ptr)(cl_context, cl_bool, cl_addressing_mode, cl_filter_mode, cl_int *) = NULL; +cl_sampler CL_API_CALL clCreateSampler(cl_context context,cl_bool normalized_coords,cl_addressing_mode addressing_mode,cl_filter_mode filter_mode,cl_int * errcode_ret) { if(!clCreateSampler_ptr) clCreateSampler_ptr = getFunction("clCreateSampler"); return (*clCreateSampler_ptr)(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); } -static cl_int (CL_API_CALL *clRetainSampler_ptr)(cl_sampler) = NULL; +static cl_int (*clRetainSampler_ptr)(cl_sampler) = NULL; cl_int CL_API_CALL clRetainSampler (cl_sampler sampler) { if(!clRetainSampler_ptr) clRetainSampler_ptr = getFunction("clRetainSampler"); return (*clRetainSampler_ptr)(sampler); } -static cl_int (CL_API_CALL *clReleaseSampler_ptr)(cl_sampler) = NULL; +static cl_int (*clReleaseSampler_ptr)(cl_sampler) = NULL; cl_int CL_API_CALL clReleaseSampler (cl_sampler sampler) { if(!clReleaseSampler_ptr) clReleaseSampler_ptr = getFunction("clReleaseSampler"); return (*clReleaseSampler_ptr)(sampler); } -static cl_int (CL_API_CALL *clGetSamplerInfo_ptr)(cl_sampler, cl_sampler_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetSamplerInfo_ptr)(cl_sampler, cl_sampler_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetSamplerInfo (cl_sampler sampler,cl_sampler_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetSamplerInfo_ptr) clGetSamplerInfo_ptr = getFunction("clGetSamplerInfo"); return (*clGetSamplerInfo_ptr)(sampler, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_program (CL_API_CALL *clCreateProgramWithSource_ptr)(cl_context, cl_uint, const char **, const size_t *, cl_int *) = NULL; +static cl_program (*clCreateProgramWithSource_ptr)(cl_context, cl_uint, const char **, const size_t *, cl_int *) = NULL; cl_program CL_API_CALL clCreateProgramWithSource (cl_context context,cl_uint count,const char ** strings,const size_t * lengths,cl_int * errcode_ret) { if(!clCreateProgramWithSource_ptr) clCreateProgramWithSource_ptr = getFunction("clCreateProgramWithSource"); return (*clCreateProgramWithSource_ptr)(context, count, strings, lengths, errcode_ret); } -static cl_program (CL_API_CALL *clCreateProgramWithBinary_ptr)(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int *) = NULL; +static cl_program (*clCreateProgramWithBinary_ptr)(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int *) = NULL; cl_program CL_API_CALL clCreateProgramWithBinary (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const size_t * lengths,const unsigned char ** binaries,cl_int * binary_status,cl_int * errcode_ret) { if(!clCreateProgramWithBinary_ptr) clCreateProgramWithBinary_ptr = getFunction("clCreateProgramWithBinary"); return (*clCreateProgramWithBinary_ptr)(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); } -static cl_int (CL_API_CALL *clRetainProgram_ptr)(cl_program) = NULL; +static cl_program (*clCreateProgramWithBuiltInKernels_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_int *) = NULL; +cl_program CL_API_CALL clCreateProgramWithBuiltInKernels (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * kernel_names,cl_int * errcode_ret) { + if(!clCreateProgramWithBuiltInKernels_ptr) clCreateProgramWithBuiltInKernels_ptr = getFunction("clCreateProgramWithBuiltInKernels"); + return (*clCreateProgramWithBuiltInKernels_ptr)(context, num_devices, device_list, kernel_names, errcode_ret); +} + +static cl_int (*clRetainProgram_ptr)(cl_program) = NULL; cl_int CL_API_CALL clRetainProgram (cl_program program) { if(!clRetainProgram_ptr) clRetainProgram_ptr = getFunction("clRetainProgram"); return (*clRetainProgram_ptr)(program); } -static cl_int (CL_API_CALL *clReleaseProgram_ptr)(cl_program) = NULL; +static cl_int (*clReleaseProgram_ptr)(cl_program) = NULL; cl_int CL_API_CALL clReleaseProgram (cl_program program) { if(!clReleaseProgram_ptr) clReleaseProgram_ptr = getFunction("clReleaseProgram"); return (*clReleaseProgram_ptr)(program); } -static cl_int (CL_API_CALL *clBuildProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void *), void *) = NULL; -cl_int CL_API_CALL clBuildProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void *),void * user_data) { +static cl_int (*clBuildProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL; +cl_int CL_API_CALL clBuildProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options, void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) { if(!clBuildProgram_ptr) clBuildProgram_ptr = getFunction("clBuildProgram"); - return (*clBuildProgram_ptr)(program, num_devices, device_list, options, pfn_notify, user_data); + return (*clBuildProgram_ptr)(program, num_devices, device_list, options, user_data, user_data); } -static cl_int (CL_API_CALL *clUnloadCompiler_ptr)(void) = NULL; -cl_int CL_API_CALL clUnloadCompiler (void) { - if(!clUnloadCompiler_ptr) clUnloadCompiler_ptr = getFunction("clUnloadCompiler"); - return (*clUnloadCompiler_ptr)(); +static cl_int (*clCompileProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, const char **, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL; +cl_int CL_API_CALL clCompileProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_headers,const cl_program * input_headers,const char ** header_include_names,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) { + if(!clCompileProgram_ptr) clCompileProgram_ptr = getFunction("clCompileProgram"); + return (*clCompileProgram_ptr)(program, num_devices, device_list, options, num_input_headers, input_headers, header_include_names, user_data, user_data); } -static cl_int (CL_API_CALL *clGetProgramInfo_ptr)(cl_program, cl_program_info, size_t, void *, size_t *) = NULL; +static cl_program (*clLinkProgram_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *, cl_int *) = NULL; +cl_program CL_API_CALL clLinkProgram (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_programs,const cl_program * input_programs,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data,cl_int * errcode_ret) { + if(!clLinkProgram_ptr) clLinkProgram_ptr = getFunction("clLinkProgram"); + return (*clLinkProgram_ptr)(context, num_devices, device_list, options, num_input_programs, input_programs, user_data, user_data, errcode_ret); +} + +static cl_int (*clUnloadPlatformCompiler_ptr)(cl_platform_id) = NULL; +cl_int CL_API_CALL clUnloadPlatformCompiler (cl_platform_id platform) { + if(!clUnloadPlatformCompiler_ptr) clUnloadPlatformCompiler_ptr = getFunction("clUnloadPlatformCompiler"); + return (*clUnloadPlatformCompiler_ptr)(platform); +} + +static cl_int (*clGetProgramInfo_ptr)(cl_program, cl_program_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetProgramInfo (cl_program program,cl_program_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetProgramInfo_ptr) clGetProgramInfo_ptr = getFunction("clGetProgramInfo"); return (*clGetProgramInfo_ptr)(program, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetProgramBuildInfo_ptr)(cl_program, cl_device_id, cl_program_build_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetProgramBuildInfo_ptr)(cl_program, cl_device_id, cl_program_build_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetProgramBuildInfo (cl_program program,cl_device_id device,cl_program_build_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetProgramBuildInfo_ptr) clGetProgramBuildInfo_ptr = getFunction("clGetProgramBuildInfo"); return (*clGetProgramBuildInfo_ptr)(program, device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_kernel (CL_API_CALL *clCreateKernel_ptr)(cl_program, const char *, cl_int *) = NULL; +static cl_kernel (*clCreateKernel_ptr)(cl_program, const char *, cl_int *) = NULL; cl_kernel CL_API_CALL clCreateKernel (cl_program program,const char * kernel_name,cl_int * errcode_ret) { if(!clCreateKernel_ptr) clCreateKernel_ptr = getFunction("clCreateKernel"); return (*clCreateKernel_ptr)(program, kernel_name, errcode_ret); } -static cl_int (CL_API_CALL *clCreateKernelsInProgram_ptr)(cl_program, cl_uint, cl_kernel *, cl_uint *) = NULL; +static cl_int (*clCreateKernelsInProgram_ptr)(cl_program, cl_uint, cl_kernel *, cl_uint *) = NULL; cl_int CL_API_CALL clCreateKernelsInProgram (cl_program program,cl_uint num_kernels,cl_kernel * kernels,cl_uint * num_kernels_ret) { if(!clCreateKernelsInProgram_ptr) clCreateKernelsInProgram_ptr = getFunction("clCreateKernelsInProgram"); return (*clCreateKernelsInProgram_ptr)(program, num_kernels, kernels, num_kernels_ret); } -static cl_int (CL_API_CALL *clRetainKernel_ptr)(cl_kernel) = NULL; +static cl_int (*clRetainKernel_ptr)(cl_kernel) = NULL; cl_int CL_API_CALL clRetainKernel (cl_kernel kernel) { if(!clRetainKernel_ptr) clRetainKernel_ptr = getFunction("clRetainKernel"); return (*clRetainKernel_ptr)(kernel); } -static cl_int (CL_API_CALL *clReleaseKernel_ptr)(cl_kernel) = NULL; +static cl_int (*clReleaseKernel_ptr)(cl_kernel) = NULL; cl_int CL_API_CALL clReleaseKernel (cl_kernel kernel) { if(!clReleaseKernel_ptr) clReleaseKernel_ptr = getFunction("clReleaseKernel"); return (*clReleaseKernel_ptr)(kernel); } -static cl_int (CL_API_CALL *clSetKernelArg_ptr)(cl_kernel, cl_uint, size_t, const void *) = NULL; +static cl_int (*clSetKernelArg_ptr)(cl_kernel, cl_uint, size_t, const void *) = NULL; cl_int CL_API_CALL clSetKernelArg (cl_kernel kernel,cl_uint arg_index,size_t arg_size,const void * arg_value) { if(!clSetKernelArg_ptr) clSetKernelArg_ptr = getFunction("clSetKernelArg"); return (*clSetKernelArg_ptr)(kernel, arg_index, arg_size, arg_value); } -static cl_int (CL_API_CALL *clGetKernelInfo_ptr)(cl_kernel, cl_kernel_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetKernelInfo_ptr)(cl_kernel, cl_kernel_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetKernelInfo (cl_kernel kernel,cl_kernel_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetKernelInfo_ptr) clGetKernelInfo_ptr = getFunction("clGetKernelInfo"); return (*clGetKernelInfo_ptr)(kernel, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetKernelWorkGroupInfo_ptr)(cl_kernel, cl_device_id, cl_kernel_work_group_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetKernelArgInfo_ptr)(cl_kernel, cl_uint, cl_kernel_arg_info, size_t, void *, size_t *) = NULL; +cl_int CL_API_CALL clGetKernelArgInfo (cl_kernel kernel,cl_uint arg_indx,cl_kernel_arg_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { + if(!clGetKernelArgInfo_ptr) clGetKernelArgInfo_ptr = getFunction("clGetKernelArgInfo"); + return (*clGetKernelArgInfo_ptr)(kernel, arg_indx, param_name, param_value_size, param_value, param_value_size_ret); +} + +static cl_int (*clGetKernelWorkGroupInfo_ptr)(cl_kernel, cl_device_id, cl_kernel_work_group_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetKernelWorkGroupInfo (cl_kernel kernel,cl_device_id device,cl_kernel_work_group_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetKernelWorkGroupInfo_ptr) clGetKernelWorkGroupInfo_ptr = getFunction("clGetKernelWorkGroupInfo"); return (*clGetKernelWorkGroupInfo_ptr)(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clWaitForEvents_ptr)(cl_uint, const cl_event *) = NULL; +static cl_int (*clWaitForEvents_ptr)(cl_uint, const cl_event *) = NULL; cl_int CL_API_CALL clWaitForEvents (cl_uint num_events,const cl_event * event_list) { if(!clWaitForEvents_ptr) clWaitForEvents_ptr = getFunction("clWaitForEvents"); return (*clWaitForEvents_ptr)(num_events, event_list); } -static cl_int (CL_API_CALL *clGetEventInfo_ptr)(cl_event, cl_event_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetEventInfo_ptr)(cl_event, cl_event_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetEventInfo (cl_event event,cl_event_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetEventInfo_ptr) clGetEventInfo_ptr = getFunction("clGetEventInfo"); return (*clGetEventInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clRetainEvent_ptr)(cl_event) = NULL; -cl_int CL_API_CALL clRetainEvent (cl_event event) { +static cl_event (*clCreateUserEvent_ptr)(cl_context, cl_int * /* errcode_ret */) = NULL; +cl_event CL_API_CALL clCreateUserEvent (cl_context context,cl_int * errcode_ret) +{ + if(!clCreateUserEvent_ptr) clCreateUserEvent_ptr = getFunction("clCreateUserEvent"); + return (*clCreateUserEvent_ptr)(context,errcode_ret); +} + +static cl_int (*clRetainEvent_ptr)(cl_event) = NULL; +cl_int CL_API_CALL clRetainEvent(cl_event event) { if(!clRetainEvent_ptr) clRetainEvent_ptr = getFunction("clRetainEvent"); return (*clRetainEvent_ptr)(event); } -static cl_int (CL_API_CALL *clReleaseEvent_ptr)(cl_event) = NULL; +static cl_int (*clReleaseEvent_ptr)(cl_event) = NULL; cl_int CL_API_CALL clReleaseEvent (cl_event event) { if(!clReleaseEvent_ptr) clReleaseEvent_ptr = getFunction("clReleaseEvent"); return (*clReleaseEvent_ptr)(event); } -static cl_int (CL_API_CALL *clGetEventProfilingInfo_ptr)(cl_event, cl_profiling_info, size_t, void *, size_t *) = NULL; +static cl_int (*clSetUserEventStatus_ptr)(cl_event, cl_int) = NULL; +cl_int CL_API_CALL clSetUserEventStatus (cl_event event,cl_int execution_status) { + if(!clSetUserEventStatus_ptr) clSetUserEventStatus_ptr = getFunction("clSetUserEventStatus"); + return (*clSetUserEventStatus_ptr)(event, execution_status); +} + +static cl_int (*clSetEventCallback_ptr)(cl_event, cl_int, void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), void*) = NULL; +cl_int CL_API_CALL clSetEventCallback (cl_event event,cl_int command_exec_callback_type, void (CL_CALLBACK * pfn_notify)(cl_event, cl_int, void *), void* user_data) { + if(!clSetEventCallback_ptr) clSetEventCallback_ptr = getFunction("clSetEventCallback"); + return (*clSetEventCallback_ptr)(event, command_exec_callback_type, pfn_notify, user_data); +} + +static cl_int (*clGetEventProfilingInfo_ptr)(cl_event, cl_profiling_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetEventProfilingInfo (cl_event event,cl_profiling_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetEventProfilingInfo_ptr) clGetEventProfilingInfo_ptr = getFunction("clGetEventProfilingInfo"); return (*clGetEventProfilingInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clFlush_ptr)(cl_command_queue) = NULL; +static cl_int (*clFlush_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clFlush (cl_command_queue command_queue) { if(!clFlush_ptr) clFlush_ptr = getFunction("clFlush"); return (*clFlush_ptr)(command_queue); } -static cl_int (CL_API_CALL *clFinish_ptr)(cl_command_queue) = NULL; +static cl_int (*clFinish_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clFinish (cl_command_queue command_queue) { if(!clFinish_ptr) clFinish_ptr = getFunction("clFinish"); return (*clFinish_ptr)(command_queue); } -static cl_int (CL_API_CALL *clEnqueueReadBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueReadBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,size_t offset,size_t cb,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueReadBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueReadBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,size_t offset,size_t size,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReadBuffer_ptr) clEnqueueReadBuffer_ptr = getFunction("clEnqueueReadBuffer"); - return (*clEnqueueReadBuffer_ptr)(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueReadBuffer_ptr)(command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueWriteBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueWriteBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,size_t offset,size_t cb,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueReadBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueReadBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueReadBufferRect_ptr) clEnqueueReadBufferRect_ptr = getFunction("clEnqueueReadBufferRect"); + return (*clEnqueueReadBufferRect_ptr)(command_queue, buffer, blocking_read, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueWriteBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueWriteBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,size_t offset,size_t size,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueWriteBuffer_ptr) clEnqueueWriteBuffer_ptr = getFunction("clEnqueueWriteBuffer"); - return (*clEnqueueWriteBuffer_ptr)(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueWriteBuffer_ptr)(command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueCopyBuffer (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t cb,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueWriteBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueWriteBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueWriteBufferRect_ptr) clEnqueueWriteBufferRect_ptr = getFunction("clEnqueueWriteBufferRect"); + return (*clEnqueueWriteBufferRect_ptr)(command_queue, buffer, blocking_write, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueFillBuffer_ptr)(cl_command_queue, cl_mem, const void *, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueFillBuffer (cl_command_queue command_queue,cl_mem buffer,const void * pattern,size_t pattern_size,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueFillBuffer_ptr) clEnqueueFillBuffer_ptr = getFunction("clEnqueueFillBuffer"); + return (*clEnqueueFillBuffer_ptr)(command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueCopyBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueCopyBuffer (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyBuffer_ptr) clEnqueueCopyBuffer_ptr = getFunction("clEnqueueCopyBuffer"); - return (*clEnqueueCopyBuffer_ptr)(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueCopyBuffer_ptr)(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueReadImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyBufferRect_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueCopyBufferRect (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,const size_t * src_origin,const size_t * dst_origin,const size_t * region,size_t src_row_pitch,size_t src_slice_pitch,size_t dst_row_pitch,size_t dst_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueCopyBufferRect_ptr) clEnqueueCopyBufferRect_ptr = getFunction("clEnqueueCopyBufferRect"); + return (*clEnqueueCopyBufferRect_ptr)(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueReadImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueReadImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_read,const size_t * origin,const size_t * region,size_t row_pitch,size_t slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReadImage_ptr) clEnqueueReadImage_ptr = getFunction("clEnqueueReadImage"); return (*clEnqueueReadImage_ptr)(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueWriteImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueWriteImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueWriteImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_write,const size_t * origin,const size_t * region,size_t input_row_pitch,size_t input_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueWriteImage_ptr) clEnqueueWriteImage_ptr = getFunction("clEnqueueWriteImage"); return (*clEnqueueWriteImage_ptr)(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyImage_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueFillImage_ptr)(cl_command_queue, cl_mem, const void *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueFillImage (cl_command_queue command_queue,cl_mem image,const void * fill_color,const size_t * origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueFillImage_ptr) clEnqueueFillImage_ptr = getFunction("clEnqueueFillImage"); + return (*clEnqueueFillImage_ptr)(command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueCopyImage_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyImage (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_image,const size_t * src_origin,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyImage_ptr) clEnqueueCopyImage_ptr = getFunction("clEnqueueCopyImage"); return (*clEnqueueCopyImage_ptr)(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyImageToBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyImageToBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, size_t, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyImageToBuffer (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_buffer,const size_t * src_origin,const size_t * region,size_t dst_offset,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyImageToBuffer_ptr) clEnqueueCopyImageToBuffer_ptr = getFunction("clEnqueueCopyImageToBuffer"); return (*clEnqueueCopyImageToBuffer_ptr)(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyBufferToImage_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyBufferToImage_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyBufferToImage (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_image,size_t src_offset,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyBufferToImage_ptr) clEnqueueCopyBufferToImage_ptr = getFunction("clEnqueueCopyBufferToImage"); return (*clEnqueueCopyBufferToImage_ptr)(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); } -static void * (CL_API_CALL *clEnqueueMapBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, size_t, size_t, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; -void * CL_API_CALL clEnqueueMapBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_map,cl_map_flags map_flags,size_t offset,size_t cb,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { +static void * (*clEnqueueMapBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, size_t, size_t, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; +void * CL_API_CALL clEnqueueMapBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_map,cl_map_flags map_flags,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { if(!clEnqueueMapBuffer_ptr) clEnqueueMapBuffer_ptr = getFunction("clEnqueueMapBuffer"); - return (*clEnqueueMapBuffer_ptr)(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); + return (*clEnqueueMapBuffer_ptr)(command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret); } -static void * (CL_API_CALL *clEnqueueMapImage_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, const size_t *, const size_t *, size_t *, size_t *, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; +static void * (*clEnqueueMapImage_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, const size_t *, const size_t *, size_t *, size_t *, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; void * CL_API_CALL clEnqueueMapImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_map,cl_map_flags map_flags,const size_t * origin,const size_t * region,size_t * image_row_pitch,size_t * image_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { if(!clEnqueueMapImage_ptr) clEnqueueMapImage_ptr = getFunction("clEnqueueMapImage"); return (*clEnqueueMapImage_ptr)(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); } -static cl_int (CL_API_CALL *clEnqueueUnmapMemObject_ptr)(cl_command_queue, cl_mem, void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueUnmapMemObject_ptr)(cl_command_queue, cl_mem, void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueUnmapMemObject (cl_command_queue command_queue,cl_mem memobj,void * mapped_ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueUnmapMemObject_ptr) clEnqueueUnmapMemObject_ptr = getFunction("clEnqueueUnmapMemObject"); return (*clEnqueueUnmapMemObject_ptr)(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueNDRangeKernel_ptr)(cl_command_queue, cl_kernel, cl_uint, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueMigrateMemObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_mem_migration_flags, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueMigrateMemObjects (cl_command_queue command_queue,cl_uint num_mem_objects,const cl_mem * mem_objects,cl_mem_migration_flags flags,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueMigrateMemObjects_ptr) clEnqueueMigrateMemObjects_ptr = getFunction("clEnqueueMigrateMemObjects"); + return (*clEnqueueMigrateMemObjects_ptr)(command_queue, num_mem_objects, mem_objects, flags, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueNDRangeKernel_ptr)(cl_command_queue, cl_kernel, cl_uint, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueNDRangeKernel (cl_command_queue command_queue,cl_kernel kernel,cl_uint work_dim,const size_t * global_work_offset,const size_t * global_work_size,const size_t * local_work_size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueNDRangeKernel_ptr) clEnqueueNDRangeKernel_ptr = getFunction("clEnqueueNDRangeKernel"); return (*clEnqueueNDRangeKernel_ptr)(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueTask_ptr)(cl_command_queue, cl_kernel, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueTask_ptr)(cl_command_queue, cl_kernel, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueTask (cl_command_queue command_queue,cl_kernel kernel,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueTask_ptr) clEnqueueTask_ptr = getFunction("clEnqueueTask"); return (*clEnqueueTask_ptr)(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueNativeKernel_ptr)(cl_command_queue, void (*)(void *), void *, size_t, cl_uint, const cl_mem *, const void **, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueNativeKernel (cl_command_queue command_queue,void (*user_func)(void *),void * args,size_t cb_args,cl_uint num_mem_objects,const cl_mem * mem_list,const void ** args_mem_loc,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueNativeKernel_ptr)(cl_command_queue, void (CL_CALLBACK * /*user_func*/)(void *), void *, size_t, cl_uint, const cl_mem *, const void **, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueNativeKernel (cl_command_queue command_queue,void (CL_CALLBACK *user_func)(void *) ,void * args,size_t cb_args,cl_uint num_mem_objects,const cl_mem * mem_list,const void ** args_mem_loc,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueNativeKernel_ptr) clEnqueueNativeKernel_ptr = getFunction("clEnqueueNativeKernel"); return (*clEnqueueNativeKernel_ptr)(command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueMarker_ptr)(cl_command_queue, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueMarker (cl_command_queue command_queue,cl_event * event) { +static cl_int (*clEnqueueMarkerWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueMarkerWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueMarkerWithWaitList_ptr) clEnqueueMarkerWithWaitList_ptr = getFunction("clEnqueueMarkerWithWaitList"); + return (*clEnqueueMarkerWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueBarrierWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueBarrierWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueBarrierWithWaitList_ptr) clEnqueueBarrierWithWaitList_ptr = getFunction("clEnqueueBarrierWithWaitList"); + return (*clEnqueueBarrierWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event); +} + +static void * (*clGetExtensionFunctionAddressForPlatform_ptr)(cl_platform_id, const char *) = NULL; +void * CL_API_CALL clGetExtensionFunctionAddressForPlatform (cl_platform_id platform,const char * func_name) { + if(!clGetExtensionFunctionAddressForPlatform_ptr) clGetExtensionFunctionAddressForPlatform_ptr = getFunction("clGetExtensionFunctionAddressForPlatform"); + return (*clGetExtensionFunctionAddressForPlatform_ptr)(platform, func_name); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage2D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, void *, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage2D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_row_pitch,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage2D_ptr) clCreateImage2D_ptr = getFunction("clCreateImage2D"); + return (*clCreateImage2D_ptr)(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage3D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, size_t, size_t, void *, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage3D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_depth,size_t image_row_pitch,size_t image_slice_pitch,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage3D_ptr) clCreateImage3D_ptr = getFunction("clCreateImage3D"); + return (*clCreateImage3D_ptr)(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueMarker_ptr)(cl_command_queue, cl_event *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueMarker (cl_command_queue command_queue,cl_event * event) { if(!clEnqueueMarker_ptr) clEnqueueMarker_ptr = getFunction("clEnqueueMarker"); return (*clEnqueueMarker_ptr)(command_queue, event); } -static cl_int (CL_API_CALL *clEnqueueWaitForEvents_ptr)(cl_command_queue, cl_uint, const cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueWaitForEvents (cl_command_queue command_queue,cl_uint num_events,const cl_event * event_list) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueWaitForEvents_ptr)(cl_command_queue, cl_uint, const cl_event *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueWaitForEvents (cl_command_queue command_queue,cl_uint num_events,const cl_event * event_list) { if(!clEnqueueWaitForEvents_ptr) clEnqueueWaitForEvents_ptr = getFunction("clEnqueueWaitForEvents"); return (*clEnqueueWaitForEvents_ptr)(command_queue, num_events, event_list); } -static cl_int (CL_API_CALL *clEnqueueBarrier_ptr)(cl_command_queue) = NULL; -cl_int CL_API_CALL clEnqueueBarrier (cl_command_queue command_queue) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueBarrier_ptr)(cl_command_queue) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueBarrier (cl_command_queue command_queue) { if(!clEnqueueBarrier_ptr) clEnqueueBarrier_ptr = getFunction("clEnqueueBarrier"); return (*clEnqueueBarrier_ptr)(command_queue); } -static void * (CL_API_CALL *clGetExtensionFunctionAddress_ptr)(const char *) = NULL; -void * CL_API_CALL clGetExtensionFunctionAddress (const char * func_name) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clUnloadCompiler_ptr)(void) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clUnloadCompiler (void) { + if(!clUnloadCompiler_ptr) clUnloadCompiler_ptr = getFunction("clUnloadCompiler"); + return (*clUnloadCompiler_ptr)(); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * (*clGetExtensionFunctionAddress_ptr)(const char *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL clGetExtensionFunctionAddress (const char * func_name) { if(!clGetExtensionFunctionAddress_ptr) clGetExtensionFunctionAddress_ptr = getFunction("clGetExtensionFunctionAddress"); return (*clGetExtensionFunctionAddress_ptr)(func_name); } diff --git a/Externals/CLRun/clrun/genclext.c b/Externals/CLRun/clrun/genclext.c new file mode 100644 index 0000000000..e6a73afabf --- /dev/null +++ b/Externals/CLRun/clrun/genclext.c @@ -0,0 +1,28 @@ +// Automatically generated by generateClRun.pl +#include "dynamiclib.h" +#include "../include/CL/cl_ext.h" + + +static cl_int (*clIcdGetPlatformIDsKHR_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clIcdGetPlatformIDsKHR (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) { + if(!clIcdGetPlatformIDsKHR_ptr) clIcdGetPlatformIDsKHR_ptr = getFunction("clIcdGetPlatformIDsKHR"); + return (*clIcdGetPlatformIDsKHR_ptr)(num_entries, platforms, num_platforms); +} +static cl_int (* clReleaseDeviceEXT_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clReleaseDeviceEXT (cl_device_id device) { + if(! clReleaseDeviceEXT_ptr) clReleaseDeviceEXT_ptr = getFunction(" clReleaseDeviceEXT"); + return (* clReleaseDeviceEXT_ptr)(device); +} + +static cl_int (* clRetainDeviceEXT_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clRetainDeviceEXT (cl_device_id device) { + if(! clRetainDeviceEXT_ptr) clRetainDeviceEXT_ptr = getFunction(" clRetainDeviceEXT"); + return (* clRetainDeviceEXT_ptr)(device); +} + +static cl_int (* clCreateSubDevicesEXT_ptr)(cl_device_id, const cl_device_partition_property_ext *, cl_uint, cl_device_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clCreateSubDevicesEXT (cl_device_id in_device,const cl_device_partition_property_ext * properties,cl_uint num_entries,cl_device_id * out_devices,cl_uint * num_devices) { + if(! clCreateSubDevicesEXT_ptr) clCreateSubDevicesEXT_ptr = getFunction(" clCreateSubDevicesEXT"); + return (* clCreateSubDevicesEXT_ptr)(in_device, properties, num_entries, out_devices, num_devices); +} + diff --git a/Externals/CLRun/clrun/genclgl.c b/Externals/CLRun/clrun/genclgl.c index cc83a8a7ff..acb06a1ff7 100644 --- a/Externals/CLRun/clrun/genclgl.c +++ b/Externals/CLRun/clrun/genclgl.c @@ -3,55 +3,61 @@ #include "../include/CL/cl_gl.h" -static cl_mem (CL_API_CALL *clCreateFromGLBuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, int *) = NULL; +static cl_mem (*clCreateFromGLBuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, int *) = NULL; cl_mem CL_API_CALL clCreateFromGLBuffer (cl_context context,cl_mem_flags flags,cl_GLuint bufobj,int * errcode_ret) { if(!clCreateFromGLBuffer_ptr) clCreateFromGLBuffer_ptr = getFunction("clCreateFromGLBuffer"); - return (*clCreateFromGLBuffer_ptr)(context, flags, bufobj, errcode_ret ); + return (*clCreateFromGLBuffer_ptr)(context, flags, bufobj, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateFromGLTexture2D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateFromGLTexture2D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { - if(!clCreateFromGLTexture2D_ptr) clCreateFromGLTexture2D_ptr = getFunction("clCreateFromGLTexture2D"); - return (*clCreateFromGLTexture2D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +static cl_mem (*clCreateFromGLTexture_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateFromGLTexture (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture_ptr) clCreateFromGLTexture_ptr = getFunction("clCreateFromGLTexture"); + return (*clCreateFromGLTexture_ptr)(context, flags, target, miplevel, texture, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateFromGLTexture3D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateFromGLTexture3D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { - if(!clCreateFromGLTexture3D_ptr) clCreateFromGLTexture3D_ptr = getFunction("clCreateFromGLTexture3D"); - return (*clCreateFromGLTexture3D_ptr)(context, flags, target, miplevel, texture, errcode_ret); -} - -static cl_mem (CL_API_CALL *clCreateFromGLRenderbuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, cl_int *) = NULL; +static cl_mem (*clCreateFromGLRenderbuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, cl_int *) = NULL; cl_mem CL_API_CALL clCreateFromGLRenderbuffer (cl_context context,cl_mem_flags flags,cl_GLuint renderbuffer,cl_int * errcode_ret) { if(!clCreateFromGLRenderbuffer_ptr) clCreateFromGLRenderbuffer_ptr = getFunction("clCreateFromGLRenderbuffer"); return (*clCreateFromGLRenderbuffer_ptr)(context, flags, renderbuffer, errcode_ret); } -static cl_int (CL_API_CALL *clGetGLObjectInfo_ptr)(cl_mem, cl_gl_object_type *, cl_GLuint *) = NULL; +static cl_int (*clGetGLObjectInfo_ptr)(cl_mem, cl_gl_object_type *, cl_GLuint *) = NULL; cl_int CL_API_CALL clGetGLObjectInfo (cl_mem memobj,cl_gl_object_type * gl_object_type,cl_GLuint * gl_object_name) { if(!clGetGLObjectInfo_ptr) clGetGLObjectInfo_ptr = getFunction("clGetGLObjectInfo"); return (*clGetGLObjectInfo_ptr)(memobj, gl_object_type, gl_object_name); } -static cl_int (CL_API_CALL *clGetGLTextureInfo_ptr)(cl_mem, cl_gl_texture_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetGLTextureInfo_ptr)(cl_mem, cl_gl_texture_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetGLTextureInfo (cl_mem memobj,cl_gl_texture_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetGLTextureInfo_ptr) clGetGLTextureInfo_ptr = getFunction("clGetGLTextureInfo"); return (*clGetGLTextureInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clEnqueueAcquireGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueAcquireGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueAcquireGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueAcquireGLObjects_ptr) clEnqueueAcquireGLObjects_ptr = getFunction("clEnqueueAcquireGLObjects"); return (*clEnqueueAcquireGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueReleaseGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueReleaseGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueReleaseGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReleaseGLObjects_ptr) clEnqueueReleaseGLObjects_ptr = getFunction("clEnqueueReleaseGLObjects"); return (*clEnqueueReleaseGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clGetGLContextInfoKHR_ptr)(const cl_context_properties *, cl_gl_context_info, size_t, void *, size_t *) = NULL; +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture2D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture2D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture2D_ptr) clCreateFromGLTexture2D_ptr = getFunction("clCreateFromGLTexture2D"); + return (*clCreateFromGLTexture2D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture3D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture3D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture3D_ptr) clCreateFromGLTexture3D_ptr = getFunction("clCreateFromGLTexture3D"); + return (*clCreateFromGLTexture3D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +} + +static cl_int (*clGetGLContextInfoKHR_ptr)(const cl_context_properties *, cl_gl_context_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetGLContextInfoKHR (const cl_context_properties * properties,cl_gl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetGLContextInfoKHR_ptr) clGetGLContextInfoKHR_ptr = getFunction("clGetGLContextInfoKHR"); return (*clGetGLContextInfoKHR_ptr)(properties, param_name, param_value_size, param_value, param_value_size_ret); diff --git a/Externals/CLRun/clrun/genclglext.c b/Externals/CLRun/clrun/genclglext.c new file mode 100644 index 0000000000..333103ea85 --- /dev/null +++ b/Externals/CLRun/clrun/genclglext.c @@ -0,0 +1,11 @@ +// Automatically generated by generateClRun.pl +#include "dynamiclib.h" +#include "../include/CL/cl_gl_ext.h" + + +static cl_event (*clCreateEventFromGLsyncKHR_ptr)(cl_context, cl_GLsync, cl_int *) = NULL; +cl_event CL_API_CALL clCreateEventFromGLsyncKHR (cl_context context,cl_GLsync cl_GLsync,cl_int * errcode_ret) { + if(!clCreateEventFromGLsyncKHR_ptr) clCreateEventFromGLsyncKHR_ptr = getFunction("clCreateEventFromGLsyncKHR"); + return (*clCreateEventFromGLsyncKHR_ptr)(context, cl_GLsync, errcode_ret); +} + diff --git a/Externals/CLRun/clrun/generateClRun.pl b/Externals/CLRun/clrun/generateClRun.pl old mode 100644 new mode 100755 diff --git a/Externals/CLRun/include/CL/cl.h b/Externals/CLRun/include/CL/cl.h index 6e9a72c776..203c65974f 100644 --- a/Externals/CLRun/include/CL/cl.h +++ b/Externals/CLRun/include/CL/cl.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008 - 2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,8 +21,6 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. ******************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ - #ifndef __OPENCL_CL_H #define __OPENCL_CL_H @@ -53,14 +51,15 @@ typedef cl_ulong cl_bitfield; typedef cl_bitfield cl_device_type; typedef cl_uint cl_platform_info; typedef cl_uint cl_device_info; -typedef cl_bitfield cl_device_address_info; typedef cl_bitfield cl_device_fp_config; typedef cl_uint cl_device_mem_cache_type; typedef cl_uint cl_device_local_mem_type; typedef cl_bitfield cl_device_exec_capabilities; typedef cl_bitfield cl_command_queue_properties; +typedef intptr_t cl_device_partition_property; +typedef cl_bitfield cl_device_affinity_domain; -typedef intptr_t cl_context_properties; +typedef intptr_t cl_context_properties; typedef cl_uint cl_context_info; typedef cl_uint cl_command_queue_info; typedef cl_uint cl_channel_order; @@ -68,25 +67,50 @@ typedef cl_uint cl_channel_type; typedef cl_bitfield cl_mem_flags; typedef cl_uint cl_mem_object_type; typedef cl_uint cl_mem_info; +typedef cl_bitfield cl_mem_migration_flags; typedef cl_uint cl_image_info; +typedef cl_uint cl_buffer_create_type; typedef cl_uint cl_addressing_mode; typedef cl_uint cl_filter_mode; typedef cl_uint cl_sampler_info; typedef cl_bitfield cl_map_flags; typedef cl_uint cl_program_info; typedef cl_uint cl_program_build_info; +typedef cl_uint cl_program_binary_type; typedef cl_int cl_build_status; typedef cl_uint cl_kernel_info; +typedef cl_uint cl_kernel_arg_info; +typedef cl_uint cl_kernel_arg_address_qualifier; +typedef cl_uint cl_kernel_arg_access_qualifier; +typedef cl_bitfield cl_kernel_arg_type_qualifier; typedef cl_uint cl_kernel_work_group_info; typedef cl_uint cl_event_info; typedef cl_uint cl_command_type; typedef cl_uint cl_profiling_info; + typedef struct _cl_image_format { cl_channel_order image_channel_order; cl_channel_type image_channel_data_type; } cl_image_format; +typedef struct _cl_image_desc { + cl_mem_object_type image_type; + size_t image_width; + size_t image_height; + size_t image_depth; + size_t image_array_size; + size_t image_row_pitch; + size_t image_slice_pitch; + cl_uint num_mip_levels; + cl_uint num_samples; + cl_mem buffer; +} cl_image_desc; + +typedef struct _cl_buffer_region { + size_t origin; + size_t size; +} cl_buffer_region; /******************************************************************************/ @@ -105,6 +129,13 @@ typedef struct _cl_image_format { #define CL_IMAGE_FORMAT_NOT_SUPPORTED -10 #define CL_BUILD_PROGRAM_FAILURE -11 #define CL_MAP_FAILURE -12 +#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13 +#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14 +#define CL_COMPILE_PROGRAM_FAILURE -15 +#define CL_LINKER_NOT_AVAILABLE -16 +#define CL_LINK_PROGRAM_FAILURE -17 +#define CL_DEVICE_PARTITION_FAILED -18 +#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE -19 #define CL_INVALID_VALUE -30 #define CL_INVALID_DEVICE_TYPE -31 @@ -140,13 +171,22 @@ typedef struct _cl_image_format { #define CL_INVALID_BUFFER_SIZE -61 #define CL_INVALID_MIP_LEVEL -62 #define CL_INVALID_GLOBAL_WORK_SIZE -63 +#define CL_INVALID_PROPERTY -64 +#define CL_INVALID_IMAGE_DESCRIPTOR -65 +#define CL_INVALID_COMPILER_OPTIONS -66 +#define CL_INVALID_LINKER_OPTIONS -67 +#define CL_INVALID_DEVICE_PARTITION_COUNT -68 /* OpenCL Version */ #define CL_VERSION_1_0 1 +#define CL_VERSION_1_1 1 +#define CL_VERSION_1_2 1 /* cl_bool */ #define CL_FALSE 0 #define CL_TRUE 1 +#define CL_BLOCKING CL_TRUE +#define CL_NON_BLOCKING CL_FALSE /* cl_platform_info */ #define CL_PLATFORM_PROFILE 0x0900 @@ -160,6 +200,7 @@ typedef struct _cl_image_format { #define CL_DEVICE_TYPE_CPU (1 << 1) #define CL_DEVICE_TYPE_GPU (1 << 2) #define CL_DEVICE_TYPE_ACCELERATOR (1 << 3) +#define CL_DEVICE_TYPE_CUSTOM (1 << 4) #define CL_DEVICE_TYPE_ALL 0xFFFFFFFF /* cl_device_info */ @@ -213,8 +254,32 @@ typedef struct _cl_image_format { #define CL_DEVICE_VERSION 0x102F #define CL_DEVICE_EXTENSIONS 0x1030 #define CL_DEVICE_PLATFORM 0x1031 -/* 0x1032 reserved for CL_DEVICE_DOUBLE_FP_CONFIG */ +#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032 /* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */ +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034 +#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C +#define CL_DEVICE_OPENCL_C_VERSION 0x103D +#define CL_DEVICE_LINKER_AVAILABLE 0x103E +#define CL_DEVICE_BUILT_IN_KERNELS 0x103F +#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE 0x1040 +#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE 0x1041 +#define CL_DEVICE_PARENT_DEVICE 0x1042 +#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES 0x1043 +#define CL_DEVICE_PARTITION_PROPERTIES 0x1044 +#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN 0x1045 +#define CL_DEVICE_PARTITION_TYPE 0x1046 +#define CL_DEVICE_REFERENCE_COUNT 0x1047 +#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC 0x1048 +#define CL_DEVICE_PRINTF_BUFFER_SIZE 0x1049 +#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT 0x104A +#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT 0x104B /* cl_device_fp_config - bitfield */ #define CL_FP_DENORM (1 << 0) @@ -223,6 +288,8 @@ typedef struct _cl_image_format { #define CL_FP_ROUND_TO_ZERO (1 << 3) #define CL_FP_ROUND_TO_INF (1 << 4) #define CL_FP_FMA (1 << 5) +#define CL_FP_SOFT_FLOAT (1 << 6) +#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT (1 << 7) /* cl_device_mem_cache_type */ #define CL_NONE 0x0 @@ -245,9 +312,25 @@ typedef struct _cl_image_format { #define CL_CONTEXT_REFERENCE_COUNT 0x1080 #define CL_CONTEXT_DEVICES 0x1081 #define CL_CONTEXT_PROPERTIES 0x1082 +#define CL_CONTEXT_NUM_DEVICES 0x1083 -/* cl_context_info + cl_context_properties */ +/* cl_context_properties */ #define CL_CONTEXT_PLATFORM 0x1084 +#define CL_CONTEXT_INTEROP_USER_SYNC 0x1085 + +/* cl_device_partition_property */ +#define CL_DEVICE_PARTITION_EQUALLY 0x1086 +#define CL_DEVICE_PARTITION_BY_COUNTS 0x1087 +#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END 0x0 +#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN 0x1088 + +/* cl_device_affinity_domain */ +#define CL_DEVICE_AFFINITY_DOMAIN_NUMA (1 << 0) +#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE (1 << 1) +#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE (1 << 2) +#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE (1 << 3) +#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE (1 << 4) +#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE (1 << 5) /* cl_command_queue_info */ #define CL_QUEUE_CONTEXT 0x1090 @@ -262,6 +345,14 @@ typedef struct _cl_image_format { #define CL_MEM_USE_HOST_PTR (1 << 3) #define CL_MEM_ALLOC_HOST_PTR (1 << 4) #define CL_MEM_COPY_HOST_PTR (1 << 5) +// reserved (1 << 6) +#define CL_MEM_HOST_WRITE_ONLY (1 << 7) +#define CL_MEM_HOST_READ_ONLY (1 << 8) +#define CL_MEM_HOST_NO_ACCESS (1 << 9) + +/* cl_mem_migration_flags - bitfield */ +#define CL_MIGRATE_MEM_OBJECT_HOST (1 << 0) +#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED (1 << 1) /* cl_channel_order */ #define CL_R 0x10B0 @@ -274,6 +365,11 @@ typedef struct _cl_image_format { #define CL_ARGB 0x10B7 #define CL_INTENSITY 0x10B8 #define CL_LUMINANCE 0x10B9 +#define CL_Rx 0x10BA +#define CL_RGx 0x10BB +#define CL_RGBx 0x10BC +#define CL_DEPTH 0x10BD +#define CL_DEPTH_STENCIL 0x10BE /* cl_channel_type */ #define CL_SNORM_INT8 0x10D0 @@ -291,11 +387,16 @@ typedef struct _cl_image_format { #define CL_UNSIGNED_INT32 0x10DC #define CL_HALF_FLOAT 0x10DD #define CL_FLOAT 0x10DE +#define CL_UNORM_INT24 0x10DF /* cl_mem_object_type */ #define CL_MEM_OBJECT_BUFFER 0x10F0 #define CL_MEM_OBJECT_IMAGE2D 0x10F1 #define CL_MEM_OBJECT_IMAGE3D 0x10F2 +#define CL_MEM_OBJECT_IMAGE2D_ARRAY 0x10F3 +#define CL_MEM_OBJECT_IMAGE1D 0x10F4 +#define CL_MEM_OBJECT_IMAGE1D_ARRAY 0x10F5 +#define CL_MEM_OBJECT_IMAGE1D_BUFFER 0x10F6 /* cl_mem_info */ #define CL_MEM_TYPE 0x1100 @@ -305,6 +406,8 @@ typedef struct _cl_image_format { #define CL_MEM_MAP_COUNT 0x1104 #define CL_MEM_REFERENCE_COUNT 0x1105 #define CL_MEM_CONTEXT 0x1106 +#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107 +#define CL_MEM_OFFSET 0x1108 /* cl_image_info */ #define CL_IMAGE_FORMAT 0x1110 @@ -314,12 +417,17 @@ typedef struct _cl_image_format { #define CL_IMAGE_WIDTH 0x1114 #define CL_IMAGE_HEIGHT 0x1115 #define CL_IMAGE_DEPTH 0x1116 +#define CL_IMAGE_ARRAY_SIZE 0x1117 +#define CL_IMAGE_BUFFER 0x1118 +#define CL_IMAGE_NUM_MIP_LEVELS 0x1119 +#define CL_IMAGE_NUM_SAMPLES 0x111A /* cl_addressing_mode */ #define CL_ADDRESS_NONE 0x1130 #define CL_ADDRESS_CLAMP_TO_EDGE 0x1131 #define CL_ADDRESS_CLAMP 0x1132 #define CL_ADDRESS_REPEAT 0x1133 +#define CL_ADDRESS_MIRRORED_REPEAT 0x1134 /* cl_filter_mode */ #define CL_FILTER_NEAREST 0x1140 @@ -335,6 +443,7 @@ typedef struct _cl_image_format { /* cl_map_flags - bitfield */ #define CL_MAP_READ (1 << 0) #define CL_MAP_WRITE (1 << 1) +#define CL_MAP_WRITE_INVALIDATE_REGION (1 << 2) /* cl_program_info */ #define CL_PROGRAM_REFERENCE_COUNT 0x1160 @@ -344,11 +453,20 @@ typedef struct _cl_image_format { #define CL_PROGRAM_SOURCE 0x1164 #define CL_PROGRAM_BINARY_SIZES 0x1165 #define CL_PROGRAM_BINARIES 0x1166 +#define CL_PROGRAM_NUM_KERNELS 0x1167 +#define CL_PROGRAM_KERNEL_NAMES 0x1168 /* cl_program_build_info */ #define CL_PROGRAM_BUILD_STATUS 0x1181 #define CL_PROGRAM_BUILD_OPTIONS 0x1182 #define CL_PROGRAM_BUILD_LOG 0x1183 +#define CL_PROGRAM_BINARY_TYPE 0x1184 + +/* cl_program_binary_type */ +#define CL_PROGRAM_BINARY_TYPE_NONE 0x0 +#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT 0x1 +#define CL_PROGRAM_BINARY_TYPE_LIBRARY 0x2 +#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE 0x4 /* cl_build_status */ #define CL_BUILD_SUCCESS 0 @@ -362,17 +480,47 @@ typedef struct _cl_image_format { #define CL_KERNEL_REFERENCE_COUNT 0x1192 #define CL_KERNEL_CONTEXT 0x1193 #define CL_KERNEL_PROGRAM 0x1194 +#define CL_KERNEL_ATTRIBUTES 0x1195 + +/* cl_kernel_arg_info */ +#define CL_KERNEL_ARG_ADDRESS_QUALIFIER 0x1196 +#define CL_KERNEL_ARG_ACCESS_QUALIFIER 0x1197 +#define CL_KERNEL_ARG_TYPE_NAME 0x1198 +#define CL_KERNEL_ARG_TYPE_QUALIFIER 0x1199 +#define CL_KERNEL_ARG_NAME 0x119A + +/* cl_kernel_arg_address_qualifier */ +#define CL_KERNEL_ARG_ADDRESS_GLOBAL 0x119B +#define CL_KERNEL_ARG_ADDRESS_LOCAL 0x119C +#define CL_KERNEL_ARG_ADDRESS_CONSTANT 0x119D +#define CL_KERNEL_ARG_ADDRESS_PRIVATE 0x119E + +/* cl_kernel_arg_access_qualifier */ +#define CL_KERNEL_ARG_ACCESS_READ_ONLY 0x11A0 +#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY 0x11A1 +#define CL_KERNEL_ARG_ACCESS_READ_WRITE 0x11A2 +#define CL_KERNEL_ARG_ACCESS_NONE 0x11A3 + +/* cl_kernel_arg_type_qualifer */ +#define CL_KERNEL_ARG_TYPE_NONE 0 +#define CL_KERNEL_ARG_TYPE_CONST (1 << 0) +#define CL_KERNEL_ARG_TYPE_RESTRICT (1 << 1) +#define CL_KERNEL_ARG_TYPE_VOLATILE (1 << 2) /* cl_kernel_work_group_info */ #define CL_KERNEL_WORK_GROUP_SIZE 0x11B0 #define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1 #define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2 +#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3 +#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4 +#define CL_KERNEL_GLOBAL_WORK_SIZE 0x11B5 /* cl_event_info */ #define CL_EVENT_COMMAND_QUEUE 0x11D0 #define CL_EVENT_COMMAND_TYPE 0x11D1 #define CL_EVENT_REFERENCE_COUNT 0x11D2 #define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3 +#define CL_EVENT_CONTEXT 0x11D4 /* cl_command_type */ #define CL_COMMAND_NDRANGE_KERNEL 0x11F0 @@ -392,13 +540,24 @@ typedef struct _cl_image_format { #define CL_COMMAND_MARKER 0x11FE #define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF #define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200 +#define CL_COMMAND_READ_BUFFER_RECT 0x1201 +#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202 +#define CL_COMMAND_COPY_BUFFER_RECT 0x1203 +#define CL_COMMAND_USER 0x1204 +#define CL_COMMAND_BARRIER 0x1205 +#define CL_COMMAND_MIGRATE_MEM_OBJECTS 0x1206 +#define CL_COMMAND_FILL_BUFFER 0x1207 +#define CL_COMMAND_FILL_IMAGE 0x1208 /* command execution status */ #define CL_COMPLETE 0x0 #define CL_RUNNING 0x1 #define CL_SUBMITTED 0x2 #define CL_QUEUED 0x3 - + +/* cl_buffer_create_type */ +#define CL_BUFFER_CREATE_TYPE_REGION 0x1220 + /* cl_profiling_info */ #define CL_PROFILING_COMMAND_QUEUED 0x1280 #define CL_PROFILING_COMMAND_SUBMIT 0x1281 @@ -434,22 +593,35 @@ clGetDeviceInfo(cl_device_id /* device */, size_t /* param_value_size */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +extern CL_API_ENTRY cl_int CL_API_CALL +clCreateSubDevices(cl_device_id /* in_device */, + const cl_device_partition_property * /* properties */, + cl_uint /* num_devices */, + cl_device_id * /* out_devices */, + cl_uint * /* num_devices_ret */) CL_API_SUFFIX__VERSION_1_2; +extern CL_API_ENTRY cl_int CL_API_CALL +clRetainDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clReleaseDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2; + /* Context APIs */ extern CL_API_ENTRY cl_context CL_API_CALL clCreateContext(const cl_context_properties * /* properties */, - cl_uint /* num_devices */, - const cl_device_id * /* devices */, + cl_uint /* num_devices */, + const cl_device_id * /* devices */, void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * /* properties */, - cl_device_type /* device_type */, + cl_device_type /* device_type */, void (CL_CALLBACK * /* pfn_notify*/ )(const char *, const void *, size_t, void *), - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; @@ -484,13 +656,7 @@ clGetCommandQueueInfo(cl_command_queue /* command_queue */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -extern CL_API_ENTRY cl_int CL_API_CALL -clSetCommandQueueProperty(cl_command_queue /* command_queue */, - cl_command_queue_properties /* properties */, - cl_bool /* enable */, - cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0; - -/* Memory Object APIs */ +/* Memory Object APIs */ extern CL_API_ENTRY cl_mem CL_API_CALL clCreateBuffer(cl_context /* context */, cl_mem_flags /* flags */, @@ -499,26 +665,19 @@ clCreateBuffer(cl_context /* context */, cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage2D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_row_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - +clCreateSubBuffer(cl_mem /* buffer */, + cl_mem_flags /* flags */, + cl_buffer_create_type /* buffer_create_type */, + const void * /* buffer_create_info */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage3D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_depth */, - size_t /* image_row_pitch */, - size_t /* image_slice_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; +clCreateImage(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + const cl_image_desc * /* image_desc */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; @@ -548,7 +707,12 @@ clGetImageInfo(cl_mem /* image */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -/* Sampler APIs */ +extern CL_API_ENTRY cl_int CL_API_CALL +clSetMemObjectDestructorCallback( cl_mem /* memobj */, + void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), + void * /*user_data */ ) CL_API_SUFFIX__VERSION_1_1; + +/* Sampler APIs */ extern CL_API_ENTRY cl_sampler CL_API_CALL clCreateSampler(cl_context /* context */, cl_bool /* normalized_coords */, @@ -586,6 +750,13 @@ clCreateProgramWithBinary(cl_context /* context */, cl_int * /* binary_status */, cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_program CL_API_CALL +clCreateProgramWithBuiltInKernels(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* kernel_names */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; @@ -601,7 +772,30 @@ clBuildProgram(cl_program /* program */, void * /* user_data */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL -clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_0; +clCompileProgram(cl_program /* program */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + cl_uint /* num_input_headers */, + const cl_program * /* input_headers */, + const char ** /* header_include_names */, + void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_program CL_API_CALL +clLinkProgram(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + cl_uint /* num_input_programs */, + const cl_program * /* input_programs */, + void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), + void * /* user_data */, + cl_int * /* errcode_ret */ ) CL_API_SUFFIX__VERSION_1_2; + + +extern CL_API_ENTRY cl_int CL_API_CALL +clUnloadPlatformCompiler(cl_platform_id /* platform */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL clGetProgramInfo(cl_program /* program */, @@ -649,6 +843,14 @@ clGetKernelInfo(cl_kernel /* kernel */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clGetKernelArgInfo(cl_kernel /* kernel */, + cl_uint /* arg_indx */, + cl_kernel_arg_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clGetKernelWorkGroupInfo(cl_kernel /* kernel */, cl_device_id /* device */, @@ -657,7 +859,7 @@ clGetKernelWorkGroupInfo(cl_kernel /* kernel */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -/* Event Object APIs */ +/* Event Object APIs */ extern CL_API_ENTRY cl_int CL_API_CALL clWaitForEvents(cl_uint /* num_events */, const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; @@ -669,13 +871,27 @@ clGetEventInfo(cl_event /* event */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_event CL_API_CALL +clCreateUserEvent(cl_context /* context */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; -/* Profiling APIs */ +extern CL_API_ENTRY cl_int CL_API_CALL +clSetUserEventStatus(cl_event /* event */, + cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clSetEventCallback( cl_event /* event */, + cl_int /* command_exec_callback_type */, + void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_1; + +/* Profiling APIs */ extern CL_API_ENTRY cl_int CL_API_CALL clGetEventProfilingInfo(cl_event /* event */, cl_profiling_info /* param_name */, @@ -696,34 +912,92 @@ clEnqueueReadBuffer(cl_command_queue /* command_queue */, cl_mem /* buffer */, cl_bool /* blocking_read */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, void * /* ptr */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueReadBufferRect(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_read */, + const size_t * /* buffer_offset */, + const size_t * /* host_offset */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue /* command_queue */, cl_mem /* buffer */, cl_bool /* blocking_write */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, const void * /* ptr */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueWriteBufferRect(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_write */, + const size_t * /* buffer_offset */, + const size_t * /* host_offset */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueFillBuffer(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + const void * /* pattern */, + size_t /* pattern_size */, + size_t /* offset */, + size_t /* size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueCopyBuffer(cl_command_queue /* command_queue */, cl_mem /* src_buffer */, cl_mem /* dst_buffer */, size_t /* src_offset */, size_t /* dst_offset */, - size_t /* cb */, + size_t /* size */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueCopyBufferRect(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_buffer */, + const size_t * /* src_origin */, + const size_t * /* dst_origin */, + const size_t * /* region */, + size_t /* src_row_pitch */, + size_t /* src_slice_pitch */, + size_t /* dst_row_pitch */, + size_t /* dst_slice_pitch */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueReadImage(cl_command_queue /* command_queue */, cl_mem /* image */, @@ -750,6 +1024,16 @@ clEnqueueWriteImage(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueFillImage(cl_command_queue /* command_queue */, + cl_mem /* image */, + const void * /* fill_color */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue /* command_queue */, cl_mem /* src_image */, @@ -789,7 +1073,7 @@ clEnqueueMapBuffer(cl_command_queue /* command_queue */, cl_bool /* blocking_map */, cl_map_flags /* map_flags */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */, @@ -817,6 +1101,15 @@ clEnqueueUnmapMemObject(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueMigrateMemObjects(cl_command_queue /* command_queue */, + cl_uint /* num_mem_objects */, + const cl_mem * /* mem_objects */, + cl_mem_migration_flags /* flags */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue /* command_queue */, cl_kernel /* kernel */, @@ -837,7 +1130,7 @@ clEnqueueTask(cl_command_queue /* command_queue */, extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueNativeKernel(cl_command_queue /* command_queue */, - void (*user_func)(void *), + void (CL_CALLBACK * /*user_func*/)(void *), void * /* args */, size_t /* cb_args */, cl_uint /* num_mem_objects */, @@ -848,16 +1141,17 @@ clEnqueueNativeKernel(cl_command_queue /* command_queue */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueMarker(cl_command_queue /* command_queue */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +clEnqueueMarkerWithWaitList(cl_command_queue /* command_queue */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWaitForEvents(cl_command_queue /* command_queue */, - cl_uint /* num_events */, - const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; +clEnqueueBarrierWithWaitList(cl_command_queue /* command_queue */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; /* Extension function access * @@ -866,7 +1160,51 @@ clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_ * check to make sure the address is not NULL, before using or * calling the returned function address. */ -extern CL_API_ENTRY void * CL_API_CALL clGetExtensionFunctionAddress(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY void * CL_API_CALL +clGetExtensionFunctionAddressForPlatform(cl_platform_id /* platform */, + const char * /* func_name */) CL_API_SUFFIX__VERSION_1_2; + + +// Deprecated OpenCL 1.1 APIs +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateImage2D(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_row_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateImage3D(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_depth */, + size_t /* image_row_pitch */, + size_t /* image_slice_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueMarker(cl_command_queue /* command_queue */, + cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueWaitForEvents(cl_command_queue /* command_queue */, + cl_uint /* num_events */, + const cl_event * /* event_list */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueBarrier(cl_command_queue /* command_queue */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL +clGetExtensionFunctionAddress(const char * /* func_name */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; #ifdef __cplusplus } diff --git a/Externals/CLRun/include/CL/cl_d3d10.h b/Externals/CLRun/include/CL/cl_d3d10.h new file mode 100644 index 0000000000..81b0d37214 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_d3d10.h @@ -0,0 +1,126 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_D3D10_H +#define __OPENCL_CL_D3D10_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** + * cl_khr_d3d10_sharing */ +#define cl_khr_d3d10_sharing 1 + +typedef cl_uint cl_d3d10_device_source_khr; +typedef cl_uint cl_d3d10_device_set_khr; + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_D3D10_DEVICE_KHR -1002 +#define CL_INVALID_D3D10_RESOURCE_KHR -1003 +#define CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR -1004 +#define CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR -1005 + +// cl_d3d10_device_source_nv +#define CL_D3D10_DEVICE_KHR 0x4010 +#define CL_D3D10_DXGI_ADAPTER_KHR 0x4011 + +// cl_d3d10_device_set_nv +#define CL_PREFERRED_DEVICES_FOR_D3D10_KHR 0x4012 +#define CL_ALL_DEVICES_FOR_D3D10_KHR 0x4013 + +// cl_context_info +#define CL_CONTEXT_D3D10_DEVICE_KHR 0x4014 +#define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C + +// cl_mem_info +#define CL_MEM_D3D10_RESOURCE_KHR 0x4015 + +// cl_image_info +#define CL_IMAGE_D3D10_SUBRESOURCE_KHR 0x4016 + +// cl_command_type +#define CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR 0x4017 +#define CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR 0x4018 + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)( + cl_platform_id platform, + cl_d3d10_device_source_khr d3d_device_source, + void * d3d_object, + cl_d3d10_device_set_khr d3d_device_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_D3D10_H + diff --git a/Externals/CLRun/include/CL/cl_d3d11.h b/Externals/CLRun/include/CL/cl_d3d11.h new file mode 100644 index 0000000000..d3c8bdc2b1 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_d3d11.h @@ -0,0 +1,126 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_D3D11_H +#define __OPENCL_CL_D3D11_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** + * cl_khr_d3d11_sharing */ +#define cl_khr_d3d11_sharing 1 + +typedef cl_uint cl_d3d11_device_source_khr; +typedef cl_uint cl_d3d11_device_set_khr; + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_D3D11_DEVICE_KHR -1006 +#define CL_INVALID_D3D11_RESOURCE_KHR -1007 +#define CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR -1008 +#define CL_D3D11_RESOURCE_NOT_ACQUIRED_KHR -1009 + +// cl_d3d11_device_source +#define CL_D3D11_DEVICE_KHR 0x4019 +#define CL_D3D11_DXGI_ADAPTER_KHR 0x401A + +// cl_d3d11_device_set +#define CL_PREFERRED_DEVICES_FOR_D3D11_KHR 0x401B +#define CL_ALL_DEVICES_FOR_D3D11_KHR 0x401C + +// cl_context_info +#define CL_CONTEXT_D3D11_DEVICE_KHR 0x401D +#define CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR 0x402D + +// cl_mem_info +#define CL_MEM_D3D11_RESOURCE_KHR 0x401E + +// cl_image_info +#define CL_IMAGE_D3D11_SUBRESOURCE_KHR 0x401F + +// cl_command_type +#define CL_COMMAND_ACQUIRE_D3D11_OBJECTS_KHR 0x4020 +#define CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR 0x4021 + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)( + cl_platform_id platform, + cl_d3d11_device_source_khr d3d_device_source, + void * d3d_object, + cl_d3d11_device_set_khr d3d_device_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_D3D11_H + diff --git a/Externals/CLRun/include/CL/cl_dx9_media_sharing.h b/Externals/CLRun/include/CL/cl_dx9_media_sharing.h new file mode 100644 index 0000000000..1ef543a5af --- /dev/null +++ b/Externals/CLRun/include/CL/cl_dx9_media_sharing.h @@ -0,0 +1,127 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H +#define __OPENCL_CL_DX9_MEDIA_SHARING_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** +/* cl_khr_dx9_media_sharing */ +#define cl_khr_dx9_media_sharing 1 + +typedef cl_uint cl_dx9_media_adapter_type_khr; +typedef cl_uint cl_dx9_media_adapter_set_khr; + +#if defined(_WIN32) +#include +typedef struct _cl_dx9_surface_info_khr +{ + IDirect3DSurface9 *resource; + HANDLE shared_handle; +} cl_dx9_surface_info_khr; +#endif + + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_DX9_MEDIA_ADAPTER_KHR -1010 +#define CL_INVALID_DX9_MEDIA_SURFACE_KHR -1011 +#define CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR -1012 +#define CL_DX9_MEDIA_SURFACE_NOT_ACQUIRED_KHR -1013 + +// cl_media_adapter_type_khr +#define CL_ADAPTER_D3D9_KHR 0x2020 +#define CL_ADAPTER_D3D9EX_KHR 0x2021 +#define CL_ADAPTER_DXVA_KHR 0x2022 + +// cl_media_adapter_set_khr +#define CL_PREFERRED_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR 0x2023 +#define CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR 0x2024 + +// cl_context_info +#define CL_CONTEXT_ADAPTER_D3D9_KHR 0x2025 +#define CL_CONTEXT_ADAPTER_D3D9EX_KHR 0x2026 +#define CL_CONTEXT_ADAPTER_DXVA_KHR 0x2027 + +// cl_mem_info +#define CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR 0x2028 +#define CL_MEM_DX9_MEDIA_SURFACE_INFO_KHR 0x2029 + +// cl_image_info +#define CL_IMAGE_DX9_MEDIA_PLANE_KHR 0x202A + +// cl_command_type +#define CL_COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR 0x202B +#define CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR 0x202C + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)( + cl_platform_id platform, + cl_uint num_media_adapters, + cl_dx9_media_adapter_type_khr * media_adapter_type, + void * media_adapters, + cl_dx9_media_adapter_set_khr media_adapter_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)( + cl_context context, + cl_mem_flags flags, + cl_dx9_media_adapter_type_khr adapter_type, + void * surface_info, + cl_uint plane, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_DX9_MEDIA_SHARING_H + diff --git a/Externals/CLRun/include/CL/cl_ext.h b/Externals/CLRun/include/CL/cl_ext.h new file mode 100644 index 0000000000..632cb216b3 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_ext.h @@ -0,0 +1,251 @@ +/******************************************************************************* + * Copyright (c) 2008 - 2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + ******************************************************************************/ + +/* $Revision: 11928 $ on $Date: 2010-07-13 09:04:56 -0700 (Tue, 13 Jul 2010) $ */ + +/* cl_ext.h contains OpenCL extensions which don't have external */ +/* (OpenGL, D3D) dependencies. */ + +#ifndef __CL_EXT_H +#define __CL_EXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __APPLE__ + #include + #include +#else + #include +#endif + +/* cl_khr_fp16 extension - no extension #define since it has no functions */ +#define CL_DEVICE_HALF_FP_CONFIG 0x1033 + +/* Memory object destruction + * + * Apple extension for use to manage externally allocated buffers used with cl_mem objects with CL_MEM_USE_HOST_PTR + * + * Registers a user callback function that will be called when the memory object is deleted and its resources + * freed. Each call to clSetMemObjectCallbackFn registers the specified user callback function on a callback + * stack associated with memobj. The registered user callback functions are called in the reverse order in + * which they were registered. The user callback functions are called and then the memory object is deleted + * and its resources freed. This provides a mechanism for the application (and libraries) using memobj to be + * notified when the memory referenced by host_ptr, specified when the memory object is created and used as + * the storage bits for the memory object, can be reused or freed. + * + * The application may not call CL api's with the cl_mem object passed to the pfn_notify. + * + * Please check for the "cl_APPLE_SetMemObjectDestructor" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS) + * before using. + */ +#define cl_APPLE_SetMemObjectDestructor 1 +cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem /* memobj */, + void (* /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), + void * /*user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + + +/* Context Logging Functions + * + * The next three convenience functions are intended to be used as the pfn_notify parameter to clCreateContext(). + * Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS) + * before using. + * + * clLogMessagesToSystemLog fowards on all log messages to the Apple System Logger + */ +#define cl_APPLE_ContextLoggingFunctions 1 +extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + +/* clLogMessagesToStdout sends all log messages to the file descriptor stdout */ +extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + +/* clLogMessagesToStderr sends all log messages to the file descriptor stderr */ +extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + + +/************************ +* cl_khr_icd extension * +************************/ +#define cl_khr_icd 1 + +/* cl_platform_info */ +#define CL_PLATFORM_ICD_SUFFIX_KHR 0x0920 + +/* Additional Error Codes */ +#define CL_PLATFORM_NOT_FOUND_KHR -1001 + +extern CL_API_ENTRY cl_int CL_API_CALL +clIcdGetPlatformIDsKHR(cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */); + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)( + cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */); + + +/* Extension: cl_khr_image2D_buffer + * + * This extension allows a 2D image to be created from a cl_mem buffer without a copy. + * The type associated with a 2D image created from a buffer in an OpenCL program is image2d_t. + * Both the sampler and sampler-less read_image built-in functions are supported for 2D images + * and 2D images created from a buffer. Similarly, the write_image built-ins are also supported + * for 2D images created from a buffer. + * + * When the 2D image from buffer is created, the client must specify the width, + * height, image format (i.e. channel order and channel data type) and optionally the row pitch + * + * The pitch specified must be a multiple of CL_DEVICE_IMAGE_PITCH_ALIGNMENT pixels. + * The base address of the buffer must be aligned to CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT pixels. + */ + +/************************************* + * cl_khr_initalize_memory extension * + *************************************/ + +#define CL_CONTEXT_MEMORY_INITIALIZE_KHR 0x200E + + +/************************************** + * cl_khr_terminate_context extension * + **************************************/ + +#define CL_DEVICE_TERMINATE_CAPABILITY_KHR 0x200F +#define CL_CONTEXT_TERMINATE_KHR 0x2010 + +#define cl_khr_terminate_context 1 +extern CL_API_ENTRY cl_int CL_API_CALL clTerminateContextKHR(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; + + +/* + * Extension: cl_khr_spir + * + * This extension adds support to create an OpenCL program object from a + * Standard Portable Intermediate Representation (SPIR) instance + */ + +/****************************************** +* cl_nv_device_attribute_query extension * +******************************************/ +/* cl_nv_device_attribute_query extension - no extension #define since it has no functions */ +#define CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV 0x4000 +#define CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV 0x4001 +#define CL_DEVICE_REGISTERS_PER_BLOCK_NV 0x4002 +#define CL_DEVICE_WARP_SIZE_NV 0x4003 +#define CL_DEVICE_GPU_OVERLAP_NV 0x4004 +#define CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV 0x4005 +#define CL_DEVICE_INTEGRATED_MEMORY_NV 0x4006 + + +/********************************* +* cl_amd_device_attribute_query * +*********************************/ +#define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD 0x4036 + +#ifdef CL_VERSION_1_1 + /*********************************** + * cl_ext_device_fission extension * + ***********************************/ + #define cl_ext_device_fission 1 + + extern CL_API_ENTRY cl_int CL_API_CALL + clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + (CL_API_CALL *clReleaseDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_int CL_API_CALL + clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + (CL_API_CALL *clRetainDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef cl_ulong cl_device_partition_property_ext; + extern CL_API_ENTRY cl_int CL_API_CALL + clCreateSubDevicesEXT( cl_device_id /*in_device*/, + const cl_device_partition_property_ext * /* properties */, + cl_uint /*num_entries*/, + cl_device_id * /*out_devices*/, + cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + ( CL_API_CALL * clCreateSubDevicesEXT_fn)( cl_device_id /*in_device*/, + const cl_device_partition_property_ext * /* properties */, + cl_uint /*num_entries*/, + cl_device_id * /*out_devices*/, + cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + /* cl_device_partition_property_ext */ + #define CL_DEVICE_PARTITION_EQUALLY_EXT 0x4050 + #define CL_DEVICE_PARTITION_BY_COUNTS_EXT 0x4051 + #define CL_DEVICE_PARTITION_BY_NAMES_EXT 0x4052 + #define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT 0x4053 + + /* clDeviceGetInfo selectors */ + #define CL_DEVICE_PARENT_DEVICE_EXT 0x4054 + #define CL_DEVICE_PARTITION_TYPES_EXT 0x4055 + #define CL_DEVICE_AFFINITY_DOMAINS_EXT 0x4056 + #define CL_DEVICE_REFERENCE_COUNT_EXT 0x4057 + #define CL_DEVICE_PARTITION_STYLE_EXT 0x4058 + + /* error codes */ + #define CL_DEVICE_PARTITION_FAILED_EXT -1057 + #define CL_INVALID_PARTITION_COUNT_EXT -1058 + #define CL_INVALID_PARTITION_NAME_EXT -1059 + + /* CL_AFFINITY_DOMAINs */ + #define CL_AFFINITY_DOMAIN_L1_CACHE_EXT 0x1 + #define CL_AFFINITY_DOMAIN_L2_CACHE_EXT 0x2 + #define CL_AFFINITY_DOMAIN_L3_CACHE_EXT 0x3 + #define CL_AFFINITY_DOMAIN_L4_CACHE_EXT 0x4 + #define CL_AFFINITY_DOMAIN_NUMA_EXT 0x10 + #define CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT 0x100 + + /* cl_device_partition_property_ext list terminators */ + #define CL_PROPERTIES_LIST_END_EXT ((cl_device_partition_property_ext) 0) + #define CL_PARTITION_BY_COUNTS_LIST_END_EXT ((cl_device_partition_property_ext) 0) + #define CL_PARTITION_BY_NAMES_LIST_END_EXT ((cl_device_partition_property_ext) 0 - 1) + + + +#endif /* CL_VERSION_1_1 */ + +#ifdef __cplusplus +} +#endif + + +#endif /* __CL_EXT_H */ diff --git a/Externals/CLRun/include/CL/cl_gl.h b/Externals/CLRun/include/CL/cl_gl.h index fcaa5bd392..af2036cc99 100644 --- a/Externals/CLRun/include/CL/cl_gl.h +++ b/Externals/CLRun/include/CL/cl_gl.h @@ -1,5 +1,5 @@ /********************************************************************************** - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008 - 2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,14 +21,6 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. **********************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ - -/* - * cl_gl.h contains Khronos-approved (KHR) OpenCL extensions which have - * OpenGL dependencies. The application is responsible for #including - * OpenGL or OpenGL ES headers before #including cl_gl.h. - */ - #ifndef __OPENCL_CL_GL_H #define __OPENCL_CL_GL_H @@ -36,7 +28,7 @@ #include #else #include -#endif +#endif #ifdef __cplusplus extern "C" { @@ -45,16 +37,23 @@ extern "C" { typedef cl_uint cl_gl_object_type; typedef cl_uint cl_gl_texture_info; typedef cl_uint cl_gl_platform_info; +typedef struct __GLsync *cl_GLsync; -/* cl_gl_object_type */ -#define CL_GL_OBJECT_BUFFER 0x2000 -#define CL_GL_OBJECT_TEXTURE2D 0x2001 -#define CL_GL_OBJECT_TEXTURE3D 0x2002 -#define CL_GL_OBJECT_RENDERBUFFER 0x2003 +/* cl_gl_object_type = 0x2000 - 0x200F enum values are currently taken */ +#define CL_GL_OBJECT_BUFFER 0x2000 +#define CL_GL_OBJECT_TEXTURE2D 0x2001 +#define CL_GL_OBJECT_TEXTURE3D 0x2002 +#define CL_GL_OBJECT_RENDERBUFFER 0x2003 +#define CL_GL_OBJECT_TEXTURE2D_ARRAY 0x200E +#define CL_GL_OBJECT_TEXTURE1D 0x200F +#define CL_GL_OBJECT_TEXTURE1D_ARRAY 0x2010 +#define CL_GL_OBJECT_TEXTURE_BUFFER 0x2011 + +/* cl_gl_texture_info */ +#define CL_GL_TEXTURE_TARGET 0x2004 +#define CL_GL_MIPMAP_LEVEL 0x2005 +#define CL_GL_NUM_SAMPLES 0x2012 -/* cl_gl_texture_info */ -#define CL_GL_TEXTURE_TARGET 0x2004 -#define CL_GL_MIPMAP_LEVEL 0x2005 extern CL_API_ENTRY cl_mem CL_API_CALL clCreateFromGLBuffer(cl_context /* context */, @@ -63,21 +62,13 @@ clCreateFromGLBuffer(cl_context /* context */, int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture2D(cl_context /* context */, - cl_mem_flags /* flags */, - cl_GLenum /* target */, - cl_GLint /* miplevel */, - cl_GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture3D(cl_context /* context */, - cl_mem_flags /* flags */, - cl_GLenum /* target */, - cl_GLint /* miplevel */, - cl_GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - +clCreateFromGLTexture(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_mem CL_API_CALL clCreateFromGLRenderbuffer(cl_context /* context */, cl_mem_flags /* flags */, @@ -87,8 +78,8 @@ clCreateFromGLRenderbuffer(cl_context /* context */, extern CL_API_ENTRY cl_int CL_API_CALL clGetGLObjectInfo(cl_mem /* memobj */, cl_gl_object_type * /* gl_object_type */, - cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; - + cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; + extern CL_API_ENTRY cl_int CL_API_CALL clGetGLTextureInfo(cl_mem /* memobj */, cl_gl_texture_info /* param_name */, @@ -112,33 +103,51 @@ clEnqueueReleaseGLObjects(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +// Deprecated OpenCL 1.1 APIs +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateFromGLTexture2D(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateFromGLTexture3D(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + /* cl_khr_gl_sharing extension */ - + #define cl_khr_gl_sharing 1 - + typedef cl_uint cl_gl_context_info; - + /* Additional Error Codes */ #define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000 - + /* cl_gl_context_info */ #define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006 #define CL_DEVICES_FOR_GL_CONTEXT_KHR 0x2007 - + /* Additional cl_context_properties */ #define CL_GL_CONTEXT_KHR 0x2008 #define CL_EGL_DISPLAY_KHR 0x2009 #define CL_GLX_DISPLAY_KHR 0x200A #define CL_WGL_HDC_KHR 0x200B #define CL_CGL_SHAREGROUP_KHR 0x200C - + extern CL_API_ENTRY cl_int CL_API_CALL clGetGLContextInfoKHR(const cl_context_properties * /* properties */, cl_gl_context_info /* param_name */, size_t /* param_value_size */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - + typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( const cl_context_properties * properties, cl_gl_context_info param_name, @@ -150,4 +159,4 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( } #endif -#endif /* __OPENCL_CL_GL_H */ +#endif /* __OPENCL_CL_GL_H */ diff --git a/Externals/CLRun/include/CL/cl_gl_ext.h b/Externals/CLRun/include/CL/cl_gl_ext.h new file mode 100644 index 0000000000..77d53536f6 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_gl_ext.h @@ -0,0 +1,69 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have */ +/* OpenGL dependencies. */ + +#ifndef __OPENCL_CL_GL_EXT_H +#define __OPENCL_CL_GL_EXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __APPLE__ + #include +#else + #include +#endif + +/* + * For each extension, follow this template + * cl_VEN_extname extension */ +/* #define cl_VEN_extname 1 + * ... define new types, if any + * ... define new tokens, if any + * ... define new APIs, if any + * + * If you need GLtypes here, mirror them with a cl_GLtype, rather than including a GL header + * This allows us to avoid having to decide whether to include GL headers or GLES here. + */ + +/* + * cl_khr_gl_event extension + * See section 9.9 in the OpenCL 1.1 spec for more information + */ +#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D + +extern CL_API_ENTRY cl_event CL_API_CALL +clCreateEventFromGLsyncKHR(cl_context /* context */, + cl_GLsync /* cl_GLsync */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; + +#ifdef __cplusplus +} +#endif + +#endif /* __OPENCL_CL_GL_EXT_H */ diff --git a/Externals/CLRun/include/CL/cl_platform.h b/Externals/CLRun/include/CL/cl_platform.h index 8fdcb17341..cf2b7210ac 100644 --- a/Externals/CLRun/include/CL/cl_platform.h +++ b/Externals/CLRun/include/CL/cl_platform.h @@ -1,5 +1,5 @@ /********************************************************************************** - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008-2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,7 +21,7 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. **********************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ +/* $Revision: 11803 $ on $Date: 2010-06-25 10:02:12 -0700 (Fri, 25 Jun 2010) $ */ #ifndef __CL_PLATFORM_H #define __CL_PLATFORM_H @@ -36,21 +36,85 @@ extern "C" { #endif #if defined(_WIN32) -#define CL_API_ENTRY -#define CL_API_CALL __stdcall + #define CL_API_ENTRY + #define CL_API_CALL __stdcall + #define CL_CALLBACK __stdcall #else -#define CL_API_ENTRY -#define CL_API_CALL + #define CL_API_ENTRY + #define CL_API_CALL + #define CL_CALLBACK #endif #ifdef __APPLE__ -#define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER -#define CL_API_SUFFIX__VERSION_1_1 -#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) + #define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) + #define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7 + + #ifdef AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_8 + #else + #warning This path should never happen outside of internal operating system development. AvailabilityMacros do not function correctly here! + #define CL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #endif #else -#define CL_API_SUFFIX__VERSION_1_0 -#define CL_API_SUFFIX__VERSION_1_1 -#define CL_EXTENSION_WEAK_LINK + #define CL_EXTENSION_WEAK_LINK + #define CL_API_SUFFIX__VERSION_1_0 + #define CL_EXT_SUFFIX__VERSION_1_0 + #define CL_API_SUFFIX__VERSION_1_1 + #define CL_EXT_SUFFIX__VERSION_1_1 + #define CL_API_SUFFIX__VERSION_1_2 + #define CL_EXT_SUFFIX__VERSION_1_2 + + #ifdef __GNUC__ + #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated)) + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated)) + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #endif + #elif _WIN32 + #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated) + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated) + #endif + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #endif #endif #if (defined (_WIN32) && defined(_MSC_VER)) @@ -108,14 +172,40 @@ typedef double cl_double; #define CL_DBL_MIN 2.225073858507201383090e-308 #define CL_DBL_EPSILON 2.220446049250313080847e-16 +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + #define CL_NAN (CL_INFINITY - CL_INFINITY) #define CL_HUGE_VALF ((cl_float) 1e50) #define CL_HUGE_VAL ((cl_double) 1e500) #define CL_MAXFLOAT CL_FLT_MAX #define CL_INFINITY CL_HUGE_VALF -#define CL_CALLBACK __stdcall - #else #include @@ -173,6 +263,34 @@ typedef double cl_double __attribute__((aligned(8))); #define CL_DBL_MIN 0x1.0p-1022 #define CL_DBL_EPSILON 0x1.0p-52 +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + #if defined( __GNUC__ ) #define CL_HUGE_VALF __builtin_huge_valf() #define CL_HUGE_VAL __builtin_huge_val() @@ -186,13 +304,11 @@ typedef double cl_double __attribute__((aligned(8))); #define CL_MAXFLOAT CL_FLT_MAX #define CL_INFINITY CL_HUGE_VALF -#define CL_CALLBACK - #endif #include -/* Mirror types to GL types. Mirror types allow us to avoid deciding which headers to load based on whether we are using GL or GLES here. */ +/* Mirror types to GL types. Mirror types allow us to avoid deciding which 87s to load based on whether we are using GL or GLES here. */ typedef unsigned int cl_GLuint; typedef int cl_GLint; typedef unsigned int cl_GLenum; @@ -389,6 +505,9 @@ typedef union #endif }cl_char4; +/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */ +typedef cl_char4 cl_char3; + typedef union { cl_char CL_ALIGNED(8) s[8]; @@ -461,6 +580,9 @@ typedef union #endif }cl_uchar4; +/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */ +typedef cl_uchar4 cl_uchar3; + typedef union { cl_uchar CL_ALIGNED(8) s[8]; @@ -533,6 +655,9 @@ typedef union #endif }cl_short4; +/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */ +typedef cl_short4 cl_short3; + typedef union { cl_short CL_ALIGNED(16) s[8]; @@ -605,6 +730,9 @@ typedef union #endif }cl_ushort4; +/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */ +typedef cl_ushort4 cl_ushort3; + typedef union { cl_ushort CL_ALIGNED(16) s[8]; @@ -676,6 +804,9 @@ typedef union #endif }cl_int4; +/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */ +typedef cl_int4 cl_int3; + typedef union { cl_int CL_ALIGNED(32) s[8]; @@ -748,6 +879,9 @@ typedef union #endif }cl_uint4; +/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */ +typedef cl_uint4 cl_uint3; + typedef union { cl_uint CL_ALIGNED(32) s[8]; @@ -819,6 +953,9 @@ typedef union #endif }cl_long4; +/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */ +typedef cl_long4 cl_long3; + typedef union { cl_long CL_ALIGNED(64) s[8]; @@ -891,6 +1028,9 @@ typedef union #endif }cl_ulong4; +/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */ +typedef cl_ulong4 cl_ulong3; + typedef union { cl_ulong CL_ALIGNED(64) s[8]; @@ -964,6 +1104,9 @@ typedef union #endif }cl_float4; +/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */ +typedef cl_float4 cl_float3; + typedef union { cl_float CL_ALIGNED(32) s[8]; @@ -1036,6 +1179,9 @@ typedef union #endif }cl_double4; +/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */ +typedef cl_double4 cl_double3; + typedef union { cl_double CL_ALIGNED(64) s[8]; @@ -1077,6 +1223,29 @@ typedef union #endif }cl_double16; +/* Macro to facilitate debugging + * Usage: + * Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. + * The first line ends with: CL_PROGRAM_STRING_DEBUG_INFO \" + * Each line thereafter of OpenCL C source must end with: \n\ + * The last line ends in "; + * + * Example: + * + * const char *my_program = CL_PROGRAM_STRING_DEBUG_INFO "\ + * kernel void foo( int a, float * b ) \n\ + * { \n\ + * // my comment \n\ + * *b[ get_global_id(0)] = a; \n\ + * } \n\ + * "; + * + * This should correctly set up the line, (column) and file information for your source + * string so you can do source level debugging. + */ +#define __CL_STRINGIFY( _x ) # _x +#define _CL_STRINGIFY( _x ) __CL_STRINGIFY( _x ) +#define CL_PROGRAM_STRING_DEBUG_INFO "#line " _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n" #ifdef __cplusplus } diff --git a/Externals/OpenAL/Win32/EFX-Util.lib b/Externals/OpenAL/Win32/EFX-Util.lib new file mode 100644 index 0000000000..94ab9c817a Binary files /dev/null and b/Externals/OpenAL/Win32/EFX-Util.lib differ diff --git a/Externals/OpenAL/Win32/OpenAL32.dll b/Externals/OpenAL/Win32/OpenAL32.dll new file mode 100644 index 0000000000..b63bb2f301 Binary files /dev/null and b/Externals/OpenAL/Win32/OpenAL32.dll differ diff --git a/Externals/OpenAL/Win32/OpenAL32.lib b/Externals/OpenAL/Win32/OpenAL32.lib new file mode 100644 index 0000000000..d635de97ef Binary files /dev/null and b/Externals/OpenAL/Win32/OpenAL32.lib differ diff --git a/Externals/OpenAL/Win32/soft_oal.dll b/Externals/OpenAL/Win32/soft_oal.dll new file mode 100644 index 0000000000..71ced6a21f Binary files /dev/null and b/Externals/OpenAL/Win32/soft_oal.dll differ diff --git a/Externals/OpenAL/Win32/wrap_oal.dll b/Externals/OpenAL/Win32/wrap_oal.dll new file mode 100644 index 0000000000..9752892aab Binary files /dev/null and b/Externals/OpenAL/Win32/wrap_oal.dll differ diff --git a/Externals/OpenAL/Win64/EFX-Util.lib b/Externals/OpenAL/Win64/EFX-Util.lib new file mode 100644 index 0000000000..5c5e98177a Binary files /dev/null and b/Externals/OpenAL/Win64/EFX-Util.lib differ diff --git a/Externals/OpenAL/Win64/OpenAL32.dll b/Externals/OpenAL/Win64/OpenAL32.dll new file mode 100644 index 0000000000..f36943df40 Binary files /dev/null and b/Externals/OpenAL/Win64/OpenAL32.dll differ diff --git a/Externals/OpenAL/Win64/OpenAL32.lib b/Externals/OpenAL/Win64/OpenAL32.lib new file mode 100644 index 0000000000..17663e0a38 Binary files /dev/null and b/Externals/OpenAL/Win64/OpenAL32.lib differ diff --git a/Externals/OpenAL/Win64/soft_oal.dll b/Externals/OpenAL/Win64/soft_oal.dll new file mode 100644 index 0000000000..b47ff952b7 Binary files /dev/null and b/Externals/OpenAL/Win64/soft_oal.dll differ diff --git a/Externals/OpenAL/Win64/wrap_oal.dll b/Externals/OpenAL/Win64/wrap_oal.dll new file mode 100644 index 0000000000..1ab0365711 Binary files /dev/null and b/Externals/OpenAL/Win64/wrap_oal.dll differ diff --git a/Externals/OpenAL/include/EFX-Util.h b/Externals/OpenAL/include/EFX-Util.h new file mode 100644 index 0000000000..b4a6b4e2d8 --- /dev/null +++ b/Externals/OpenAL/include/EFX-Util.h @@ -0,0 +1,422 @@ +/*******************************************************************\ +* * +* EFX-UTIL.H - EFX Utilities functions and Reverb Presets * +* * +* File revision 1.0 * +* * +\*******************************************************************/ + +#ifndef EAXVECTOR_DEFINED +#define EAXVECTOR_DEFINED +typedef struct _EAXVECTOR { + float x; + float y; + float z; +} EAXVECTOR; +#endif + +#ifndef EAXREVERBPROPERTIES_DEFINED +#define EAXREVERBPROPERTIES_DEFINED +typedef struct _EAXREVERBPROPERTIES +{ + unsigned long ulEnvironment; + float flEnvironmentSize; + float flEnvironmentDiffusion; + long lRoom; + long lRoomHF; + long lRoomLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + long lReflections; + float flReflectionsDelay; + EAXVECTOR vReflectionsPan; + long lReverb; + float flReverbDelay; + EAXVECTOR vReverbPan; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + unsigned long ulFlags; +} EAXREVERBPROPERTIES, *LPEAXREVERBPROPERTIES; +#endif + +#ifndef EFXEAXREVERBPROPERTIES_DEFINED +#define EFXEAXREVERBPROPERTIES_DEFINED +typedef struct +{ + float flDensity; + float flDiffusion; + float flGain; + float flGainHF; + float flGainLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + float flReflectionsGain; + float flReflectionsDelay; + float flReflectionsPan[3]; + float flLateReverbGain; + float flLateReverbDelay; + float flLateReverbPan[3]; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionGainHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + int iDecayHFLimit; +} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES; +#endif + +#ifndef EAXOBSTRUCTIONPROPERTIES_DEFINED +#define EAXOBSTRUCTIONPROPERTIES_DEFINED +typedef struct _EAXOBSTRUCTIONPROPERTIES +{ + long lObstruction; + float flObstructionLFRatio; +} EAXOBSTRUCTIONPROPERTIES, *LPEAXOBSTRUCTIONPROPERTIES; +#endif + +#ifndef EAXOCCLUSIONPROPERTIES_DEFINED +#define EAXOCCLUSIONPROPERTIES_DEFINED +typedef struct _EAXOCCLUSIONPROPERTIES +{ + long lOcclusion; + float flOcclusionLFRatio; + float flOcclusionRoomRatio; + float flOcclusionDirectRatio; +} EAXOCCLUSIONPROPERTIES, *LPEAXOCCLUSIONPROPERTIES; +#endif + +#ifndef EAXEXCLUSIONPROPERTIES_DEFINED +#define EAXEXCLUSIONPROPERTIES_DEFINED +typedef struct _EAXEXCLUSIONPROPERTIES +{ + long lExclusion; + float flExclusionLFRatio; +} EAXEXCLUSIONPROPERTIES, *LPEAXEXCLUSIONPROPERTIES; +#endif + +#ifndef EFXLOWPASSFILTER_DEFINED +#define EFXLOWPASSFILTER_DEFINED +typedef struct _EFXLOWPASSFILTER +{ + float flGain; + float flGainHF; +} EFXLOWPASSFILTER, *LPEFXLOWPASSFILTER; +#endif + +void ConvertReverbParameters(EAXREVERBPROPERTIES *pEAXProp, EFXEAXREVERBPROPERTIES *pEFXEAXReverb); +void ConvertObstructionParameters(EAXOBSTRUCTIONPROPERTIES *pObProp, EFXLOWPASSFILTER *pDirectLowPassFilter); +void ConvertExclusionParameters(EAXEXCLUSIONPROPERTIES *pExProp, EFXLOWPASSFILTER *pSendLowPassFilter); +void ConvertOcclusionParameters(EAXOCCLUSIONPROPERTIES *pOcProp, EFXLOWPASSFILTER *pDirectLowPassFilter, EFXLOWPASSFILTER *pSendLowPassFilter); + + +/***********************************************************************************************\ +* +* EAX Reverb Presets in legacy format - use ConvertReverbParameters() to convert to +* EFX EAX Reverb Presets for use with the OpenAL Effects Extension. +* +************************************************************************************************/ + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_GENERIC \ + {0, 7.5f, 1.000f, -1000, -100, 0, 1.49f, 0.83f, 1.00f, -2602, 0.007f, 0.00f,0.00f,0.00f, 200, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PADDEDCELL \ + {1, 1.4f, 1.000f, -1000, -6000, 0, 0.17f, 0.10f, 1.00f, -1204, 0.001f, 0.00f,0.00f,0.00f, 207, 0.002f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_ROOM \ + {2, 1.9f, 1.000f, -1000, -454, 0, 0.40f, 0.83f, 1.00f, -1646, 0.002f, 0.00f,0.00f,0.00f, 53, 0.003f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_BATHROOM \ + {3, 1.4f, 1.000f, -1000, -1200, 0, 1.49f, 0.54f, 1.00f, -370, 0.007f, 0.00f,0.00f,0.00f, 1030, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_LIVINGROOM \ + {4, 2.5f, 1.000f, -1000, -6000, 0, 0.50f, 0.10f, 1.00f, -1376, 0.003f, 0.00f,0.00f,0.00f, -1104, 0.004f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_STONEROOM \ + {5, 11.6f, 1.000f, -1000, -300, 0, 2.31f, 0.64f, 1.00f, -711, 0.012f, 0.00f,0.00f,0.00f, 83, 0.017f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_AUDITORIUM \ + {6, 21.6f, 1.000f, -1000, -476, 0, 4.32f, 0.59f, 1.00f, -789, 0.020f, 0.00f,0.00f,0.00f, -289, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CONCERTHALL \ + {7, 19.6f, 1.000f, -1000, -500, 0, 3.92f, 0.70f, 1.00f, -1230, 0.020f, 0.00f,0.00f,0.00f, -02, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CAVE \ + {8, 14.6f, 1.000f, -1000, 0, 0, 2.91f, 1.30f, 1.00f, -602, 0.015f, 0.00f,0.00f,0.00f, -302, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_ARENA \ + {9, 36.2f, 1.000f, -1000, -698, 0, 7.24f, 0.33f, 1.00f, -1166, 0.020f, 0.00f,0.00f,0.00f, 16, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_HANGAR \ + {10, 50.3f, 1.000f, -1000, -1000, 0, 10.05f, 0.23f, 1.00f, -602, 0.020f, 0.00f,0.00f,0.00f, 198, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CARPETTEDHALLWAY \ + {11, 1.9f, 1.000f, -1000, -4000, 0, 0.30f, 0.10f, 1.00f, -1831, 0.002f, 0.00f,0.00f,0.00f, -1630, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_HALLWAY \ + {12, 1.8f, 1.000f, -1000, -300, 0, 1.49f, 0.59f, 1.00f, -1219, 0.007f, 0.00f,0.00f,0.00f, 441, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_STONECORRIDOR \ + {13, 13.5f, 1.000f, -1000, -237, 0, 2.70f, 0.79f, 1.00f, -1214, 0.013f, 0.00f,0.00f,0.00f, 395, 0.020f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_ALLEY \ + {14, 7.5f, 0.300f, -1000, -270, 0, 1.49f, 0.86f, 1.00f, -1204, 0.007f, 0.00f,0.00f,0.00f, -4, 0.011f, 0.00f,0.00f,0.00f, 0.125f, 0.950f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_FOREST \ + {15, 38.0f, 0.300f, -1000, -3300, 0, 1.49f, 0.54f, 1.00f, -2560, 0.162f, 0.00f,0.00f,0.00f, -229, 0.088f, 0.00f,0.00f,0.00f, 0.125f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CITY \ + {16, 7.5f, 0.500f, -1000, -800, 0, 1.49f, 0.67f, 1.00f, -2273, 0.007f, 0.00f,0.00f,0.00f, -1691, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_MOUNTAINS \ + {17, 100.0f, 0.270f, -1000, -2500, 0, 1.49f, 0.21f, 1.00f, -2780, 0.300f, 0.00f,0.00f,0.00f, -1434, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_QUARRY \ + {18, 17.5f, 1.000f, -1000, -1000, 0, 1.49f, 0.83f, 1.00f, -10000, 0.061f, 0.00f,0.00f,0.00f, 500, 0.025f, 0.00f,0.00f,0.00f, 0.125f, 0.700f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PLAIN \ + {19, 42.5f, 0.210f, -1000, -2000, 0, 1.49f, 0.50f, 1.00f, -2466, 0.179f, 0.00f,0.00f,0.00f, -1926, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PARKINGLOT \ + {20, 8.3f, 1.000f, -1000, 0, 0, 1.65f, 1.50f, 1.00f, -1363, 0.008f, 0.00f,0.00f,0.00f, -1153, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_SEWERPIPE \ + {21, 1.7f, 0.800f, -1000, -1000, 0, 2.81f, 0.14f, 1.00f, 429, 0.014f, 0.00f,0.00f,0.00f, 1023, 0.021f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_UNDERWATER \ + {22, 1.8f, 1.000f, -1000, -4000, 0, 1.49f, 0.10f, 1.00f, -449, 0.007f, 0.00f,0.00f,0.00f, 1700, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 1.180f, 0.348f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_DRUGGED \ + {23, 1.9f, 0.500f, -1000, 0, 0, 8.39f, 1.39f, 1.00f, -115, 0.002f, 0.00f,0.00f,0.00f, 985, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DIZZY \ + {24, 1.8f, 0.600f, -1000, -400, 0, 17.23f, 0.56f, 1.00f, -1713, 0.020f, 0.00f,0.00f,0.00f, -613, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.810f, 0.310f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_PSYCHOTIC \ + {25, 1.0f, 0.500f, -1000, -151, 0, 7.56f, 0.91f, 1.00f, -626, 0.020f, 0.00f,0.00f,0.00f, 774, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 4.000f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } + + +// CASTLE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_CASTLE_SMALLROOM \ + { 26, 8.3f, 0.890f, -1000, -800, -2000, 1.22f, 0.83f, 0.31f, -100, 0.022f, 0.00f,0.00f,0.00f, 600, 0.011f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_SHORTPASSAGE \ + { 26, 8.3f, 0.890f, -1000, -1000, -2000, 2.32f, 0.83f, 0.31f, -100, 0.007f, 0.00f,0.00f,0.00f, 200, 0.023f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_MEDIUMROOM \ + { 26, 8.3f, 0.930f, -1000, -1100, -2000, 2.04f, 0.83f, 0.46f, -400, 0.022f, 0.00f,0.00f,0.00f, 400, 0.011f, 0.00f,0.00f,0.00f, 0.155f, 0.030f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_LONGPASSAGE \ + { 26, 8.3f, 0.890f, -1000, -800, -2000, 3.42f, 0.83f, 0.31f, -100, 0.007f, 0.00f,0.00f,0.00f, 300, 0.023f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_LARGEROOM \ + { 26, 8.3f, 0.820f, -1000, -1100, -1800, 2.53f, 0.83f, 0.50f, -700, 0.034f, 0.00f,0.00f,0.00f, 200, 0.016f, 0.00f,0.00f,0.00f, 0.185f, 0.070f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_HALL \ + { 26, 8.3f, 0.810f, -1000, -1100, -1500, 3.14f, 0.79f, 0.62f, -1500, 0.056f, 0.00f,0.00f,0.00f, 100, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_CUPBOARD \ + { 26, 8.3f, 0.890f, -1000, -1100, -2000, 0.67f, 0.87f, 0.31f, 300, 0.010f, 0.00f,0.00f,0.00f, 1100, 0.007f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_COURTYARD \ + { 26, 8.3f, 0.420f, -1000, -700, -1400, 2.13f, 0.61f, 0.23f, -1300, 0.160f, 0.00f,0.00f,0.00f, -300, 0.036f, 0.00f,0.00f,0.00f, 0.250f, 0.370f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_CASTLE_ALCOVE \ + { 26, 8.3f, 0.890f, -1000, -600, -2000, 1.64f, 0.87f, 0.31f, 00, 0.007f, 0.00f,0.00f,0.00f, 300, 0.034f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } + + +// FACTORY PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_FACTORY_ALCOVE \ + { 26, 1.8f, 0.590f, -1200, -200, -600, 3.14f, 0.65f, 1.31f, 300, 0.010f, 0.00f,0.00f,0.00f, 000, 0.038f, 0.00f,0.00f,0.00f, 0.114f, 0.100f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_SHORTPASSAGE \ + { 26, 1.8f, 0.640f, -1200, -200, -600, 2.53f, 0.65f, 1.31f, 0, 0.010f, 0.00f,0.00f,0.00f, 200, 0.038f, 0.00f,0.00f,0.00f, 0.135f, 0.230f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_MEDIUMROOM \ + { 26, 1.9f, 0.820f, -1200, -200, -600, 2.76f, 0.65f, 1.31f, -1100, 0.022f, 0.00f,0.00f,0.00f, 300, 0.023f, 0.00f,0.00f,0.00f, 0.174f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_LONGPASSAGE \ + { 26, 1.8f, 0.640f, -1200, -200, -600, 4.06f, 0.65f, 1.31f, 0, 0.020f, 0.00f,0.00f,0.00f, 200, 0.037f, 0.00f,0.00f,0.00f, 0.135f, 0.230f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_LARGEROOM \ + { 26, 1.9f, 0.750f, -1200, -300, -400, 4.24f, 0.51f, 1.31f, -1500, 0.039f, 0.00f,0.00f,0.00f, 100, 0.023f, 0.00f,0.00f,0.00f, 0.231f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_HALL \ + { 26, 1.9f, 0.750f, -1000, -300, -400, 7.43f, 0.51f, 1.31f, -2400, 0.073f, 0.00f,0.00f,0.00f, -100, 0.027f, 0.00f,0.00f,0.00f, 0.250f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_CUPBOARD \ + { 26, 1.7f, 0.630f, -1200, -200, -600, 0.49f, 0.65f, 1.31f, 200, 0.010f, 0.00f,0.00f,0.00f, 600, 0.032f, 0.00f,0.00f,0.00f, 0.107f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_COURTYARD \ + { 26, 1.7f, 0.570f, -1000, -1000, -400, 2.32f, 0.29f, 0.56f, -1300, 0.140f, 0.00f,0.00f,0.00f, -800, 0.039f, 0.00f,0.00f,0.00f, 0.250f, 0.290f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_SMALLROOM \ + { 26, 1.8f, 0.820f, -1000, -200, -600, 1.72f, 0.65f, 1.31f, -300, 0.010f, 0.00f,0.00f,0.00f, 500, 0.024f, 0.00f,0.00f,0.00f, 0.119f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } + + +// ICE PALACE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_ICEPALACE_ALCOVE \ + { 26, 2.7f, 0.840f, -1000, -500, -1100, 2.76f, 1.46f, 0.28f, 100, 0.010f, 0.00f,0.00f,0.00f, -100, 0.030f, 0.00f,0.00f,0.00f, 0.161f, 0.090f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_SHORTPASSAGE \ + { 26, 2.7f, 0.750f, -1000, -500, -1100, 1.79f, 1.46f, 0.28f, -600, 0.010f, 0.00f,0.00f,0.00f, 100, 0.019f, 0.00f,0.00f,0.00f, 0.177f, 0.090f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_MEDIUMROOM \ + { 26, 2.7f, 0.870f, -1000, -500, -700, 2.22f, 1.53f, 0.32f, -800, 0.039f, 0.00f,0.00f,0.00f, 100, 0.027f, 0.00f,0.00f,0.00f, 0.186f, 0.120f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_LONGPASSAGE \ + { 26, 2.7f, 0.770f, -1000, -500, -800, 3.01f, 1.46f, 0.28f, -200, 0.012f, 0.00f,0.00f,0.00f, 200, 0.025f, 0.00f,0.00f,0.00f, 0.186f, 0.040f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_LARGEROOM \ + { 26, 2.9f, 0.810f, -1000, -500, -700, 3.14f, 1.53f, 0.32f, -1200, 0.039f, 0.00f,0.00f,0.00f, 000, 0.027f, 0.00f,0.00f,0.00f, 0.214f, 0.110f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_HALL \ + { 26, 2.9f, 0.760f, -1000, -700, -500, 5.49f, 1.53f, 0.38f, -1900, 0.054f, 0.00f,0.00f,0.00f, -400, 0.052f, 0.00f,0.00f,0.00f, 0.226f, 0.110f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_CUPBOARD \ + { 26, 2.7f, 0.830f, -1000, -600, -1300, 0.76f, 1.53f, 0.26f, 100, 0.012f, 0.00f,0.00f,0.00f, 600, 0.016f, 0.00f,0.00f,0.00f, 0.143f, 0.080f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_COURTYARD \ + { 26, 2.9f, 0.590f, -1000, -1100, -1000, 2.04f, 1.20f, 0.38f, -1000, 0.173f, 0.00f,0.00f,0.00f, -1000, 0.043f, 0.00f,0.00f,0.00f, 0.235f, 0.480f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_SMALLROOM \ + { 26, 2.7f, 0.840f, -1000, -500, -1100, 1.51f, 1.53f, 0.27f, -100, 0.010f, 0.00f,0.00f,0.00f, 300, 0.011f, 0.00f,0.00f,0.00f, 0.164f, 0.140f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } + + +// SPACE STATION PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_SPACESTATION_ALCOVE \ + { 26, 1.5f, 0.780f, -1000, -300, -100, 1.16f, 0.81f, 0.55f, 300, 0.007f, 0.00f,0.00f,0.00f, 000, 0.018f, 0.00f,0.00f,0.00f, 0.192f, 0.210f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_MEDIUMROOM \ + { 26, 1.5f, 0.750f, -1000, -400, -100, 3.01f, 0.50f, 0.55f, -800, 0.034f, 0.00f,0.00f,0.00f, 100, 0.035f, 0.00f,0.00f,0.00f, 0.209f, 0.310f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_SHORTPASSAGE \ + { 26, 1.5f, 0.870f, -1000, -400, -100, 3.57f, 0.50f, 0.55f, 0, 0.012f, 0.00f,0.00f,0.00f, 100, 0.016f, 0.00f,0.00f,0.00f, 0.172f, 0.200f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_LONGPASSAGE \ + { 26, 1.9f, 0.820f, -1000, -400, -100, 4.62f, 0.62f, 0.55f, 0, 0.012f, 0.00f,0.00f,0.00f, 200, 0.031f, 0.00f,0.00f,0.00f, 0.250f, 0.230f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_LARGEROOM \ + { 26, 1.8f, 0.810f, -1000, -400, -100, 3.89f, 0.38f, 0.61f, -1000, 0.056f, 0.00f,0.00f,0.00f, -100, 0.035f, 0.00f,0.00f,0.00f, 0.233f, 0.280f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_HALL \ + { 26, 1.9f, 0.870f, -1000, -400, -100, 7.11f, 0.38f, 0.61f, -1500, 0.100f, 0.00f,0.00f,0.00f, -400, 0.047f, 0.00f,0.00f,0.00f, 0.250f, 0.250f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_CUPBOARD \ + { 26, 1.4f, 0.560f, -1000, -300, -100, 0.79f, 0.81f, 0.55f, 300, 0.007f, 0.00f,0.00f,0.00f, 500, 0.018f, 0.00f,0.00f,0.00f, 0.181f, 0.310f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_SMALLROOM \ + { 26, 1.5f, 0.700f, -1000, -300, -100, 1.72f, 0.82f, 0.55f, -200, 0.007f, 0.00f,0.00f,0.00f, 300, 0.013f, 0.00f,0.00f,0.00f, 0.188f, 0.260f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } + + +// WOODEN GALLEON PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_WOODEN_ALCOVE \ + { 26, 7.5f, 1.000f, -1000, -1800, -1000, 1.22f, 0.62f, 0.91f, 100, 0.012f, 0.00f,0.00f,0.00f, -300, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_SHORTPASSAGE \ + { 26, 7.5f, 1.000f, -1000, -1800, -1000, 1.75f, 0.50f, 0.87f, -100, 0.012f, 0.00f,0.00f,0.00f, -400, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_MEDIUMROOM \ + { 26, 7.5f, 1.000f, -1000, -2000, -1100, 1.47f, 0.42f, 0.82f, -100, 0.049f, 0.00f,0.00f,0.00f, -100, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_LONGPASSAGE \ + { 26, 7.5f, 1.000f, -1000, -2000, -1000, 1.99f, 0.40f, 0.79f, 000, 0.020f, 0.00f,0.00f,0.00f, -700, 0.036f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_LARGEROOM \ + { 26, 7.5f, 1.000f, -1000, -2100, -1100, 2.65f, 0.33f, 0.82f, -100, 0.066f, 0.00f,0.00f,0.00f, -200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_HALL \ + { 26, 7.5f, 1.000f, -1000, -2200, -1100, 3.45f, 0.30f, 0.82f, -100, 0.088f, 0.00f,0.00f,0.00f, -200, 0.063f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_CUPBOARD \ + { 26, 7.5f, 1.000f, -1000, -1700, -1000, 0.56f, 0.46f, 0.91f, 100, 0.012f, 0.00f,0.00f,0.00f, 100, 0.028f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_SMALLROOM \ + { 26, 7.5f, 1.000f, -1000, -1900, -1000, 0.79f, 0.32f, 0.87f, 00, 0.032f, 0.00f,0.00f,0.00f, -100, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_COURTYARD \ + { 26, 7.5f, 0.650f, -1000, -2200, -1000, 1.79f, 0.35f, 0.79f, -500, 0.123f, 0.00f,0.00f,0.00f, -2000, 0.032f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } + + +// SPORTS PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_SPORT_EMPTYSTADIUM \ + { 26, 7.2f, 1.000f, -1000, -700, -200, 6.26f, 0.51f, 1.10f, -2400, 0.183f, 0.00f,0.00f,0.00f, -800, 0.038f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_SQUASHCOURT \ + { 26, 7.5f, 0.750f, -1000, -1000, -200, 2.22f, 0.91f, 1.16f, -700, 0.007f, 0.00f,0.00f,0.00f, -200, 0.011f, 0.00f,0.00f,0.00f, 0.126f, 0.190f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \ + { 26, 36.2f, 0.700f, -1000, -200, -100, 2.76f, 1.25f, 1.14f, -400, 0.020f, 0.00f,0.00f,0.00f, -200, 0.030f, 0.00f,0.00f,0.00f, 0.179f, 0.150f, 0.895f, 0.190f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_SPORT_LARGESWIMMINGPOOL\ + { 26, 36.2f, 0.820f, -1000, -200, 0, 5.49f, 1.31f, 1.14f, -700, 0.039f, 0.00f,0.00f,0.00f, -600, 0.049f, 0.00f,0.00f,0.00f, 0.222f, 0.550f, 1.159f, 0.210f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_SPORT_GYMNASIUM \ + { 26, 7.5f, 0.810f, -1000, -700, -100, 3.14f, 1.06f, 1.35f, -800, 0.029f, 0.00f,0.00f,0.00f, -500, 0.045f, 0.00f,0.00f,0.00f, 0.146f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_FULLSTADIUM \ + { 26, 7.2f, 1.000f, -1000, -2300, -200, 5.25f, 0.17f, 0.80f, -2000, 0.188f, 0.00f,0.00f,0.00f, -1100, 0.038f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_STADIUMTANNOY \ + { 26, 3.0f, 0.780f, -1000, -500, -600, 2.53f, 0.88f, 0.68f, -1100, 0.230f, 0.00f,0.00f,0.00f, -600, 0.063f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } + + +// PREFAB PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_PREFAB_WORKSHOP \ + { 26, 1.9f, 1.000f, -1000, -1700, -800, 0.76f, 1.00f, 1.00f, 0, 0.012f, 0.00f,0.00f,0.00f, 100, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PREFAB_SCHOOLROOM \ + { 26, 1.86f, 0.690f, -1000, -400, -600, 0.98f, 0.45f, 0.18f, 300, 0.017f, 0.00f,0.00f,0.00f, 300, 0.015f, 0.00f,0.00f,0.00f, 0.095f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_PREFAB_PRACTISEROOM \ + { 26, 1.86f, 0.870f, -1000, -800, -600, 1.12f, 0.56f, 0.18f, 200, 0.010f, 0.00f,0.00f,0.00f, 300, 0.011f, 0.00f,0.00f,0.00f, 0.095f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_PREFAB_OUTHOUSE \ + { 26, 80.3f, 0.820f, -1000, -1900, -1600, 1.38f, 0.38f, 0.35f, -100, 0.024f, 0.00f,0.00f,-0.00f, -400, 0.044f, 0.00f,0.00f,0.00f, 0.121f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_PREFAB_CARAVAN \ + { 26, 8.3f, 1.000f, -1000, -2100, -1800, 0.43f, 1.50f, 1.00f, 0, 0.012f, 0.00f,0.00f,0.00f, 600, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } + // for US developers, a caravan is the same as a trailer =o) + + +// DOME AND PIPE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DOME_TOMB \ + { 26, 51.8f, 0.790f, -1000, -900, -1300, 4.18f, 0.21f, 0.10f, -825, 0.030f, 0.00f,0.00f,0.00f, 450, 0.022f, 0.00f,0.00f,0.00f, 0.177f, 0.190f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PIPE_SMALL \ + { 26, 50.3f, 1.000f, -1000, -900, -1300, 5.04f, 0.10f, 0.10f, -600, 0.032f, 0.00f,0.00f,0.00f, 800, 0.015f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_DOME_SAINTPAULS \ + { 26, 50.3f, 0.870f, -1000, -900, -1300, 10.48f, 0.19f, 0.10f, -1500, 0.090f, 0.00f,0.00f,0.00f, 200, 0.042f, 0.00f,0.00f,0.00f, 0.250f, 0.120f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PIPE_LONGTHIN \ + { 26, 1.6f, 0.910f, -1000, -700, -1100, 9.21f, 0.18f, 0.10f, -300, 0.010f, 0.00f,0.00f,0.00f, -300, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PIPE_LARGE \ + { 26, 50.3f, 1.000f, -1000, -900, -1300, 8.45f, 0.10f, 0.10f, -800, 0.046f, 0.00f,0.00f,0.00f, 400, 0.032f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PIPE_RESONANT \ + { 26, 1.3f, 0.910f, -1000, -700, -1100, 6.81f, 0.18f, 0.10f, -300, 0.010f, 0.00f,0.00f,0.00f, 00, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } + + +// OUTDOORS PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_OUTDOORS_BACKYARD \ + { 26, 80.3f, 0.450f, -1000, -1200, -600, 1.12f, 0.34f, 0.46f, -700, 0.069f, 0.00f,0.00f,-0.00f, -300, 0.023f, 0.00f,0.00f,0.00f, 0.218f, 0.340f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \ + { 26, 80.3f, 0.000f, -1000, -3900, -400, 2.13f, 0.21f, 0.46f, -1500, 0.300f, 0.00f,0.00f,-0.00f, -700, 0.019f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_DEEPCANYON \ + { 26, 80.3f, 0.740f, -1000, -1500, -400, 3.89f, 0.21f, 0.46f, -1000, 0.223f, 0.00f,0.00f,-0.00f, -900, 0.019f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_CREEK \ + { 26, 80.3f, 0.350f, -1000, -1500, -600, 2.13f, 0.21f, 0.46f, -800, 0.115f, 0.00f,0.00f,-0.00f, -1400, 0.031f, 0.00f,0.00f,0.00f, 0.218f, 0.340f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_VALLEY \ + { 26, 80.3f, 0.280f, -1000, -3100, -1600, 2.88f, 0.26f, 0.35f, -1700, 0.263f, 0.00f,0.00f,-0.00f, -800, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 0.340f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } + + +// MOOD PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_MOOD_HEAVEN \ + { 26, 19.6f, 0.940f, -1000, -200, -700, 5.04f, 1.12f, 0.56f, -1230, 0.020f, 0.00f,0.00f,0.00f, 200, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.080f, 2.742f, 0.050f, -2.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_MOOD_HELL \ + { 26, 100.0f, 0.570f, -1000, -900, -700, 3.57f, 0.49f, 2.00f, -10000, 0.020f, 0.00f,0.00f,0.00f, 300, 0.030f, 0.00f,0.00f,0.00f, 0.110f, 0.040f, 2.109f, 0.520f, -5.0f, 5000.0f, 139.5f, 0.00f, 0x40 } +#define REVERB_PRESET_MOOD_MEMORY \ + { 26, 8.0f, 0.850f, -1000, -400, -900, 4.06f, 0.82f, 0.56f, -2800, 0.000f, 0.00f,0.00f,0.00f, 100, 0.000f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.474f, 0.450f, -10.0f, 5000.0f, 250.0f, 0.00f, 0x0 } + + +// DRIVING SIMULATION PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DRIVING_COMMENTATOR \ + { 26, 3.0f, 0.000f, 1000, -500, -600, 2.42f, 0.88f, 0.68f, -1400, 0.093f, 0.00f,0.00f,0.00f, -1200, 0.017f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -10.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_PITGARAGE \ + { 26, 1.9f, 0.590f, -1000, -300, -500, 1.72f, 0.93f, 0.87f, -500, 0.000f, 0.00f,0.00f,0.00f, 200, 0.016f, 0.00f,0.00f,0.00f, 0.250f, 0.110f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_DRIVING_INCAR_RACER \ + { 26, 1.1f, 0.800f, -1000, 0, -200, 0.17f, 2.00f, 0.41f, 500, 0.007f, 0.00f,0.00f,0.00f, -300, 0.015f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_INCAR_SPORTS \ + { 26, 1.1f, 0.800f, -1000, -400, 0, 0.17f, 0.75f, 0.41f, 0, 0.010f, 0.00f,0.00f,0.00f, -500, 0.000f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_INCAR_LUXURY \ + { 26, 1.6f, 1.000f, -1000, -2000, -600, 0.13f, 0.41f, 0.46f, -200, 0.010f, 0.00f,0.00f,0.00f, 400, 0.010f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_FULLGRANDSTAND \ + { 26, 8.3f, 1.000f, -1000, -1100, -400, 3.01f, 1.37f, 1.28f, -900, 0.090f, 0.00f,0.00f,0.00f, -1500, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10420.2f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \ + { 26, 8.3f, 1.000f, -1000, 0, -200, 4.62f, 1.75f, 1.40f, -1363, 0.090f, 0.00f,0.00f,0.00f, -1200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10420.2f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DRIVING_TUNNEL \ + { 26, 3.1f, 0.810f, -1000, -800, -100, 3.42f, 0.94f, 1.31f, -300, 0.051f, 0.00f,0.00f,0.00f, -300, 0.047f, 0.00f,0.00f,0.00f, 0.214f, 0.050f, 0.250f, 0.000f, -5.0f, 5000.0f, 155.3f, 0.00f, 0x20 } + + +// CITY PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_CITY_STREETS \ + { 26, 3.0f, 0.780f, -1000, -300, -100, 1.79f, 1.12f, 0.91f, -1100, 0.046f, 0.00f,0.00f,0.00f, -1400, 0.028f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_SUBWAY \ + { 26, 3.0f, 0.740f, -1000, -300, -100, 3.01f, 1.23f, 0.91f, -300, 0.046f, 0.00f,0.00f,0.00f, 200, 0.028f, 0.00f,0.00f,0.00f, 0.125f, 0.210f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_MUSEUM \ + { 26, 80.3f, 0.820f, -1000, -1500, -1500, 3.28f, 1.40f, 0.57f, -1200, 0.039f, 0.00f,0.00f,-0.00f, -100, 0.034f, 0.00f,0.00f,0.00f, 0.130f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_CITY_LIBRARY \ + { 26, 80.3f, 0.820f, -1000, -1100, -2100, 2.76f, 0.89f, 0.41f, -900, 0.029f, 0.00f,0.00f,-0.00f, -100, 0.020f, 0.00f,0.00f,0.00f, 0.130f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_CITY_UNDERPASS \ + { 26, 3.0f, 0.820f, -1000, -700, -100, 3.57f, 1.12f, 0.91f, -800, 0.059f, 0.00f,0.00f,0.00f, -100, 0.037f, 0.00f,0.00f,0.00f, 0.250f, 0.140f, 0.250f, 0.000f, -7.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_ABANDONED \ + { 26, 3.0f, 0.690f, -1000, -200, -100, 3.28f, 1.17f, 0.91f, -700, 0.044f, 0.00f,0.00f,0.00f, -1100, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -3.0f, 5000.0f, 250.0f, 0.00f, 0x20 } + + +// MISC ROOMS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DUSTYROOM \ + { 26, 1.8f, 0.560f, -1000, -200, -300, 1.79f, 0.38f, 0.21f, -600, 0.002f, 0.00f,0.00f,0.00f, 200, 0.006f, 0.00f,0.00f,0.00f, 0.202f, 0.050f, 0.250f, 0.000f, -10.0f, 13046.0f, 163.3f, 0.00f, 0x20 } +#define REVERB_PRESET_CHAPEL \ + { 26, 19.6f, 0.840f, -1000, -500, 0, 4.62f, 0.64f, 1.23f, -700, 0.032f, 0.00f,0.00f,0.00f, -200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.110f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_SMALLWATERROOM \ + { 26, 36.2f, 0.700f, -1000, -698, 0, 1.51f, 1.25f, 1.14f, -100, 0.020f, 0.00f,0.00f,0.00f, 300, 0.030f, 0.00f,0.00f,0.00f, 0.179f, 0.150f, 0.895f, 0.190f, -7.0f, 5000.0f, 250.0f, 0.00f, 0x0 } diff --git a/Externals/OpenAL/include/al.h b/Externals/OpenAL/include/al.h new file mode 100644 index 0000000000..413b38331e --- /dev/null +++ b/Externals/OpenAL/include/al.h @@ -0,0 +1,656 @@ +#ifndef AL_AL_H +#define AL_AL_H + +#if defined(__cplusplus) +extern "C" { +#endif + +#ifndef AL_API + #if defined(AL_LIBTYPE_STATIC) + #define AL_API + #elif defined(_WIN32) + #define AL_API __declspec(dllimport) + #else + #define AL_API extern + #endif +#endif + +#if defined(_WIN32) + #define AL_APIENTRY __cdecl +#else + #define AL_APIENTRY +#endif + + +/** Deprecated macro. */ +#define OPENAL +#define ALAPI AL_API +#define ALAPIENTRY AL_APIENTRY +#define AL_INVALID (-1) +#define AL_ILLEGAL_ENUM AL_INVALID_ENUM +#define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION + +/** Supported AL version. */ +#define AL_VERSION_1_0 +#define AL_VERSION_1_1 + +/** 8-bit boolean */ +typedef char ALboolean; + +/** character */ +typedef char ALchar; + +/** signed 8-bit 2's complement integer */ +typedef signed char ALbyte; + +/** unsigned 8-bit integer */ +typedef unsigned char ALubyte; + +/** signed 16-bit 2's complement integer */ +typedef short ALshort; + +/** unsigned 16-bit integer */ +typedef unsigned short ALushort; + +/** signed 32-bit 2's complement integer */ +typedef int ALint; + +/** unsigned 32-bit integer */ +typedef unsigned int ALuint; + +/** non-negative 32-bit binary integer size */ +typedef int ALsizei; + +/** enumerated 32-bit value */ +typedef int ALenum; + +/** 32-bit IEEE754 floating-point */ +typedef float ALfloat; + +/** 64-bit IEEE754 floating-point */ +typedef double ALdouble; + +/** void type (for opaque pointers only) */ +typedef void ALvoid; + + +/* Enumerant values begin at column 50. No tabs. */ + +/** "no distance model" or "no buffer" */ +#define AL_NONE 0 + +/** Boolean False. */ +#define AL_FALSE 0 + +/** Boolean True. */ +#define AL_TRUE 1 + + +/** + * Relative source. + * Type: ALboolean + * Range: [AL_TRUE, AL_FALSE] + * Default: AL_FALSE + * + * Specifies if the Source has relative coordinates. + */ +#define AL_SOURCE_RELATIVE 0x202 + + +/** + * Inner cone angle, in degrees. + * Type: ALint, ALfloat + * Range: [0 - 360] + * Default: 360 + * + * The angle covered by the inner cone, where the source will not attenuate. + */ +#define AL_CONE_INNER_ANGLE 0x1001 + +/** + * Outer cone angle, in degrees. + * Range: [0 - 360] + * Default: 360 + * + * The angle covered by the outer cone, where the source will be fully + * attenuated. + */ +#define AL_CONE_OUTER_ANGLE 0x1002 + +/** + * Source pitch. + * Type: ALfloat + * Range: [0.5 - 2.0] + * Default: 1.0 + * + * A multiplier for the frequency (sample rate) of the source's buffer. + */ +#define AL_PITCH 0x1003 + +/** + * Source or listener position. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} + * + * The source or listener location in three dimensional space. + * + * OpenAL, like OpenGL, uses a right handed coordinate system, where in a + * frontal default view X (thumb) points right, Y points up (index finger), and + * Z points towards the viewer/camera (middle finger). + * + * To switch from a left handed coordinate system, flip the sign on the Z + * coordinate. + */ +#define AL_POSITION 0x1004 + +/** + * Source direction. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} + * + * Specifies the current direction in local space. + * A zero-length vector specifies an omni-directional source (cone is ignored). + */ +#define AL_DIRECTION 0x1005 + +/** + * Source or listener velocity. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} + * + * Specifies the current velocity in local space. + */ +#define AL_VELOCITY 0x1006 + +/** + * Source looping. + * Type: ALboolean + * Range: [AL_TRUE, AL_FALSE] + * Default: AL_FALSE + * + * Specifies whether source is looping. + */ +#define AL_LOOPING 0x1007 + +/** + * Source buffer. + * Type: ALuint + * Range: any valid Buffer. + * + * Specifies the buffer to provide sound samples. + */ +#define AL_BUFFER 0x1009 + +/** + * Source or listener gain. + * Type: ALfloat + * Range: [0.0 - ] + * + * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation + * of about -6dB. Each multiplicaton by 2 equals an amplification of about + * +6dB. + * + * A value of 0.0 is meaningless with respect to a logarithmic scale; it is + * silent. + */ +#define AL_GAIN 0x100A + +/** + * Minimum source gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * The minimum gain allowed for a source, after distance and cone attenation is + * applied (if applicable). + */ +#define AL_MIN_GAIN 0x100D + +/** + * Maximum source gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * The maximum gain allowed for a source, after distance and cone attenation is + * applied (if applicable). + */ +#define AL_MAX_GAIN 0x100E + +/** + * Listener orientation. + * Type: ALfloat[6] + * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0} + * + * Effectively two three dimensional vectors. The first vector is the front (or + * "at") and the second is the top (or "up"). + * + * Both vectors are in local space. + */ +#define AL_ORIENTATION 0x100F + +/** + * Source state (query only). + * Type: ALint + * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED] + */ +#define AL_SOURCE_STATE 0x1010 + +/** Source state value. */ +#define AL_INITIAL 0x1011 +#define AL_PLAYING 0x1012 +#define AL_PAUSED 0x1013 +#define AL_STOPPED 0x1014 + +/** + * Source Buffer Queue size (query only). + * Type: ALint + * + * The number of buffers queued using alSourceQueueBuffers, minus the buffers + * removed with alSourceUnqueueBuffers. + */ +#define AL_BUFFERS_QUEUED 0x1015 + +/** + * Source Buffer Queue processed count (query only). + * Type: ALint + * + * The number of queued buffers that have been fully processed, and can be + * removed with alSourceUnqueueBuffers. + * + * Looping sources will never fully process buffers because they will be set to + * play again for when the source loops. + */ +#define AL_BUFFERS_PROCESSED 0x1016 + +/** + * Source reference distance. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + * + * The distance in units that no attenuation occurs. + * + * At 0.0, no distance attenuation ever occurs on non-linear attenuation models. + */ +#define AL_REFERENCE_DISTANCE 0x1020 + +/** + * Source rolloff factor. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + * + * Multiplier to exaggerate or diminish distance attenuation. + * + * At 0.0, no distance attenuation ever occurs. + */ +#define AL_ROLLOFF_FACTOR 0x1021 + +/** + * Outer cone gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * Default: 0.0 + * + * The gain attenuation applied when the listener is outside of the source's + * outer cone. + */ +#define AL_CONE_OUTER_GAIN 0x1022 + +/** + * Source maximum distance. + * Type: ALfloat + * Range: [0.0 - ] + * Default: +inf + * + * The distance above which the source is not attenuated any further with a + * clamped distance model, or where attenuation reaches 0.0 gain for linear + * distance models with a default rolloff factor. + */ +#define AL_MAX_DISTANCE 0x1023 + +/** Source buffer position, in seconds */ +#define AL_SEC_OFFSET 0x1024 +/** Source buffer position, in sample frames */ +#define AL_SAMPLE_OFFSET 0x1025 +/** Source buffer position, in bytes */ +#define AL_BYTE_OFFSET 0x1026 + +/** + * Source type (query only). + * Type: ALint + * Range: [AL_STATIC, AL_STREAMING, AL_UNDETERMINED] + * + * A Source is Static if a Buffer has been attached using AL_BUFFER. + * + * A Source is Streaming if one or more Buffers have been attached using + * alSourceQueueBuffers. + * + * A Source is Undetermined when it has the NULL buffer attached using + * AL_BUFFER. + */ +#define AL_SOURCE_TYPE 0x1027 + +/** Source type value. */ +#define AL_STATIC 0x1028 +#define AL_STREAMING 0x1029 +#define AL_UNDETERMINED 0x1030 + +/** Buffer format specifier. */ +#define AL_FORMAT_MONO8 0x1100 +#define AL_FORMAT_MONO16 0x1101 +#define AL_FORMAT_STEREO8 0x1102 +#define AL_FORMAT_STEREO16 0x1103 + +/** Buffer frequency (query only). */ +#define AL_FREQUENCY 0x2001 +/** Buffer bits per sample (query only). */ +#define AL_BITS 0x2002 +/** Buffer channel count (query only). */ +#define AL_CHANNELS 0x2003 +/** Buffer data size (query only). */ +#define AL_SIZE 0x2004 + +/** + * Buffer state. + * + * Not for public use. + */ +#define AL_UNUSED 0x2010 +#define AL_PENDING 0x2011 +#define AL_PROCESSED 0x2012 + + +/** No error. */ +#define AL_NO_ERROR 0 + +/** Invalid name paramater passed to AL call. */ +#define AL_INVALID_NAME 0xA001 + +/** Invalid enum parameter passed to AL call. */ +#define AL_INVALID_ENUM 0xA002 + +/** Invalid value parameter passed to AL call. */ +#define AL_INVALID_VALUE 0xA003 + +/** Illegal AL call. */ +#define AL_INVALID_OPERATION 0xA004 + +/** Not enough memory. */ +#define AL_OUT_OF_MEMORY 0xA005 + + +/** Context string: Vendor ID. */ +#define AL_VENDOR 0xB001 +/** Context string: Version. */ +#define AL_VERSION 0xB002 +/** Context string: Renderer ID. */ +#define AL_RENDERER 0xB003 +/** Context string: Space-separated extension list. */ +#define AL_EXTENSIONS 0xB004 + + +/** + * Doppler scale. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + * + * Scale for source and listener velocities. + */ +#define AL_DOPPLER_FACTOR 0xC000 +AL_API void AL_APIENTRY alDopplerFactor(ALfloat value); + +/** + * Doppler velocity (deprecated). + * + * A multiplier applied to the Speed of Sound. + */ +#define AL_DOPPLER_VELOCITY 0xC001 +AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value); + +/** + * Speed of Sound, in units per second. + * Type: ALfloat + * Range: [0.0001 - ] + * Default: 343.3 + * + * The speed at which sound waves are assumed to travel, when calculating the + * doppler effect. + */ +#define AL_SPEED_OF_SOUND 0xC003 +AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value); + +/** + * Distance attenuation model. + * Type: ALint + * Range: [AL_NONE, AL_INVERSE_DISTANCE, AL_INVERSE_DISTANCE_CLAMPED, + * AL_LINEAR_DISTANCE, AL_LINEAR_DISTANCE_CLAMPED, + * AL_EXPONENT_DISTANCE, AL_EXPONENT_DISTANCE_CLAMPED] + * Default: AL_INVERSE_DISTANCE_CLAMPED + * + * The model by which sources attenuate with distance. + * + * None - No distance attenuation. + * Inverse - Doubling the distance halves the source gain. + * Linear - Linear gain scaling between the reference and max distances. + * Exponent - Exponential gain dropoff. + * + * Clamped variations work like the non-clamped counterparts, except the + * distance calculated is clamped between the reference and max distances. + */ +#define AL_DISTANCE_MODEL 0xD000 +AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel); + +/** Distance model value. */ +#define AL_INVERSE_DISTANCE 0xD001 +#define AL_INVERSE_DISTANCE_CLAMPED 0xD002 +#define AL_LINEAR_DISTANCE 0xD003 +#define AL_LINEAR_DISTANCE_CLAMPED 0xD004 +#define AL_EXPONENT_DISTANCE 0xD005 +#define AL_EXPONENT_DISTANCE_CLAMPED 0xD006 + +/** Renderer State management. */ +AL_API void AL_APIENTRY alEnable(ALenum capability); +AL_API void AL_APIENTRY alDisable(ALenum capability); +AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability); + +/** State retrieval. */ +AL_API const ALchar* AL_APIENTRY alGetString(ALenum param); +AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values); +AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values); +AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values); +AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param); +AL_API ALint AL_APIENTRY alGetInteger(ALenum param); +AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param); +AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param); + +/** + * Error retrieval. + * + * Obtain the first error generated in the AL context since the last check. + */ +AL_API ALenum AL_APIENTRY alGetError(void); + +/** + * Extension support. + * + * Query for the presence of an extension, and obtain any appropriate function + * pointers and enum values. + */ +AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname); +AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname); +AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename); + + +/** Set Listener parameters */ +AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value); +AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value); +AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values); + +/** Get Listener parameters */ +AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values); + + +/** Create Source objects. */ +AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources); +/** Delete Source objects. */ +AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources); +/** Verify a handle is a valid Source. */ +AL_API ALboolean AL_APIENTRY alIsSource(ALuint source); + +/** Set Source parameters. */ +AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value); +AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value); +AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values); + +/** Get Source parameters. */ +AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetSourcei(ALuint source, ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetSourceiv(ALuint source, ALenum param, ALint *values); + + +/** Play, replay, or resume (if paused) a list of Sources */ +AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources); +/** Stop a list of Sources */ +AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources); +/** Rewind a list of Sources */ +AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources); +/** Pause a list of Sources */ +AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources); + +/** Play, replay, or resume a Source */ +AL_API void AL_APIENTRY alSourcePlay(ALuint source); +/** Stop a Source */ +AL_API void AL_APIENTRY alSourceStop(ALuint source); +/** Rewind a Source (set playback postiton to beginning) */ +AL_API void AL_APIENTRY alSourceRewind(ALuint source); +/** Pause a Source */ +AL_API void AL_APIENTRY alSourcePause(ALuint source); + +/** Queue buffers onto a source */ +AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers); +/** Unqueue processed buffers from a source */ +AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers); + + +/** Create Buffer objects */ +AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers); +/** Delete Buffer objects */ +AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers); +/** Verify a handle is a valid Buffer */ +AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer); + +/** Specifies the data to be copied into a buffer */ +AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); + +/** Set Buffer parameters, */ +AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value); +AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value); +AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values); + +/** Get Buffer parameters. */ +AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values); + +/** Pointer-to-function type, useful for dynamically getting AL entry points. */ +typedef void (AL_APIENTRY *LPALENABLE)(ALenum capability); +typedef void (AL_APIENTRY *LPALDISABLE)(ALenum capability); +typedef ALboolean (AL_APIENTRY *LPALISENABLED)(ALenum capability); +typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param); +typedef void (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values); +typedef void (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values); +typedef ALboolean (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param); +typedef ALint (AL_APIENTRY *LPALGETINTEGER)(ALenum param); +typedef ALfloat (AL_APIENTRY *LPALGETFLOAT)(ALenum param); +typedef ALdouble (AL_APIENTRY *LPALGETDOUBLE)(ALenum param); +typedef ALenum (AL_APIENTRY *LPALGETERROR)(void); +typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname); +typedef void* (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname); +typedef ALenum (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename); +typedef void (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources); +typedef void (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources); +typedef ALboolean (AL_APIENTRY *LPALISSOURCE)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCESTOP)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers); +typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers); +typedef void (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers); +typedef void (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers); +typedef ALboolean (AL_APIENTRY *LPALISBUFFER)(ALuint buffer); +typedef void (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); +typedef void (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value); +typedef void (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value); +typedef void (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value); +typedef void (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel); + +#if defined(__cplusplus) +} /* extern "C" */ +#endif + +#endif /* AL_AL_H */ diff --git a/Externals/OpenAL/include/alc.h b/Externals/OpenAL/include/alc.h new file mode 100644 index 0000000000..294e8b33c6 --- /dev/null +++ b/Externals/OpenAL/include/alc.h @@ -0,0 +1,237 @@ +#ifndef AL_ALC_H +#define AL_ALC_H + +#if defined(__cplusplus) +extern "C" { +#endif + +#ifndef ALC_API + #if defined(AL_LIBTYPE_STATIC) + #define ALC_API + #elif defined(_WIN32) + #define ALC_API __declspec(dllimport) + #else + #define ALC_API extern + #endif +#endif + +#if defined(_WIN32) + #define ALC_APIENTRY __cdecl +#else + #define ALC_APIENTRY +#endif + + +/** Deprecated macro. */ +#define ALCAPI ALC_API +#define ALCAPIENTRY ALC_APIENTRY +#define ALC_INVALID 0 + +/** Supported ALC version? */ +#define ALC_VERSION_0_1 1 + +/** Opaque device handle */ +typedef struct ALCdevice_struct ALCdevice; +/** Opaque context handle */ +typedef struct ALCcontext_struct ALCcontext; + +/** 8-bit boolean */ +typedef char ALCboolean; + +/** character */ +typedef char ALCchar; + +/** signed 8-bit 2's complement integer */ +typedef signed char ALCbyte; + +/** unsigned 8-bit integer */ +typedef unsigned char ALCubyte; + +/** signed 16-bit 2's complement integer */ +typedef short ALCshort; + +/** unsigned 16-bit integer */ +typedef unsigned short ALCushort; + +/** signed 32-bit 2's complement integer */ +typedef int ALCint; + +/** unsigned 32-bit integer */ +typedef unsigned int ALCuint; + +/** non-negative 32-bit binary integer size */ +typedef int ALCsizei; + +/** enumerated 32-bit value */ +typedef int ALCenum; + +/** 32-bit IEEE754 floating-point */ +typedef float ALCfloat; + +/** 64-bit IEEE754 floating-point */ +typedef double ALCdouble; + +/** void type (for opaque pointers only) */ +typedef void ALCvoid; + + +/* Enumerant values begin at column 50. No tabs. */ + +/** Boolean False. */ +#define ALC_FALSE 0 + +/** Boolean True. */ +#define ALC_TRUE 1 + +/** Context attribute: Hz. */ +#define ALC_FREQUENCY 0x1007 + +/** Context attribute: Hz. */ +#define ALC_REFRESH 0x1008 + +/** Context attribute: AL_TRUE or AL_FALSE. */ +#define ALC_SYNC 0x1009 + +/** Context attribute: requested Mono (3D) Sources. */ +#define ALC_MONO_SOURCES 0x1010 + +/** Context attribute: requested Stereo Sources. */ +#define ALC_STEREO_SOURCES 0x1011 + +/** No error. */ +#define ALC_NO_ERROR 0 + +/** Invalid device handle. */ +#define ALC_INVALID_DEVICE 0xA001 + +/** Invalid context handle. */ +#define ALC_INVALID_CONTEXT 0xA002 + +/** Invalid enum parameter passed to an ALC call. */ +#define ALC_INVALID_ENUM 0xA003 + +/** Invalid value parameter passed to an ALC call. */ +#define ALC_INVALID_VALUE 0xA004 + +/** Out of memory. */ +#define ALC_OUT_OF_MEMORY 0xA005 + + +/** Runtime ALC version. */ +#define ALC_MAJOR_VERSION 0x1000 +#define ALC_MINOR_VERSION 0x1001 + +/** Context attribute list properties. */ +#define ALC_ATTRIBUTES_SIZE 0x1002 +#define ALC_ALL_ATTRIBUTES 0x1003 + +/** String for the default device specifier. */ +#define ALC_DEFAULT_DEVICE_SPECIFIER 0x1004 +/** + * String for the given device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known device specifiers (list ends with an empty string). + */ +#define ALC_DEVICE_SPECIFIER 0x1005 +/** String for space-separated list of ALC extensions. */ +#define ALC_EXTENSIONS 0x1006 + + +/** Capture extension */ +#define ALC_EXT_CAPTURE 1 +/** + * String for the given capture device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known capture device specifiers (list ends with an empty string). + */ +#define ALC_CAPTURE_DEVICE_SPECIFIER 0x310 +/** String for the default capture device specifier. */ +#define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER 0x311 +/** Number of sample frames available for capture. */ +#define ALC_CAPTURE_SAMPLES 0x312 + + +/** Enumerate All extension */ +#define ALC_ENUMERATE_ALL_EXT 1 +/** String for the default extended device specifier. */ +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +/** + * String for the given extended device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known extended device specifiers (list ends with an empty string). + */ +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 + + +/** Context management. */ +ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint* attrlist); +ALC_API ALCboolean ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context); +ALC_API void ALC_APIENTRY alcProcessContext(ALCcontext *context); +ALC_API void ALC_APIENTRY alcSuspendContext(ALCcontext *context); +ALC_API void ALC_APIENTRY alcDestroyContext(ALCcontext *context); +ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void); +ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice(ALCcontext *context); + +/** Device management. */ +ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename); +ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device); + + +/** + * Error support. + * + * Obtain the most recent Device error. + */ +ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device); + +/** + * Extension support. + * + * Query for the presence of an extension, and obtain any appropriate + * function pointers and enum values. + */ +ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname); +ALC_API void* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname); +ALC_API ALCenum ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname); + +/** Query function. */ +ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param); +ALC_API void ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values); + +/** Capture function. */ +ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize); +ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureStart(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureStop(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); + +/** Pointer-to-function type, useful for dynamically getting ALC entry points. */ +typedef ALCcontext* (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist); +typedef ALCboolean (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void); +typedef ALCdevice* (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context); +typedef ALCdevice* (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename); +typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device); +typedef ALCenum (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device); +typedef ALCboolean (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname); +typedef void* (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname); +typedef ALCenum (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname); +typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param); +typedef void (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values); +typedef ALCdevice* (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize); +typedef ALCboolean (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); + +#if defined(__cplusplus) +} +#endif + +#endif /* AL_ALC_H */ diff --git a/Externals/OpenAL/include/alext.h b/Externals/OpenAL/include/alext.h new file mode 100644 index 0000000000..0447f2bb45 --- /dev/null +++ b/Externals/OpenAL/include/alext.h @@ -0,0 +1,355 @@ +/** + * OpenAL cross platform audio library + * Copyright (C) 2008 by authors. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * Or go to http://www.gnu.org/copyleft/lgpl.html + */ + +#ifndef AL_ALEXT_H +#define AL_ALEXT_H + +#include +/* Define int64_t and uint64_t types */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#include +#elif defined(_WIN32) && defined(__GNUC__) +#include +#elif defined(_WIN32) +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +/* Fallback if nothing above works */ +#include +#endif + +#include "alc.h" +#include "al.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef AL_LOKI_IMA_ADPCM_format +#define AL_LOKI_IMA_ADPCM_format 1 +#define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 +#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 +#endif + +#ifndef AL_LOKI_WAVE_format +#define AL_LOKI_WAVE_format 1 +#define AL_FORMAT_WAVE_EXT 0x10002 +#endif + +#ifndef AL_EXT_vorbis +#define AL_EXT_vorbis 1 +#define AL_FORMAT_VORBIS_EXT 0x10003 +#endif + +#ifndef AL_LOKI_quadriphonic +#define AL_LOKI_quadriphonic 1 +#define AL_FORMAT_QUAD8_LOKI 0x10004 +#define AL_FORMAT_QUAD16_LOKI 0x10005 +#endif + +#ifndef AL_EXT_float32 +#define AL_EXT_float32 1 +#define AL_FORMAT_MONO_FLOAT32 0x10010 +#define AL_FORMAT_STEREO_FLOAT32 0x10011 +#endif + +#ifndef AL_EXT_double +#define AL_EXT_double 1 +#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012 +#define AL_FORMAT_STEREO_DOUBLE_EXT 0x10013 +#endif + +#ifndef AL_EXT_MULAW +#define AL_EXT_MULAW 1 +#define AL_FORMAT_MONO_MULAW_EXT 0x10014 +#define AL_FORMAT_STEREO_MULAW_EXT 0x10015 +#endif + +#ifndef AL_EXT_ALAW +#define AL_EXT_ALAW 1 +#define AL_FORMAT_MONO_ALAW_EXT 0x10016 +#define AL_FORMAT_STEREO_ALAW_EXT 0x10017 +#endif + +#ifndef ALC_LOKI_audio_channel +#define ALC_LOKI_audio_channel 1 +#define ALC_CHAN_MAIN_LOKI 0x500001 +#define ALC_CHAN_PCM_LOKI 0x500002 +#define ALC_CHAN_CD_LOKI 0x500003 +#endif + +#ifndef AL_EXT_MCFORMATS +#define AL_EXT_MCFORMATS 1 +#define AL_FORMAT_QUAD8 0x1204 +#define AL_FORMAT_QUAD16 0x1205 +#define AL_FORMAT_QUAD32 0x1206 +#define AL_FORMAT_REAR8 0x1207 +#define AL_FORMAT_REAR16 0x1208 +#define AL_FORMAT_REAR32 0x1209 +#define AL_FORMAT_51CHN8 0x120A +#define AL_FORMAT_51CHN16 0x120B +#define AL_FORMAT_51CHN32 0x120C +#define AL_FORMAT_61CHN8 0x120D +#define AL_FORMAT_61CHN16 0x120E +#define AL_FORMAT_61CHN32 0x120F +#define AL_FORMAT_71CHN8 0x1210 +#define AL_FORMAT_71CHN16 0x1211 +#define AL_FORMAT_71CHN32 0x1212 +#endif + +#ifndef AL_EXT_MULAW_MCFORMATS +#define AL_EXT_MULAW_MCFORMATS 1 +#define AL_FORMAT_MONO_MULAW 0x10014 +#define AL_FORMAT_STEREO_MULAW 0x10015 +#define AL_FORMAT_QUAD_MULAW 0x10021 +#define AL_FORMAT_REAR_MULAW 0x10022 +#define AL_FORMAT_51CHN_MULAW 0x10023 +#define AL_FORMAT_61CHN_MULAW 0x10024 +#define AL_FORMAT_71CHN_MULAW 0x10025 +#endif + +#ifndef AL_EXT_IMA4 +#define AL_EXT_IMA4 1 +#define AL_FORMAT_MONO_IMA4 0x1300 +#define AL_FORMAT_STEREO_IMA4 0x1301 +#endif + +#ifndef AL_EXT_STATIC_BUFFER +#define AL_EXT_STATIC_BUFFER 1 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq); +#endif +#endif + +#ifndef ALC_EXT_EFX +#define ALC_EXT_EFX 1 +#include "efx.h" +#endif + +#ifndef ALC_EXT_disconnect +#define ALC_EXT_disconnect 1 +#define ALC_CONNECTED 0x313 +#endif + +#ifndef ALC_EXT_thread_local_context +#define ALC_EXT_thread_local_context 1 +typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API ALCboolean ALC_APIENTRY alcSetThreadContext(ALCcontext *context); +ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void); +#endif +#endif + +#ifndef AL_EXT_source_distance_model +#define AL_EXT_source_distance_model 1 +#define AL_SOURCE_DISTANCE_MODEL 0x200 +#endif + +#ifndef AL_SOFT_buffer_sub_data +#define AL_SOFT_buffer_sub_data 1 +#define AL_BYTE_RW_OFFSETS_SOFT 0x1031 +#define AL_SAMPLE_RW_OFFSETS_SOFT 0x1032 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length); +#endif +#endif + +#ifndef AL_SOFT_loop_points +#define AL_SOFT_loop_points 1 +#define AL_LOOP_POINTS_SOFT 0x2015 +#endif + +#ifndef AL_EXT_FOLDBACK +#define AL_EXT_FOLDBACK 1 +#define AL_EXT_FOLDBACK_NAME "AL_EXT_FOLDBACK" +#define AL_FOLDBACK_EVENT_BLOCK 0x4112 +#define AL_FOLDBACK_EVENT_START 0x4111 +#define AL_FOLDBACK_EVENT_STOP 0x4113 +#define AL_FOLDBACK_MODE_MONO 0x4101 +#define AL_FOLDBACK_MODE_STEREO 0x4102 +typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei); +typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK); +typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback); +AL_API void AL_APIENTRY alRequestFoldbackStop(void); +#endif +#endif + +#ifndef ALC_EXT_DEDICATED +#define ALC_EXT_DEDICATED 1 +#define AL_DEDICATED_GAIN 0x0001 +#define AL_EFFECT_DEDICATED_DIALOGUE 0x9001 +#define AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT 0x9000 +#endif + +#ifndef AL_SOFT_buffer_samples +#define AL_SOFT_buffer_samples 1 +/* Channel configurations */ +#define AL_MONO_SOFT 0x1500 +#define AL_STEREO_SOFT 0x1501 +#define AL_REAR_SOFT 0x1502 +#define AL_QUAD_SOFT 0x1503 +#define AL_5POINT1_SOFT 0x1504 +#define AL_6POINT1_SOFT 0x1505 +#define AL_7POINT1_SOFT 0x1506 + +/* Sample types */ +#define AL_BYTE_SOFT 0x1400 +#define AL_UNSIGNED_BYTE_SOFT 0x1401 +#define AL_SHORT_SOFT 0x1402 +#define AL_UNSIGNED_SHORT_SOFT 0x1403 +#define AL_INT_SOFT 0x1404 +#define AL_UNSIGNED_INT_SOFT 0x1405 +#define AL_FLOAT_SOFT 0x1406 +#define AL_DOUBLE_SOFT 0x1407 +#define AL_BYTE3_SOFT 0x1408 +#define AL_UNSIGNED_BYTE3_SOFT 0x1409 + +/* Storage formats */ +#define AL_MONO8_SOFT 0x1100 +#define AL_MONO16_SOFT 0x1101 +#define AL_MONO32F_SOFT 0x10010 +#define AL_STEREO8_SOFT 0x1102 +#define AL_STEREO16_SOFT 0x1103 +#define AL_STEREO32F_SOFT 0x10011 +#define AL_QUAD8_SOFT 0x1204 +#define AL_QUAD16_SOFT 0x1205 +#define AL_QUAD32F_SOFT 0x1206 +#define AL_REAR8_SOFT 0x1207 +#define AL_REAR16_SOFT 0x1208 +#define AL_REAR32F_SOFT 0x1209 +#define AL_5POINT1_8_SOFT 0x120A +#define AL_5POINT1_16_SOFT 0x120B +#define AL_5POINT1_32F_SOFT 0x120C +#define AL_6POINT1_8_SOFT 0x120D +#define AL_6POINT1_16_SOFT 0x120E +#define AL_6POINT1_32F_SOFT 0x120F +#define AL_7POINT1_8_SOFT 0x1210 +#define AL_7POINT1_16_SOFT 0x1211 +#define AL_7POINT1_32F_SOFT 0x1212 + +/* Buffer attributes */ +#define AL_INTERNAL_FORMAT_SOFT 0x2008 +#define AL_BYTE_LENGTH_SOFT 0x2009 +#define AL_SAMPLE_LENGTH_SOFT 0x200A +#define AL_SEC_LENGTH_SOFT 0x200B + +typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*); +typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*); +typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*); +typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data); +AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data); +AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data); +AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format); +#endif +#endif + +#ifndef AL_SOFT_direct_channels +#define AL_SOFT_direct_channels 1 +#define AL_DIRECT_CHANNELS_SOFT 0x1033 +#endif + +#ifndef ALC_SOFT_loopback +#define ALC_SOFT_loopback 1 +#define ALC_FORMAT_CHANNELS_SOFT 0x1990 +#define ALC_FORMAT_TYPE_SOFT 0x1991 + +/* Sample types */ +#define ALC_BYTE_SOFT 0x1400 +#define ALC_UNSIGNED_BYTE_SOFT 0x1401 +#define ALC_SHORT_SOFT 0x1402 +#define ALC_UNSIGNED_SHORT_SOFT 0x1403 +#define ALC_INT_SOFT 0x1404 +#define ALC_UNSIGNED_INT_SOFT 0x1405 +#define ALC_FLOAT_SOFT 0x1406 + +/* Channel configurations */ +#define ALC_MONO_SOFT 0x1500 +#define ALC_STEREO_SOFT 0x1501 +#define ALC_QUAD_SOFT 0x1503 +#define ALC_5POINT1_SOFT 0x1504 +#define ALC_6POINT1_SOFT 0x1505 +#define ALC_7POINT1_SOFT 0x1506 + +typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*); +typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum); +typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName); +ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type); +ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); +#endif +#endif + +#ifndef AL_EXT_STEREO_ANGLES +#define AL_EXT_STEREO_ANGLES 1 +#define AL_STEREO_ANGLES 0x1030 +#endif + +#ifndef AL_EXT_SOURCE_RADIUS +#define AL_EXT_SOURCE_RADIUS 1 +#define AL_SOURCE_RADIUS 0x1031 +#endif + +#ifndef AL_SOFT_source_latency +#define AL_SOFT_source_latency 1 +#define AL_SAMPLE_OFFSET_LATENCY_SOFT 0x1200 +#define AL_SEC_OFFSET_LATENCY_SOFT 0x1201 +typedef int64_t ALint64SOFT; +typedef uint64_t ALuint64SOFT; +typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble); +typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble); +typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*); +typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT); +typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT); +typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value); +AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3); +AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values); +AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value); +AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3); +AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values); +AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value); +AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3); +AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values); +AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value); +AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3); +AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values); +#endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/Externals/OpenAL/include/efx-creative.h b/Externals/OpenAL/include/efx-creative.h new file mode 100644 index 0000000000..0a04c982e1 --- /dev/null +++ b/Externals/OpenAL/include/efx-creative.h @@ -0,0 +1,3 @@ +/* The tokens that would be defined here are already defined in efx.h. This + * empty file is here to provide compatibility with Windows-based projects + * that would include it. */ diff --git a/Externals/OpenAL/include/efx-presets.h b/Externals/OpenAL/include/efx-presets.h new file mode 100644 index 0000000000..86dcbda2f3 --- /dev/null +++ b/Externals/OpenAL/include/efx-presets.h @@ -0,0 +1,402 @@ +/* Reverb presets for EFX */ + +#ifndef EFX_PRESETS_H +#define EFX_PRESETS_H + +#ifndef EFXEAXREVERBPROPERTIES_DEFINED +#define EFXEAXREVERBPROPERTIES_DEFINED +typedef struct { + float flDensity; + float flDiffusion; + float flGain; + float flGainHF; + float flGainLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + float flReflectionsGain; + float flReflectionsDelay; + float flReflectionsPan[3]; + float flLateReverbGain; + float flLateReverbDelay; + float flLateReverbPan[3]; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionGainHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + int iDecayHFLimit; +} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES; +#endif + +/* Default Presets */ + +#define EFX_REVERB_PRESET_GENERIC \ + { 1.0000f, 1.0000f, 0.3162f, 0.8913f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PADDEDCELL \ + { 0.1715f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.1700f, 0.1000f, 1.0000f, 0.2500f, 0.0010f, { 0.0000f, 0.0000f, 0.0000f }, 1.2691f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ROOM \ + { 0.4287f, 1.0000f, 0.3162f, 0.5929f, 1.0000f, 0.4000f, 0.8300f, 1.0000f, 0.1503f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.0629f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_BATHROOM \ + { 0.1715f, 1.0000f, 0.3162f, 0.2512f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.6531f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 3.2734f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_LIVINGROOM \ + { 0.9766f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.5000f, 0.1000f, 1.0000f, 0.2051f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2805f, 0.0040f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_STONEROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 2.3100f, 0.6400f, 1.0000f, 0.4411f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1003f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_AUDITORIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.5781f, 1.0000f, 4.3200f, 0.5900f, 1.0000f, 0.4032f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7170f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CONCERTHALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.5623f, 1.0000f, 3.9200f, 0.7000f, 1.0000f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.9977f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CAVE \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 2.9100f, 1.3000f, 1.0000f, 0.5000f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.7063f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_ARENA \ + { 1.0000f, 1.0000f, 0.3162f, 0.4477f, 1.0000f, 7.2400f, 0.3300f, 1.0000f, 0.2612f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.0186f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_HANGAR \ + { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 10.0500f, 0.2300f, 1.0000f, 0.5000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2560f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CARPETEDHALLWAY \ + { 0.4287f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 0.3000f, 0.1000f, 1.0000f, 0.1215f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.1531f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_HALLWAY \ + { 0.3645f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 1.4900f, 0.5900f, 1.0000f, 0.2458f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.6615f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_STONECORRIDOR \ + { 1.0000f, 1.0000f, 0.3162f, 0.7612f, 1.0000f, 2.7000f, 0.7900f, 1.0000f, 0.2472f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 1.5758f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ALLEY \ + { 1.0000f, 0.3000f, 0.3162f, 0.7328f, 1.0000f, 1.4900f, 0.8600f, 1.0000f, 0.2500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.9954f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.9500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FOREST \ + { 1.0000f, 0.3000f, 0.3162f, 0.0224f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.0525f, 0.1620f, { 0.0000f, 0.0000f, 0.0000f }, 0.7682f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY \ + { 1.0000f, 0.5000f, 0.3162f, 0.3981f, 1.0000f, 1.4900f, 0.6700f, 1.0000f, 0.0730f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1427f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_MOUNTAINS \ + { 1.0000f, 0.2700f, 0.3162f, 0.0562f, 1.0000f, 1.4900f, 0.2100f, 1.0000f, 0.0407f, 0.3000f, { 0.0000f, 0.0000f, 0.0000f }, 0.1919f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_QUARRY \ + { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0000f, 0.0610f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.7000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PLAIN \ + { 1.0000f, 0.2100f, 0.3162f, 0.1000f, 1.0000f, 1.4900f, 0.5000f, 1.0000f, 0.0585f, 0.1790f, { 0.0000f, 0.0000f, 0.0000f }, 0.1089f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PARKINGLOT \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 1.6500f, 1.5000f, 1.0000f, 0.2082f, 0.0080f, { 0.0000f, 0.0000f, 0.0000f }, 0.2652f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SEWERPIPE \ + { 0.3071f, 0.8000f, 0.3162f, 0.3162f, 1.0000f, 2.8100f, 0.1400f, 1.0000f, 1.6387f, 0.0140f, { 0.0000f, 0.0000f, 0.0000f }, 3.2471f, 0.0210f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_UNDERWATER \ + { 0.3645f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 1.4900f, 0.1000f, 1.0000f, 0.5963f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 7.0795f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 1.1800f, 0.3480f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRUGGED \ + { 0.4287f, 0.5000f, 0.3162f, 1.0000f, 1.0000f, 8.3900f, 1.3900f, 1.0000f, 0.8760f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 3.1081f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DIZZY \ + { 0.3645f, 0.6000f, 0.3162f, 0.6310f, 1.0000f, 17.2300f, 0.5600f, 1.0000f, 0.1392f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4937f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.8100f, 0.3100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PSYCHOTIC \ + { 0.0625f, 0.5000f, 0.3162f, 0.8404f, 1.0000f, 7.5600f, 0.9100f, 1.0000f, 0.4864f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 2.4378f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 4.0000f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Castle Presets */ + +#define EFX_REVERB_PRESET_CASTLE_SMALLROOM \ + { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 1.2200f, 0.8300f, 0.3100f, 0.8913f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_SHORTPASSAGE \ + { 1.0000f, 0.8900f, 0.3162f, 0.3162f, 0.1000f, 2.3200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_MEDIUMROOM \ + { 1.0000f, 0.9300f, 0.3162f, 0.2818f, 0.1000f, 2.0400f, 0.8300f, 0.4600f, 0.6310f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1550f, 0.0300f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_LARGEROOM \ + { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.1259f, 2.5300f, 0.8300f, 0.5000f, 0.4467f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1850f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_LONGPASSAGE \ + { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 3.4200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_HALL \ + { 1.0000f, 0.8100f, 0.3162f, 0.2818f, 0.1778f, 3.1400f, 0.7900f, 0.6200f, 0.1778f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_CUPBOARD \ + { 1.0000f, 0.8900f, 0.3162f, 0.2818f, 0.1000f, 0.6700f, 0.8700f, 0.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 3.5481f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_COURTYARD \ + { 1.0000f, 0.4200f, 0.3162f, 0.4467f, 0.1995f, 2.1300f, 0.6100f, 0.2300f, 0.2239f, 0.1600f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3700f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CASTLE_ALCOVE \ + { 1.0000f, 0.8900f, 0.3162f, 0.5012f, 0.1000f, 1.6400f, 0.8700f, 0.3100f, 1.0000f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +/* Factory Presets */ + +#define EFX_REVERB_PRESET_FACTORY_SMALLROOM \ + { 0.3645f, 0.8200f, 0.3162f, 0.7943f, 0.5012f, 1.7200f, 0.6500f, 1.3100f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.1190f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_SHORTPASSAGE \ + { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 2.5300f, 0.6500f, 1.3100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_MEDIUMROOM \ + { 0.4287f, 0.8200f, 0.2512f, 0.7943f, 0.5012f, 2.7600f, 0.6500f, 1.3100f, 0.2818f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1740f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_LARGEROOM \ + { 0.4287f, 0.7500f, 0.2512f, 0.7079f, 0.6310f, 4.2400f, 0.5100f, 1.3100f, 0.1778f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2310f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_LONGPASSAGE \ + { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 4.0600f, 0.6500f, 1.3100f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_HALL \ + { 0.4287f, 0.7500f, 0.3162f, 0.7079f, 0.6310f, 7.4300f, 0.5100f, 1.3100f, 0.0631f, 0.0730f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_CUPBOARD \ + { 0.3071f, 0.6300f, 0.2512f, 0.7943f, 0.5012f, 0.4900f, 0.6500f, 1.3100f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.1070f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_COURTYARD \ + { 0.3071f, 0.5700f, 0.3162f, 0.3162f, 0.6310f, 2.3200f, 0.2900f, 0.5600f, 0.2239f, 0.1400f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2900f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_ALCOVE \ + { 0.3645f, 0.5900f, 0.2512f, 0.7943f, 0.5012f, 3.1400f, 0.6500f, 1.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1140f, 0.1000f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +/* Ice Palace Presets */ + +#define EFX_REVERB_PRESET_ICEPALACE_SMALLROOM \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 1.5100f, 1.5300f, 0.2700f, 0.8913f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1640f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_SHORTPASSAGE \ + { 1.0000f, 0.7500f, 0.3162f, 0.5623f, 0.2818f, 1.7900f, 1.4600f, 0.2800f, 0.5012f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_MEDIUMROOM \ + { 1.0000f, 0.8700f, 0.3162f, 0.5623f, 0.4467f, 2.2200f, 1.5300f, 0.3200f, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_LARGEROOM \ + { 1.0000f, 0.8100f, 0.3162f, 0.5623f, 0.4467f, 3.1400f, 1.5300f, 0.3200f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_LONGPASSAGE \ + { 1.0000f, 0.7700f, 0.3162f, 0.5623f, 0.3981f, 3.0100f, 1.4600f, 0.2800f, 0.7943f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.0400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_HALL \ + { 1.0000f, 0.7600f, 0.3162f, 0.4467f, 0.5623f, 5.4900f, 1.5300f, 0.3800f, 0.1122f, 0.0540f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0520f, { 0.0000f, 0.0000f, 0.0000f }, 0.2260f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_CUPBOARD \ + { 1.0000f, 0.8300f, 0.3162f, 0.5012f, 0.2239f, 0.7600f, 1.5300f, 0.2600f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1430f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_COURTYARD \ + { 1.0000f, 0.5900f, 0.3162f, 0.2818f, 0.3162f, 2.0400f, 1.2000f, 0.3800f, 0.3162f, 0.1730f, { 0.0000f, 0.0000f, 0.0000f }, 0.3162f, 0.0430f, { 0.0000f, 0.0000f, 0.0000f }, 0.2350f, 0.4800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_ALCOVE \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 2.7600f, 1.4600f, 0.2800f, 1.1220f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1610f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +/* Space Station Presets */ + +#define EFX_REVERB_PRESET_SPACESTATION_SMALLROOM \ + { 0.2109f, 0.7000f, 0.3162f, 0.7079f, 0.8913f, 1.7200f, 0.8200f, 0.5500f, 0.7943f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 0.1880f, 0.2600f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_SHORTPASSAGE \ + { 0.2109f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 3.5700f, 0.5000f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1720f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_MEDIUMROOM \ + { 0.2109f, 0.7500f, 0.3162f, 0.6310f, 0.8913f, 3.0100f, 0.5000f, 0.5500f, 0.3981f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2090f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_LARGEROOM \ + { 0.3645f, 0.8100f, 0.3162f, 0.6310f, 0.8913f, 3.8900f, 0.3800f, 0.6100f, 0.3162f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2330f, 0.2800f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_LONGPASSAGE \ + { 0.4287f, 0.8200f, 0.3162f, 0.6310f, 0.8913f, 4.6200f, 0.6200f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_HALL \ + { 0.4287f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 7.1100f, 0.3800f, 0.6100f, 0.1778f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2500f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_CUPBOARD \ + { 0.1715f, 0.5600f, 0.3162f, 0.7079f, 0.8913f, 0.7900f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1810f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_ALCOVE \ + { 0.2109f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.1600f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1920f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +/* Wooden Galleon Presets */ + +#define EFX_REVERB_PRESET_WOODEN_SMALLROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.1122f, 0.3162f, 0.7900f, 0.3200f, 0.8700f, 1.0000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_SHORTPASSAGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.7500f, 0.5000f, 0.8700f, 0.8913f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_MEDIUMROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.2818f, 1.4700f, 0.4200f, 0.8200f, 0.8913f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_LARGEROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.2818f, 2.6500f, 0.3300f, 0.8200f, 0.8913f, 0.0660f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_LONGPASSAGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.3162f, 1.9900f, 0.4000f, 0.7900f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4467f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_HALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.0794f, 0.2818f, 3.4500f, 0.3000f, 0.8200f, 0.8913f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_CUPBOARD \ + { 1.0000f, 1.0000f, 0.3162f, 0.1413f, 0.3162f, 0.5600f, 0.4600f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_COURTYARD \ + { 1.0000f, 0.6500f, 0.3162f, 0.0794f, 0.3162f, 1.7900f, 0.3500f, 0.7900f, 0.5623f, 0.1230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_ALCOVE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.2200f, 0.6200f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +/* Sports Presets */ + +#define EFX_REVERB_PRESET_SPORT_EMPTYSTADIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.4467f, 0.7943f, 6.2600f, 0.5100f, 1.1000f, 0.0631f, 0.1830f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_SQUASHCOURT \ + { 1.0000f, 0.7500f, 0.3162f, 0.3162f, 0.7943f, 2.2200f, 0.9100f, 1.1600f, 0.4467f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1260f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \ + { 1.0000f, 0.7000f, 0.3162f, 0.7943f, 0.8913f, 2.7600f, 1.2500f, 1.1400f, 0.6310f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SPORT_LARGESWIMMINGPOOL \ + { 1.0000f, 0.8200f, 0.3162f, 0.7943f, 1.0000f, 5.4900f, 1.3100f, 1.1400f, 0.4467f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2220f, 0.5500f, 1.1590f, 0.2100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SPORT_GYMNASIUM \ + { 1.0000f, 0.8100f, 0.3162f, 0.4467f, 0.8913f, 3.1400f, 1.0600f, 1.3500f, 0.3981f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0450f, { 0.0000f, 0.0000f, 0.0000f }, 0.1460f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_FULLSTADIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.0708f, 0.7943f, 5.2500f, 0.1700f, 0.8000f, 0.1000f, 0.1880f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_STADIUMTANNOY \ + { 1.0000f, 0.7800f, 0.3162f, 0.5623f, 0.5012f, 2.5300f, 0.8800f, 0.6800f, 0.2818f, 0.2300f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +/* Prefab Presets */ + +#define EFX_REVERB_PRESET_PREFAB_WORKSHOP \ + { 0.4287f, 1.0000f, 0.3162f, 0.1413f, 0.3981f, 0.7600f, 1.0000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PREFAB_SCHOOLROOM \ + { 0.4022f, 0.6900f, 0.3162f, 0.6310f, 0.5012f, 0.9800f, 0.4500f, 0.1800f, 1.4125f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PREFAB_PRACTISEROOM \ + { 0.4022f, 0.8700f, 0.3162f, 0.3981f, 0.5012f, 1.1200f, 0.5600f, 0.1800f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PREFAB_OUTHOUSE \ + { 1.0000f, 0.8200f, 0.3162f, 0.1122f, 0.1585f, 1.3800f, 0.3800f, 0.3500f, 0.8913f, 0.0240f, { 0.0000f, 0.0000f, -0.0000f }, 0.6310f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.1210f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PREFAB_CARAVAN \ + { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.1259f, 0.4300f, 1.5000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Dome and Pipe Presets */ + +#define EFX_REVERB_PRESET_DOME_TOMB \ + { 1.0000f, 0.7900f, 0.3162f, 0.3548f, 0.2239f, 4.1800f, 0.2100f, 0.1000f, 0.3868f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 1.6788f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PIPE_SMALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 5.0400f, 0.1000f, 0.1000f, 0.5012f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 2.5119f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DOME_SAINTPAULS \ + { 1.0000f, 0.8700f, 0.3162f, 0.3548f, 0.2239f, 10.4800f, 0.1900f, 0.1000f, 0.1778f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0420f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PIPE_LONGTHIN \ + { 0.2560f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 9.2100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PIPE_LARGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 8.4500f, 0.1000f, 0.1000f, 0.3981f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PIPE_RESONANT \ + { 0.1373f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 6.8100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +/* Outdoors Presets */ + +#define EFX_REVERB_PRESET_OUTDOORS_BACKYARD \ + { 1.0000f, 0.4500f, 0.3162f, 0.2512f, 0.5012f, 1.1200f, 0.3400f, 0.4600f, 0.4467f, 0.0690f, { 0.0000f, 0.0000f, -0.0000f }, 0.7079f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \ + { 1.0000f, 0.0000f, 0.3162f, 0.0112f, 0.6310f, 2.1300f, 0.2100f, 0.4600f, 0.1778f, 0.3000f, { 0.0000f, 0.0000f, -0.0000f }, 0.4467f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_DEEPCANYON \ + { 1.0000f, 0.7400f, 0.3162f, 0.1778f, 0.6310f, 3.8900f, 0.2100f, 0.4600f, 0.3162f, 0.2230f, { 0.0000f, 0.0000f, -0.0000f }, 0.3548f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_CREEK \ + { 1.0000f, 0.3500f, 0.3162f, 0.1778f, 0.5012f, 2.1300f, 0.2100f, 0.4600f, 0.3981f, 0.1150f, { 0.0000f, 0.0000f, -0.0000f }, 0.1995f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_VALLEY \ + { 1.0000f, 0.2800f, 0.3162f, 0.0282f, 0.1585f, 2.8800f, 0.2600f, 0.3500f, 0.1413f, 0.2630f, { 0.0000f, 0.0000f, -0.0000f }, 0.3981f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +/* Mood Presets */ + +#define EFX_REVERB_PRESET_MOOD_HEAVEN \ + { 1.0000f, 0.9400f, 0.3162f, 0.7943f, 0.4467f, 5.0400f, 1.1200f, 0.5600f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0800f, 2.7420f, 0.0500f, 0.9977f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_MOOD_HELL \ + { 1.0000f, 0.5700f, 0.3162f, 0.3548f, 0.4467f, 3.5700f, 0.4900f, 2.0000f, 0.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1100f, 0.0400f, 2.1090f, 0.5200f, 0.9943f, 5000.0000f, 139.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_MOOD_MEMORY \ + { 1.0000f, 0.8500f, 0.3162f, 0.6310f, 0.3548f, 4.0600f, 0.8200f, 0.5600f, 0.0398f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.4740f, 0.4500f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Driving Presets */ + +#define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \ + { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_PITGARAGE \ + { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_RACER \ + { 0.0832f, 0.8000f, 0.3162f, 1.0000f, 0.7943f, 0.1700f, 2.0000f, 0.4100f, 1.7783f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_SPORTS \ + { 0.0832f, 0.8000f, 0.3162f, 0.6310f, 1.0000f, 0.1700f, 0.7500f, 0.4100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_LUXURY \ + { 0.2560f, 1.0000f, 0.3162f, 0.1000f, 0.5012f, 0.1300f, 0.4100f, 0.4600f, 0.7943f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_FULLGRANDSTAND \ + { 1.0000f, 1.0000f, 0.3162f, 0.2818f, 0.6310f, 3.0100f, 1.3700f, 1.2800f, 0.3548f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.1778f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 0.7943f, 4.6200f, 1.7500f, 1.4000f, 0.2082f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_TUNNEL \ + { 1.0000f, 0.8100f, 0.3162f, 0.3981f, 0.8913f, 3.4200f, 0.9400f, 1.3100f, 0.7079f, 0.0510f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.0500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 155.3000f, 0.0000f, 0x1 } + +/* City Presets */ + +#define EFX_REVERB_PRESET_CITY_STREETS \ + { 1.0000f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.7900f, 1.1200f, 0.9100f, 0.2818f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 0.1995f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_SUBWAY \ + { 1.0000f, 0.7400f, 0.3162f, 0.7079f, 0.8913f, 3.0100f, 1.2300f, 0.9100f, 0.7079f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_MUSEUM \ + { 1.0000f, 0.8200f, 0.3162f, 0.1778f, 0.1778f, 3.2800f, 1.4000f, 0.5700f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CITY_LIBRARY \ + { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.0891f, 2.7600f, 0.8900f, 0.4100f, 0.3548f, 0.0290f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CITY_UNDERPASS \ + { 1.0000f, 0.8200f, 0.3162f, 0.4467f, 0.8913f, 3.5700f, 1.1200f, 0.9100f, 0.3981f, 0.0590f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1400f, 0.2500f, 0.0000f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_ABANDONED \ + { 1.0000f, 0.6900f, 0.3162f, 0.7943f, 0.8913f, 3.2800f, 1.1700f, 0.9100f, 0.4467f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9966f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +/* Misc. Presets */ + +#define EFX_REVERB_PRESET_DUSTYROOM \ + { 0.3645f, 0.5600f, 0.3162f, 0.7943f, 0.7079f, 1.7900f, 0.3800f, 0.2100f, 0.5012f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0060f, { 0.0000f, 0.0000f, 0.0000f }, 0.2020f, 0.0500f, 0.2500f, 0.0000f, 0.9886f, 13046.0000f, 163.3000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CHAPEL \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 1.0000f, 4.6200f, 0.6400f, 1.2300f, 0.4467f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.1100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SMALLWATERROOM \ + { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#endif /* EFX_PRESETS_H */ diff --git a/Externals/OpenAL/include/efx.h b/Externals/OpenAL/include/efx.h new file mode 100644 index 0000000000..57766983f6 --- /dev/null +++ b/Externals/OpenAL/include/efx.h @@ -0,0 +1,761 @@ +#ifndef AL_EFX_H +#define AL_EFX_H + + +#include "alc.h" +#include "al.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ALC_EXT_EFX_NAME "ALC_EXT_EFX" + +#define ALC_EFX_MAJOR_VERSION 0x20001 +#define ALC_EFX_MINOR_VERSION 0x20002 +#define ALC_MAX_AUXILIARY_SENDS 0x20003 + + +/* Listener properties. */ +#define AL_METERS_PER_UNIT 0x20004 + +/* Source properties. */ +#define AL_DIRECT_FILTER 0x20005 +#define AL_AUXILIARY_SEND_FILTER 0x20006 +#define AL_AIR_ABSORPTION_FACTOR 0x20007 +#define AL_ROOM_ROLLOFF_FACTOR 0x20008 +#define AL_CONE_OUTER_GAINHF 0x20009 +#define AL_DIRECT_FILTER_GAINHF_AUTO 0x2000A +#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO 0x2000B +#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO 0x2000C + + +/* Effect properties. */ + +/* Reverb effect parameters */ +#define AL_REVERB_DENSITY 0x0001 +#define AL_REVERB_DIFFUSION 0x0002 +#define AL_REVERB_GAIN 0x0003 +#define AL_REVERB_GAINHF 0x0004 +#define AL_REVERB_DECAY_TIME 0x0005 +#define AL_REVERB_DECAY_HFRATIO 0x0006 +#define AL_REVERB_REFLECTIONS_GAIN 0x0007 +#define AL_REVERB_REFLECTIONS_DELAY 0x0008 +#define AL_REVERB_LATE_REVERB_GAIN 0x0009 +#define AL_REVERB_LATE_REVERB_DELAY 0x000A +#define AL_REVERB_AIR_ABSORPTION_GAINHF 0x000B +#define AL_REVERB_ROOM_ROLLOFF_FACTOR 0x000C +#define AL_REVERB_DECAY_HFLIMIT 0x000D + +/* EAX Reverb effect parameters */ +#define AL_EAXREVERB_DENSITY 0x0001 +#define AL_EAXREVERB_DIFFUSION 0x0002 +#define AL_EAXREVERB_GAIN 0x0003 +#define AL_EAXREVERB_GAINHF 0x0004 +#define AL_EAXREVERB_GAINLF 0x0005 +#define AL_EAXREVERB_DECAY_TIME 0x0006 +#define AL_EAXREVERB_DECAY_HFRATIO 0x0007 +#define AL_EAXREVERB_DECAY_LFRATIO 0x0008 +#define AL_EAXREVERB_REFLECTIONS_GAIN 0x0009 +#define AL_EAXREVERB_REFLECTIONS_DELAY 0x000A +#define AL_EAXREVERB_REFLECTIONS_PAN 0x000B +#define AL_EAXREVERB_LATE_REVERB_GAIN 0x000C +#define AL_EAXREVERB_LATE_REVERB_DELAY 0x000D +#define AL_EAXREVERB_LATE_REVERB_PAN 0x000E +#define AL_EAXREVERB_ECHO_TIME 0x000F +#define AL_EAXREVERB_ECHO_DEPTH 0x0010 +#define AL_EAXREVERB_MODULATION_TIME 0x0011 +#define AL_EAXREVERB_MODULATION_DEPTH 0x0012 +#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF 0x0013 +#define AL_EAXREVERB_HFREFERENCE 0x0014 +#define AL_EAXREVERB_LFREFERENCE 0x0015 +#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR 0x0016 +#define AL_EAXREVERB_DECAY_HFLIMIT 0x0017 + +/* Chorus effect parameters */ +#define AL_CHORUS_WAVEFORM 0x0001 +#define AL_CHORUS_PHASE 0x0002 +#define AL_CHORUS_RATE 0x0003 +#define AL_CHORUS_DEPTH 0x0004 +#define AL_CHORUS_FEEDBACK 0x0005 +#define AL_CHORUS_DELAY 0x0006 + +/* Distortion effect parameters */ +#define AL_DISTORTION_EDGE 0x0001 +#define AL_DISTORTION_GAIN 0x0002 +#define AL_DISTORTION_LOWPASS_CUTOFF 0x0003 +#define AL_DISTORTION_EQCENTER 0x0004 +#define AL_DISTORTION_EQBANDWIDTH 0x0005 + +/* Echo effect parameters */ +#define AL_ECHO_DELAY 0x0001 +#define AL_ECHO_LRDELAY 0x0002 +#define AL_ECHO_DAMPING 0x0003 +#define AL_ECHO_FEEDBACK 0x0004 +#define AL_ECHO_SPREAD 0x0005 + +/* Flanger effect parameters */ +#define AL_FLANGER_WAVEFORM 0x0001 +#define AL_FLANGER_PHASE 0x0002 +#define AL_FLANGER_RATE 0x0003 +#define AL_FLANGER_DEPTH 0x0004 +#define AL_FLANGER_FEEDBACK 0x0005 +#define AL_FLANGER_DELAY 0x0006 + +/* Frequency shifter effect parameters */ +#define AL_FREQUENCY_SHIFTER_FREQUENCY 0x0001 +#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION 0x0002 +#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION 0x0003 + +/* Vocal morpher effect parameters */ +#define AL_VOCAL_MORPHER_PHONEMEA 0x0001 +#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING 0x0002 +#define AL_VOCAL_MORPHER_PHONEMEB 0x0003 +#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING 0x0004 +#define AL_VOCAL_MORPHER_WAVEFORM 0x0005 +#define AL_VOCAL_MORPHER_RATE 0x0006 + +/* Pitchshifter effect parameters */ +#define AL_PITCH_SHIFTER_COARSE_TUNE 0x0001 +#define AL_PITCH_SHIFTER_FINE_TUNE 0x0002 + +/* Ringmodulator effect parameters */ +#define AL_RING_MODULATOR_FREQUENCY 0x0001 +#define AL_RING_MODULATOR_HIGHPASS_CUTOFF 0x0002 +#define AL_RING_MODULATOR_WAVEFORM 0x0003 + +/* Autowah effect parameters */ +#define AL_AUTOWAH_ATTACK_TIME 0x0001 +#define AL_AUTOWAH_RELEASE_TIME 0x0002 +#define AL_AUTOWAH_RESONANCE 0x0003 +#define AL_AUTOWAH_PEAK_GAIN 0x0004 + +/* Compressor effect parameters */ +#define AL_COMPRESSOR_ONOFF 0x0001 + +/* Equalizer effect parameters */ +#define AL_EQUALIZER_LOW_GAIN 0x0001 +#define AL_EQUALIZER_LOW_CUTOFF 0x0002 +#define AL_EQUALIZER_MID1_GAIN 0x0003 +#define AL_EQUALIZER_MID1_CENTER 0x0004 +#define AL_EQUALIZER_MID1_WIDTH 0x0005 +#define AL_EQUALIZER_MID2_GAIN 0x0006 +#define AL_EQUALIZER_MID2_CENTER 0x0007 +#define AL_EQUALIZER_MID2_WIDTH 0x0008 +#define AL_EQUALIZER_HIGH_GAIN 0x0009 +#define AL_EQUALIZER_HIGH_CUTOFF 0x000A + +/* Effect type */ +#define AL_EFFECT_FIRST_PARAMETER 0x0000 +#define AL_EFFECT_LAST_PARAMETER 0x8000 +#define AL_EFFECT_TYPE 0x8001 + +/* Effect types, used with the AL_EFFECT_TYPE property */ +#define AL_EFFECT_NULL 0x0000 +#define AL_EFFECT_REVERB 0x0001 +#define AL_EFFECT_CHORUS 0x0002 +#define AL_EFFECT_DISTORTION 0x0003 +#define AL_EFFECT_ECHO 0x0004 +#define AL_EFFECT_FLANGER 0x0005 +#define AL_EFFECT_FREQUENCY_SHIFTER 0x0006 +#define AL_EFFECT_VOCAL_MORPHER 0x0007 +#define AL_EFFECT_PITCH_SHIFTER 0x0008 +#define AL_EFFECT_RING_MODULATOR 0x0009 +#define AL_EFFECT_AUTOWAH 0x000A +#define AL_EFFECT_COMPRESSOR 0x000B +#define AL_EFFECT_EQUALIZER 0x000C +#define AL_EFFECT_EAXREVERB 0x8000 + +/* Auxiliary Effect Slot properties. */ +#define AL_EFFECTSLOT_EFFECT 0x0001 +#define AL_EFFECTSLOT_GAIN 0x0002 +#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO 0x0003 + +/* NULL Auxiliary Slot ID to disable a source send. */ +#define AL_EFFECTSLOT_NULL 0x0000 + + +/* Filter properties. */ + +/* Lowpass filter parameters */ +#define AL_LOWPASS_GAIN 0x0001 +#define AL_LOWPASS_GAINHF 0x0002 + +/* Highpass filter parameters */ +#define AL_HIGHPASS_GAIN 0x0001 +#define AL_HIGHPASS_GAINLF 0x0002 + +/* Bandpass filter parameters */ +#define AL_BANDPASS_GAIN 0x0001 +#define AL_BANDPASS_GAINLF 0x0002 +#define AL_BANDPASS_GAINHF 0x0003 + +/* Filter type */ +#define AL_FILTER_FIRST_PARAMETER 0x0000 +#define AL_FILTER_LAST_PARAMETER 0x8000 +#define AL_FILTER_TYPE 0x8001 + +/* Filter types, used with the AL_FILTER_TYPE property */ +#define AL_FILTER_NULL 0x0000 +#define AL_FILTER_LOWPASS 0x0001 +#define AL_FILTER_HIGHPASS 0x0002 +#define AL_FILTER_BANDPASS 0x0003 + + +/* Effect object function types. */ +typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint); +typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*); + +/* Filter object function types. */ +typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint); +typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*); + +/* Auxiliary Effect Slot object function types. */ +typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*); + +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects); +AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects); +AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect); +AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues); + +AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters); +AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters); +AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter); +AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues); + +AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots); +AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots); +AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues); +#endif + +/* Filter ranges and defaults. */ + +/* Lowpass filter */ +#define AL_LOWPASS_MIN_GAIN (0.0f) +#define AL_LOWPASS_MAX_GAIN (1.0f) +#define AL_LOWPASS_DEFAULT_GAIN (1.0f) + +#define AL_LOWPASS_MIN_GAINHF (0.0f) +#define AL_LOWPASS_MAX_GAINHF (1.0f) +#define AL_LOWPASS_DEFAULT_GAINHF (1.0f) + +/* Highpass filter */ +#define AL_HIGHPASS_MIN_GAIN (0.0f) +#define AL_HIGHPASS_MAX_GAIN (1.0f) +#define AL_HIGHPASS_DEFAULT_GAIN (1.0f) + +#define AL_HIGHPASS_MIN_GAINLF (0.0f) +#define AL_HIGHPASS_MAX_GAINLF (1.0f) +#define AL_HIGHPASS_DEFAULT_GAINLF (1.0f) + +/* Bandpass filter */ +#define AL_BANDPASS_MIN_GAIN (0.0f) +#define AL_BANDPASS_MAX_GAIN (1.0f) +#define AL_BANDPASS_DEFAULT_GAIN (1.0f) + +#define AL_BANDPASS_MIN_GAINHF (0.0f) +#define AL_BANDPASS_MAX_GAINHF (1.0f) +#define AL_BANDPASS_DEFAULT_GAINHF (1.0f) + +#define AL_BANDPASS_MIN_GAINLF (0.0f) +#define AL_BANDPASS_MAX_GAINLF (1.0f) +#define AL_BANDPASS_DEFAULT_GAINLF (1.0f) + + +/* Effect parameter ranges and defaults. */ + +/* Standard reverb effect */ +#define AL_REVERB_MIN_DENSITY (0.0f) +#define AL_REVERB_MAX_DENSITY (1.0f) +#define AL_REVERB_DEFAULT_DENSITY (1.0f) + +#define AL_REVERB_MIN_DIFFUSION (0.0f) +#define AL_REVERB_MAX_DIFFUSION (1.0f) +#define AL_REVERB_DEFAULT_DIFFUSION (1.0f) + +#define AL_REVERB_MIN_GAIN (0.0f) +#define AL_REVERB_MAX_GAIN (1.0f) +#define AL_REVERB_DEFAULT_GAIN (0.32f) + +#define AL_REVERB_MIN_GAINHF (0.0f) +#define AL_REVERB_MAX_GAINHF (1.0f) +#define AL_REVERB_DEFAULT_GAINHF (0.89f) + +#define AL_REVERB_MIN_DECAY_TIME (0.1f) +#define AL_REVERB_MAX_DECAY_TIME (20.0f) +#define AL_REVERB_DEFAULT_DECAY_TIME (1.49f) + +#define AL_REVERB_MIN_DECAY_HFRATIO (0.1f) +#define AL_REVERB_MAX_DECAY_HFRATIO (2.0f) +#define AL_REVERB_DEFAULT_DECAY_HFRATIO (0.83f) + +#define AL_REVERB_MIN_REFLECTIONS_GAIN (0.0f) +#define AL_REVERB_MAX_REFLECTIONS_GAIN (3.16f) +#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN (0.05f) + +#define AL_REVERB_MIN_REFLECTIONS_DELAY (0.0f) +#define AL_REVERB_MAX_REFLECTIONS_DELAY (0.3f) +#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY (0.007f) + +#define AL_REVERB_MIN_LATE_REVERB_GAIN (0.0f) +#define AL_REVERB_MAX_LATE_REVERB_GAIN (10.0f) +#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN (1.26f) + +#define AL_REVERB_MIN_LATE_REVERB_DELAY (0.0f) +#define AL_REVERB_MAX_LATE_REVERB_DELAY (0.1f) +#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY (0.011f) + +#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f) +#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f) +#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f) + +#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) + +#define AL_REVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_REVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_REVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE + +/* EAX reverb effect */ +#define AL_EAXREVERB_MIN_DENSITY (0.0f) +#define AL_EAXREVERB_MAX_DENSITY (1.0f) +#define AL_EAXREVERB_DEFAULT_DENSITY (1.0f) + +#define AL_EAXREVERB_MIN_DIFFUSION (0.0f) +#define AL_EAXREVERB_MAX_DIFFUSION (1.0f) +#define AL_EAXREVERB_DEFAULT_DIFFUSION (1.0f) + +#define AL_EAXREVERB_MIN_GAIN (0.0f) +#define AL_EAXREVERB_MAX_GAIN (1.0f) +#define AL_EAXREVERB_DEFAULT_GAIN (0.32f) + +#define AL_EAXREVERB_MIN_GAINHF (0.0f) +#define AL_EAXREVERB_MAX_GAINHF (1.0f) +#define AL_EAXREVERB_DEFAULT_GAINHF (0.89f) + +#define AL_EAXREVERB_MIN_GAINLF (0.0f) +#define AL_EAXREVERB_MAX_GAINLF (1.0f) +#define AL_EAXREVERB_DEFAULT_GAINLF (1.0f) + +#define AL_EAXREVERB_MIN_DECAY_TIME (0.1f) +#define AL_EAXREVERB_MAX_DECAY_TIME (20.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_TIME (1.49f) + +#define AL_EAXREVERB_MIN_DECAY_HFRATIO (0.1f) +#define AL_EAXREVERB_MAX_DECAY_HFRATIO (2.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO (0.83f) + +#define AL_EAXREVERB_MIN_DECAY_LFRATIO (0.1f) +#define AL_EAXREVERB_MAX_DECAY_LFRATIO (2.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO (1.0f) + +#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN (0.0f) +#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN (3.16f) +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN (0.05f) + +#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY (0.0f) +#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY (0.3f) +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY (0.007f) + +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN_XYZ (0.0f) + +#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN (0.0f) +#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN (10.0f) +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN (1.26f) + +#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY (0.0f) +#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY (0.1f) +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY (0.011f) + +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN_XYZ (0.0f) + +#define AL_EAXREVERB_MIN_ECHO_TIME (0.075f) +#define AL_EAXREVERB_MAX_ECHO_TIME (0.25f) +#define AL_EAXREVERB_DEFAULT_ECHO_TIME (0.25f) + +#define AL_EAXREVERB_MIN_ECHO_DEPTH (0.0f) +#define AL_EAXREVERB_MAX_ECHO_DEPTH (1.0f) +#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH (0.0f) + +#define AL_EAXREVERB_MIN_MODULATION_TIME (0.04f) +#define AL_EAXREVERB_MAX_MODULATION_TIME (4.0f) +#define AL_EAXREVERB_DEFAULT_MODULATION_TIME (0.25f) + +#define AL_EAXREVERB_MIN_MODULATION_DEPTH (0.0f) +#define AL_EAXREVERB_MAX_MODULATION_DEPTH (1.0f) +#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH (0.0f) + +#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f) +#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f) +#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f) + +#define AL_EAXREVERB_MIN_HFREFERENCE (1000.0f) +#define AL_EAXREVERB_MAX_HFREFERENCE (20000.0f) +#define AL_EAXREVERB_DEFAULT_HFREFERENCE (5000.0f) + +#define AL_EAXREVERB_MIN_LFREFERENCE (20.0f) +#define AL_EAXREVERB_MAX_LFREFERENCE (1000.0f) +#define AL_EAXREVERB_DEFAULT_LFREFERENCE (250.0f) + +#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) + +#define AL_EAXREVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_EAXREVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE + +/* Chorus effect */ +#define AL_CHORUS_WAVEFORM_SINUSOID (0) +#define AL_CHORUS_WAVEFORM_TRIANGLE (1) + +#define AL_CHORUS_MIN_WAVEFORM (0) +#define AL_CHORUS_MAX_WAVEFORM (1) +#define AL_CHORUS_DEFAULT_WAVEFORM (1) + +#define AL_CHORUS_MIN_PHASE (-180) +#define AL_CHORUS_MAX_PHASE (180) +#define AL_CHORUS_DEFAULT_PHASE (90) + +#define AL_CHORUS_MIN_RATE (0.0f) +#define AL_CHORUS_MAX_RATE (10.0f) +#define AL_CHORUS_DEFAULT_RATE (1.1f) + +#define AL_CHORUS_MIN_DEPTH (0.0f) +#define AL_CHORUS_MAX_DEPTH (1.0f) +#define AL_CHORUS_DEFAULT_DEPTH (0.1f) + +#define AL_CHORUS_MIN_FEEDBACK (-1.0f) +#define AL_CHORUS_MAX_FEEDBACK (1.0f) +#define AL_CHORUS_DEFAULT_FEEDBACK (0.25f) + +#define AL_CHORUS_MIN_DELAY (0.0f) +#define AL_CHORUS_MAX_DELAY (0.016f) +#define AL_CHORUS_DEFAULT_DELAY (0.016f) + +/* Distortion effect */ +#define AL_DISTORTION_MIN_EDGE (0.0f) +#define AL_DISTORTION_MAX_EDGE (1.0f) +#define AL_DISTORTION_DEFAULT_EDGE (0.2f) + +#define AL_DISTORTION_MIN_GAIN (0.01f) +#define AL_DISTORTION_MAX_GAIN (1.0f) +#define AL_DISTORTION_DEFAULT_GAIN (0.05f) + +#define AL_DISTORTION_MIN_LOWPASS_CUTOFF (80.0f) +#define AL_DISTORTION_MAX_LOWPASS_CUTOFF (24000.0f) +#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF (8000.0f) + +#define AL_DISTORTION_MIN_EQCENTER (80.0f) +#define AL_DISTORTION_MAX_EQCENTER (24000.0f) +#define AL_DISTORTION_DEFAULT_EQCENTER (3600.0f) + +#define AL_DISTORTION_MIN_EQBANDWIDTH (80.0f) +#define AL_DISTORTION_MAX_EQBANDWIDTH (24000.0f) +#define AL_DISTORTION_DEFAULT_EQBANDWIDTH (3600.0f) + +/* Echo effect */ +#define AL_ECHO_MIN_DELAY (0.0f) +#define AL_ECHO_MAX_DELAY (0.207f) +#define AL_ECHO_DEFAULT_DELAY (0.1f) + +#define AL_ECHO_MIN_LRDELAY (0.0f) +#define AL_ECHO_MAX_LRDELAY (0.404f) +#define AL_ECHO_DEFAULT_LRDELAY (0.1f) + +#define AL_ECHO_MIN_DAMPING (0.0f) +#define AL_ECHO_MAX_DAMPING (0.99f) +#define AL_ECHO_DEFAULT_DAMPING (0.5f) + +#define AL_ECHO_MIN_FEEDBACK (0.0f) +#define AL_ECHO_MAX_FEEDBACK (1.0f) +#define AL_ECHO_DEFAULT_FEEDBACK (0.5f) + +#define AL_ECHO_MIN_SPREAD (-1.0f) +#define AL_ECHO_MAX_SPREAD (1.0f) +#define AL_ECHO_DEFAULT_SPREAD (-1.0f) + +/* Flanger effect */ +#define AL_FLANGER_WAVEFORM_SINUSOID (0) +#define AL_FLANGER_WAVEFORM_TRIANGLE (1) + +#define AL_FLANGER_MIN_WAVEFORM (0) +#define AL_FLANGER_MAX_WAVEFORM (1) +#define AL_FLANGER_DEFAULT_WAVEFORM (1) + +#define AL_FLANGER_MIN_PHASE (-180) +#define AL_FLANGER_MAX_PHASE (180) +#define AL_FLANGER_DEFAULT_PHASE (0) + +#define AL_FLANGER_MIN_RATE (0.0f) +#define AL_FLANGER_MAX_RATE (10.0f) +#define AL_FLANGER_DEFAULT_RATE (0.27f) + +#define AL_FLANGER_MIN_DEPTH (0.0f) +#define AL_FLANGER_MAX_DEPTH (1.0f) +#define AL_FLANGER_DEFAULT_DEPTH (1.0f) + +#define AL_FLANGER_MIN_FEEDBACK (-1.0f) +#define AL_FLANGER_MAX_FEEDBACK (1.0f) +#define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f) + +#define AL_FLANGER_MIN_DELAY (0.0f) +#define AL_FLANGER_MAX_DELAY (0.004f) +#define AL_FLANGER_DEFAULT_DELAY (0.002f) + +/* Frequency shifter effect */ +#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY (0.0f) +#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY (24000.0f) +#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY (0.0f) + +#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION (0) +#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION (2) +#define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION (0) + +#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN (0) +#define AL_FREQUENCY_SHIFTER_DIRECTION_UP (1) +#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF (2) + +#define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION (0) +#define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION (2) +#define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION (0) + +/* Vocal morpher effect */ +#define AL_VOCAL_MORPHER_MIN_PHONEMEA (0) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA (29) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA (0) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING (24) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING (0) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB (0) +#define AL_VOCAL_MORPHER_MAX_PHONEMEB (29) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB (10) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING (24) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING (0) + +#define AL_VOCAL_MORPHER_PHONEME_A (0) +#define AL_VOCAL_MORPHER_PHONEME_E (1) +#define AL_VOCAL_MORPHER_PHONEME_I (2) +#define AL_VOCAL_MORPHER_PHONEME_O (3) +#define AL_VOCAL_MORPHER_PHONEME_U (4) +#define AL_VOCAL_MORPHER_PHONEME_AA (5) +#define AL_VOCAL_MORPHER_PHONEME_AE (6) +#define AL_VOCAL_MORPHER_PHONEME_AH (7) +#define AL_VOCAL_MORPHER_PHONEME_AO (8) +#define AL_VOCAL_MORPHER_PHONEME_EH (9) +#define AL_VOCAL_MORPHER_PHONEME_ER (10) +#define AL_VOCAL_MORPHER_PHONEME_IH (11) +#define AL_VOCAL_MORPHER_PHONEME_IY (12) +#define AL_VOCAL_MORPHER_PHONEME_UH (13) +#define AL_VOCAL_MORPHER_PHONEME_UW (14) +#define AL_VOCAL_MORPHER_PHONEME_B (15) +#define AL_VOCAL_MORPHER_PHONEME_D (16) +#define AL_VOCAL_MORPHER_PHONEME_F (17) +#define AL_VOCAL_MORPHER_PHONEME_G (18) +#define AL_VOCAL_MORPHER_PHONEME_J (19) +#define AL_VOCAL_MORPHER_PHONEME_K (20) +#define AL_VOCAL_MORPHER_PHONEME_L (21) +#define AL_VOCAL_MORPHER_PHONEME_M (22) +#define AL_VOCAL_MORPHER_PHONEME_N (23) +#define AL_VOCAL_MORPHER_PHONEME_P (24) +#define AL_VOCAL_MORPHER_PHONEME_R (25) +#define AL_VOCAL_MORPHER_PHONEME_S (26) +#define AL_VOCAL_MORPHER_PHONEME_T (27) +#define AL_VOCAL_MORPHER_PHONEME_V (28) +#define AL_VOCAL_MORPHER_PHONEME_Z (29) + +#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID (0) +#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE (1) +#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH (2) + +#define AL_VOCAL_MORPHER_MIN_WAVEFORM (0) +#define AL_VOCAL_MORPHER_MAX_WAVEFORM (2) +#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM (0) + +#define AL_VOCAL_MORPHER_MIN_RATE (0.0f) +#define AL_VOCAL_MORPHER_MAX_RATE (10.0f) +#define AL_VOCAL_MORPHER_DEFAULT_RATE (1.41f) + +/* Pitch shifter effect */ +#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE (-12) +#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE (12) +#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE (12) + +#define AL_PITCH_SHIFTER_MIN_FINE_TUNE (-50) +#define AL_PITCH_SHIFTER_MAX_FINE_TUNE (50) +#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE (0) + +/* Ring modulator effect */ +#define AL_RING_MODULATOR_MIN_FREQUENCY (0.0f) +#define AL_RING_MODULATOR_MAX_FREQUENCY (8000.0f) +#define AL_RING_MODULATOR_DEFAULT_FREQUENCY (440.0f) + +#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF (0.0f) +#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF (24000.0f) +#define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF (800.0f) + +#define AL_RING_MODULATOR_SINUSOID (0) +#define AL_RING_MODULATOR_SAWTOOTH (1) +#define AL_RING_MODULATOR_SQUARE (2) + +#define AL_RING_MODULATOR_MIN_WAVEFORM (0) +#define AL_RING_MODULATOR_MAX_WAVEFORM (2) +#define AL_RING_MODULATOR_DEFAULT_WAVEFORM (0) + +/* Autowah effect */ +#define AL_AUTOWAH_MIN_ATTACK_TIME (0.0001f) +#define AL_AUTOWAH_MAX_ATTACK_TIME (1.0f) +#define AL_AUTOWAH_DEFAULT_ATTACK_TIME (0.06f) + +#define AL_AUTOWAH_MIN_RELEASE_TIME (0.0001f) +#define AL_AUTOWAH_MAX_RELEASE_TIME (1.0f) +#define AL_AUTOWAH_DEFAULT_RELEASE_TIME (0.06f) + +#define AL_AUTOWAH_MIN_RESONANCE (2.0f) +#define AL_AUTOWAH_MAX_RESONANCE (1000.0f) +#define AL_AUTOWAH_DEFAULT_RESONANCE (1000.0f) + +#define AL_AUTOWAH_MIN_PEAK_GAIN (0.00003f) +#define AL_AUTOWAH_MAX_PEAK_GAIN (31621.0f) +#define AL_AUTOWAH_DEFAULT_PEAK_GAIN (11.22f) + +/* Compressor effect */ +#define AL_COMPRESSOR_MIN_ONOFF (0) +#define AL_COMPRESSOR_MAX_ONOFF (1) +#define AL_COMPRESSOR_DEFAULT_ONOFF (1) + +/* Equalizer effect */ +#define AL_EQUALIZER_MIN_LOW_GAIN (0.126f) +#define AL_EQUALIZER_MAX_LOW_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_LOW_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_LOW_CUTOFF (50.0f) +#define AL_EQUALIZER_MAX_LOW_CUTOFF (800.0f) +#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF (200.0f) + +#define AL_EQUALIZER_MIN_MID1_GAIN (0.126f) +#define AL_EQUALIZER_MAX_MID1_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_MID1_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_MID1_CENTER (200.0f) +#define AL_EQUALIZER_MAX_MID1_CENTER (3000.0f) +#define AL_EQUALIZER_DEFAULT_MID1_CENTER (500.0f) + +#define AL_EQUALIZER_MIN_MID1_WIDTH (0.01f) +#define AL_EQUALIZER_MAX_MID1_WIDTH (1.0f) +#define AL_EQUALIZER_DEFAULT_MID1_WIDTH (1.0f) + +#define AL_EQUALIZER_MIN_MID2_GAIN (0.126f) +#define AL_EQUALIZER_MAX_MID2_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_MID2_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_MID2_CENTER (1000.0f) +#define AL_EQUALIZER_MAX_MID2_CENTER (8000.0f) +#define AL_EQUALIZER_DEFAULT_MID2_CENTER (3000.0f) + +#define AL_EQUALIZER_MIN_MID2_WIDTH (0.01f) +#define AL_EQUALIZER_MAX_MID2_WIDTH (1.0f) +#define AL_EQUALIZER_DEFAULT_MID2_WIDTH (1.0f) + +#define AL_EQUALIZER_MIN_HIGH_GAIN (0.126f) +#define AL_EQUALIZER_MAX_HIGH_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_HIGH_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_HIGH_CUTOFF (4000.0f) +#define AL_EQUALIZER_MAX_HIGH_CUTOFF (16000.0f) +#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF (6000.0f) + + +/* Source parameter value ranges and defaults. */ +#define AL_MIN_AIR_ABSORPTION_FACTOR (0.0f) +#define AL_MAX_AIR_ABSORPTION_FACTOR (10.0f) +#define AL_DEFAULT_AIR_ABSORPTION_FACTOR (0.0f) + +#define AL_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) + +#define AL_MIN_CONE_OUTER_GAINHF (0.0f) +#define AL_MAX_CONE_OUTER_GAINHF (1.0f) +#define AL_DEFAULT_CONE_OUTER_GAINHF (1.0f) + +#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO AL_TRUE + +#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE + +#define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE + + +/* Listener parameter value ranges and defaults. */ +#define AL_MIN_METERS_PER_UNIT FLT_MIN +#define AL_MAX_METERS_PER_UNIT FLT_MAX +#define AL_DEFAULT_METERS_PER_UNIT (1.0f) + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* AL_EFX_H */ diff --git a/Externals/OpenAL/include/xram.h b/Externals/OpenAL/include/xram.h new file mode 100644 index 0000000000..cfff054329 --- /dev/null +++ b/Externals/OpenAL/include/xram.h @@ -0,0 +1,94 @@ +#include + +// X-RAM Function pointer definitions +typedef ALboolean (__cdecl *EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value); +typedef ALenum (__cdecl *EAXGetBufferMode)(ALuint buffer, ALint *value); + +////////////////////////////////////////////////////////////////////////////// +// Query for X-RAM extension +// +// if (alIsExtensionPresent("EAX-RAM") == AL_TRUE) +// X-RAM Extension found +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// X-RAM enum names +// +// "AL_EAX_RAM_SIZE" +// "AL_EAX_RAM_FREE" +// "AL_STORAGE_AUTOMATIC" +// "AL_STORAGE_HARDWARE" +// "AL_STORAGE_ACCESSIBLE" +// +// Query enum values using alGetEnumValue, for example +// +// long lRamSizeEnum = alGetEnumValue("AL_EAX_RAM_SIZE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query total amount of X-RAM +// +// long lTotalSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_SIZE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query free X-RAM available +// +// long lFreeSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_FREE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query X-RAM Function pointers +// +// Use typedefs defined above to get the X-RAM function pointers using +// alGetProcAddress +// +// EAXSetBufferMode eaxSetBufferMode; +// EAXGetBufferMode eaxGetBufferMode; +// +// eaxSetBufferMode = (EAXSetBufferMode)alGetProcAddress("EAXSetBufferMode"); +// eaxGetBufferMode = (EAXGetBufferMode)alGetProcAddress("EAXGetBufferMode"); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Force an Open AL Buffer into X-RAM (good for non-streaming buffers) +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_HARDWARE")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Force an Open AL Buffer into 'accessible' (currently host) RAM (good for streaming buffers) +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_ACCESSIBLE")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Put an Open AL Buffer into X-RAM if memory is available, otherwise use +// host RAM. This is the default mode. +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_AUTOMATIC")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// diff --git a/Externals/SOIL/stb_image_aug.c b/Externals/SOIL/stb_image_aug.c index 2bbb50b1bf..450d6c4b8c 100644 --- a/Externals/SOIL/stb_image_aug.c +++ b/Externals/SOIL/stb_image_aug.c @@ -2394,6 +2394,7 @@ static int parse_png_file(png *z, int scan, int req_comp) // if critical, fail if ((c.type & (1 << 29)) == 0) { #ifndef STBI_NO_FAILURE_STRINGS + #ifndef STBI_FAILURE_USERMSG // not threadsafe static char invalid_chunk[] = "XXXX chunk not known"; invalid_chunk[0] = (uint8) (c.type >> 24); @@ -2401,6 +2402,7 @@ static int parse_png_file(png *z, int scan, int req_comp) invalid_chunk[2] = (uint8) (c.type >> 8); invalid_chunk[3] = (uint8) (c.type >> 0); #endif + #endif return e(invalid_chunk, "PNG not supported: unknown chunk type"); } skip(s, c.length); @@ -2584,7 +2586,7 @@ static int shiftsigned(int v, int shift, int bits) static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp) { uint8 *out; - unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0; + unsigned int mr=0,mg=0,mb=0,ma=0; stbi_uc pal[256][4]; int psize=0,i,j,compress=0,width; int bpp, flip_vertically, pad, target, offset, hsz; @@ -2634,7 +2636,6 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp) mg = 0xff << 8; mb = 0xff << 0; ma = 0xff << 24; - fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255 } else { mr = 31 << 10; mg = 31 << 5; diff --git a/Externals/soundtouch/AAFilter.cpp b/Externals/soundtouch/AAFilter.cpp new file mode 100644 index 0000000000..f099bced93 --- /dev/null +++ b/Externals/soundtouch/AAFilter.cpp @@ -0,0 +1,184 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// FIR low-pass (anti-alias) filter with filter coefficient design routine and +/// MMX optimization. +/// +/// Anti-alias filter is used to prevent folding of high frequencies when +/// transposing the sample rate with interpolation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2009-01-11 13:34:24 +0200 (Sun, 11 Jan 2009) $ +// File revision : $Revision: 4 $ +// +// $Id: AAFilter.cpp 45 2009-01-11 11:34:24Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "AAFilter.h" +#include "FIRFilter.h" + +using namespace soundtouch; + +#define PI 3.141592655357989 +#define TWOPI (2 * PI) + +/***************************************************************************** + * + * Implementation of the class 'AAFilter' + * + *****************************************************************************/ + +AAFilter::AAFilter(uint len) +{ + pFIR = FIRFilter::newInstance(); + cutoffFreq = 0.5; + setLength(len); +} + + + +AAFilter::~AAFilter() +{ + delete pFIR; +} + + + +// Sets new anti-alias filter cut-off edge frequency, scaled to +// sampling frequency (nyquist frequency = 0.5). +// The filter will cut frequencies higher than the given frequency. +void AAFilter::setCutoffFreq(double newCutoffFreq) +{ + cutoffFreq = newCutoffFreq; + calculateCoeffs(); +} + + + +// Sets number of FIR filter taps +void AAFilter::setLength(uint newLength) +{ + length = newLength; + calculateCoeffs(); +} + + + +// Calculates coefficients for a low-pass FIR filter using Hamming window +void AAFilter::calculateCoeffs() +{ + uint i; + double cntTemp, temp, tempCoeff,h, w; + double fc2, wc; + double scaleCoeff, sum; + double *work; + SAMPLETYPE *coeffs; + + assert(length >= 2); + assert(length % 4 == 0); + assert(cutoffFreq >= 0); + assert(cutoffFreq <= 0.5); + + work = new double[length]; + coeffs = new SAMPLETYPE[length]; + + fc2 = 2.0 * cutoffFreq; + wc = PI * fc2; + tempCoeff = TWOPI / (double)length; + + sum = 0; + for (i = 0; i < length; i ++) + { + cntTemp = (double)i - (double)(length / 2); + + temp = cntTemp * wc; + if (temp != 0) + { + h = fc2 * sin(temp) / temp; // sinc function + } + else + { + h = 1.0; + } + w = 0.54 + 0.46 * cos(tempCoeff * cntTemp); // hamming window + + temp = w * h; + work[i] = temp; + + // calc net sum of coefficients + sum += temp; + } + + // ensure the sum of coefficients is larger than zero + assert(sum > 0); + + // ensure we've really designed a lowpass filter... + assert(work[length/2] > 0); + assert(work[length/2 + 1] > -1e-6); + assert(work[length/2 - 1] > -1e-6); + + // Calculate a scaling coefficient in such a way that the result can be + // divided by 16384 + scaleCoeff = 16384.0f / sum; + + for (i = 0; i < length; i ++) + { + // scale & round to nearest integer + temp = work[i] * scaleCoeff; + temp += (temp >= 0) ? 0.5 : -0.5; + // ensure no overfloods + assert(temp >= -32768 && temp <= 32767); + coeffs[i] = (SAMPLETYPE)temp; + } + + // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384 + pFIR->setCoefficients(coeffs, length, 14); + + delete[] work; + delete[] coeffs; +} + + +// Applies the filter to the given sequence of samples. +// Note : The amount of outputted samples is by value of 'filter length' +// smaller than the amount of input samples. +uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const +{ + return pFIR->evaluate(dest, src, numSamples, numChannels); +} + + +uint AAFilter::getLength() const +{ + return pFIR->getLength(); +} diff --git a/Externals/soundtouch/AAFilter.h b/Externals/soundtouch/AAFilter.h new file mode 100644 index 0000000000..d0997570d3 --- /dev/null +++ b/Externals/soundtouch/AAFilter.h @@ -0,0 +1,91 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like method +/// with several performance-increasing tweaks. +/// +/// Anti-alias filter is used to prevent folding of high frequencies when +/// transposing the sample rate with interpolation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $ +// File revision : $Revision: 4 $ +// +// $Id: AAFilter.h 11 2008-02-10 16:26:55Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef AAFilter_H +#define AAFilter_H + +#include "STTypes.h" + +namespace soundtouch +{ + +class AAFilter +{ +protected: + class FIRFilter *pFIR; + + /// Low-pass filter cut-off frequency, negative = invalid + double cutoffFreq; + + /// num of filter taps + uint length; + + /// Calculate the FIR coefficients realizing the given cutoff-frequency + void calculateCoeffs(); +public: + AAFilter(uint length); + + ~AAFilter(); + + /// Sets new anti-alias filter cut-off edge frequency, scaled to sampling + /// frequency (nyquist frequency = 0.5). The filter will cut off the + /// frequencies than that. + void setCutoffFreq(double newCutoffFreq); + + /// Sets number of FIR filter taps, i.e. ~filter complexity + void setLength(uint newLength); + + uint getLength() const; + + /// Applies the filter to the given sequence of samples. + /// Note : The amount of outputted samples is by value of 'filter length' + /// smaller than the amount of input samples. + uint evaluate(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples, + uint numChannels) const; +}; + +} + +#endif diff --git a/Externals/soundtouch/BPMDetect.cpp b/Externals/soundtouch/BPMDetect.cpp new file mode 100644 index 0000000000..a48cbd97c3 --- /dev/null +++ b/Externals/soundtouch/BPMDetect.cpp @@ -0,0 +1,370 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Beats-per-minute (BPM) detection routine. +/// +/// The beat detection algorithm works as follows: +/// - Use function 'inputSamples' to input a chunks of samples to the class for +/// analysis. It's a good idea to enter a large sound file or stream in smallish +/// chunks of around few kilosamples in order not to extinguish too much RAM memory. +/// - Inputted sound data is decimated to approx 500 Hz to reduce calculation burden, +/// which is basically ok as low (bass) frequencies mostly determine the beat rate. +/// Simple averaging is used for anti-alias filtering because the resulting signal +/// quality isn't of that high importance. +/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by +/// taking absolute value that's smoothed by sliding average. Signal levels that +/// are below a couple of times the general RMS amplitude level are cut away to +/// leave only notable peaks there. +/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term +/// autocorrelation function of the enveloped signal. +/// - After whole sound data file has been analyzed as above, the bpm level is +/// detected by function 'getBpm' that finds the highest peak of the autocorrelation +/// function, calculates it's precise location and converts this reading to bpm's. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-08-30 22:45:25 +0300 (Thu, 30 Aug 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: BPMDetect.cpp 149 2012-08-30 19:45:25Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "FIFOSampleBuffer.h" +#include "PeakFinder.h" +#include "BPMDetect.h" + +using namespace soundtouch; + +#define INPUT_BLOCK_SAMPLES 2048 +#define DECIMATED_BLOCK_SAMPLES 256 + +/// decay constant for calculating RMS volume sliding average approximation +/// (time constant is about 10 sec) +const float avgdecay = 0.99986f; + +/// Normalization coefficient for calculating RMS sliding average approximation. +const float avgnorm = (1 - avgdecay); + + +//////////////////////////////////////////////////////////////////////////////// + +// Enable following define to create bpm analysis file: + +// #define _CREATE_BPM_DEBUG_FILE + +#ifdef _CREATE_BPM_DEBUG_FILE + + #define DEBUGFILE_NAME "c:\\temp\\soundtouch-bpm-debug.txt" + + static void _SaveDebugData(const float *data, int minpos, int maxpos, double coeff) + { + FILE *fptr = fopen(DEBUGFILE_NAME, "wt"); + int i; + + if (fptr) + { + printf("\n\nWriting BPM debug data into file " DEBUGFILE_NAME "\n\n"); + for (i = minpos; i < maxpos; i ++) + { + fprintf(fptr, "%d\t%.1lf\t%f\n", i, coeff / (double)i, data[i]); + } + fclose(fptr); + } + } +#else + #define _SaveDebugData(a,b,c,d) +#endif + +//////////////////////////////////////////////////////////////////////////////// + + +BPMDetect::BPMDetect(int numChannels, int aSampleRate) +{ + this->sampleRate = aSampleRate; + this->channels = numChannels; + + decimateSum = 0; + decimateCount = 0; + + envelopeAccu = 0; + + // Initialize RMS volume accumulator to RMS level of 1500 (out of 32768) that's + // safe initial RMS signal level value for song data. This value is then adapted + // to the actual level during processing. +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // integer samples + RMSVolumeAccu = (1500 * 1500) / avgnorm; +#else + // float samples, scaled to range [-1..+1[ + RMSVolumeAccu = (0.045f * 0.045f) / avgnorm; +#endif + + // choose decimation factor so that result is approx. 1000 Hz + decimateBy = sampleRate / 1000; + assert(decimateBy > 0); + assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES); + + // Calculate window length & starting item according to desired min & max bpms + windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM); + windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM); + + assert(windowLen > windowStart); + + // allocate new working objects + xcorr = new float[windowLen]; + memset(xcorr, 0, windowLen * sizeof(float)); + + // allocate processing buffer + buffer = new FIFOSampleBuffer(); + // we do processing in mono mode + buffer->setChannels(1); + buffer->clear(); +} + + + +BPMDetect::~BPMDetect() +{ + delete[] xcorr; + delete buffer; +} + + + +/// convert to mono, low-pass filter & decimate to about 500 Hz. +/// return number of outputted samples. +/// +/// Decimation is used to remove the unnecessary frequencies and thus to reduce +/// the amount of data needed to be processed as calculating autocorrelation +/// function is a very-very heavy operation. +/// +/// Anti-alias filtering is done simply by averaging the samples. This is really a +/// poor-man's anti-alias filtering, but it's not so critical in this kind of application +/// (it'd also be difficult to design a high-quality filter with steep cut-off at very +/// narrow band) +int BPMDetect::decimate(SAMPLETYPE *dest, const SAMPLETYPE *src, int numsamples) +{ + int count, outcount; + LONG_SAMPLETYPE out; + + assert(channels > 0); + assert(decimateBy > 0); + outcount = 0; + for (count = 0; count < numsamples; count ++) + { + int j; + + // convert to mono and accumulate + for (j = 0; j < channels; j ++) + { + decimateSum += src[j]; + } + src += j; + + decimateCount ++; + if (decimateCount >= decimateBy) + { + // Store every Nth sample only + out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels)); + decimateSum = 0; + decimateCount = 0; +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // check ranges for sure (shouldn't actually be necessary) + if (out > 32767) + { + out = 32767; + } + else if (out < -32768) + { + out = -32768; + } +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[outcount] = (SAMPLETYPE)out; + outcount ++; + } + } + return outcount; +} + + + +// Calculates autocorrelation function of the sample history buffer +void BPMDetect::updateXCorr(int process_samples) +{ + int offs; + SAMPLETYPE *pBuffer; + + assert(buffer->numSamples() >= (uint)(process_samples + windowLen)); + + pBuffer = buffer->ptrBegin(); + for (offs = windowStart; offs < windowLen; offs ++) + { + LONG_SAMPLETYPE sum; + int i; + + sum = 0; + for (i = 0; i < process_samples; i ++) + { + sum += pBuffer[i] * pBuffer[i + offs]; // scaling the sub-result shouldn't be necessary + } +// xcorr[offs] *= xcorr_decay; // decay 'xcorr' here with suitable coefficients + // if it's desired that the system adapts automatically to + // various bpms, e.g. in processing continouos music stream. + // The 'xcorr_decay' should be a value that's smaller than but + // close to one, and should also depend on 'process_samples' value. + + xcorr[offs] += (float)sum; + } +} + + +// Calculates envelope of the sample data +void BPMDetect::calcEnvelope(SAMPLETYPE *samples, int numsamples) +{ + const static double decay = 0.7f; // decay constant for smoothing the envelope + const static double norm = (1 - decay); + + int i; + LONG_SAMPLETYPE out; + double val; + + for (i = 0; i < numsamples; i ++) + { + // calc average RMS volume + RMSVolumeAccu *= avgdecay; + val = (float)fabs((float)samples[i]); + RMSVolumeAccu += val * val; + + // cut amplitudes that are below cutoff ~2 times RMS volume + // (we're interested in peak values, not the silent moments) + if (val < 0.5 * sqrt(RMSVolumeAccu * avgnorm)) + { + val = 0; + } + + // smooth amplitude envelope + envelopeAccu *= decay; + envelopeAccu += val; + out = (LONG_SAMPLETYPE)(envelopeAccu * norm); + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // cut peaks (shouldn't be necessary though) + if (out > 32767) out = 32767; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + samples[i] = (SAMPLETYPE)out; + } +} + + + +void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples) +{ + SAMPLETYPE decimated[DECIMATED_BLOCK_SAMPLES]; + + // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration + while (numSamples > 0) + { + int block; + int decSamples; + + block = (numSamples > INPUT_BLOCK_SAMPLES) ? INPUT_BLOCK_SAMPLES : numSamples; + + // decimate. note that converts to mono at the same time + decSamples = decimate(decimated, samples, block); + samples += block * channels; + numSamples -= block; + + // envelope new samples and add them to buffer + calcEnvelope(decimated, decSamples); + buffer->putSamples(decimated, decSamples); + } + + // when the buffer has enought samples for processing... + if ((int)buffer->numSamples() > windowLen) + { + int processLength; + + // how many samples are processed + processLength = (int)buffer->numSamples() - windowLen; + + // ... calculate autocorrelations for oldest samples... + updateXCorr(processLength); + // ... and remove them from the buffer + buffer->receiveSamples(processLength); + } +} + + + +void BPMDetect::removeBias() +{ + int i; + float minval = 1e12f; // arbitrary large number + + for (i = windowStart; i < windowLen; i ++) + { + if (xcorr[i] < minval) + { + minval = xcorr[i]; + } + } + + for (i = windowStart; i < windowLen; i ++) + { + xcorr[i] -= minval; + } +} + + +float BPMDetect::getBpm() +{ + double peakPos; + double coeff; + PeakFinder peakFinder; + + coeff = 60.0 * ((double)sampleRate / (double)decimateBy); + + // save bpm debug analysis data if debug data enabled + _SaveDebugData(xcorr, windowStart, windowLen, coeff); + + // remove bias from xcorr data + removeBias(); + + // find peak position + peakPos = peakFinder.detectPeak(xcorr, windowStart, windowLen); + + assert(decimateBy != 0); + if (peakPos < 1e-9) return 0.0; // detection failed. + + // calculate BPM + return (float) (coeff / peakPos); +} diff --git a/Externals/soundtouch/BPMDetect.h b/Externals/soundtouch/BPMDetect.h new file mode 100644 index 0000000000..72489894bd --- /dev/null +++ b/Externals/soundtouch/BPMDetect.h @@ -0,0 +1,164 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Beats-per-minute (BPM) detection routine. +/// +/// The beat detection algorithm works as follows: +/// - Use function 'inputSamples' to input a chunks of samples to the class for +/// analysis. It's a good idea to enter a large sound file or stream in smallish +/// chunks of around few kilosamples in order not to extinguish too much RAM memory. +/// - Input sound data is decimated to approx 500 Hz to reduce calculation burden, +/// which is basically ok as low (bass) frequencies mostly determine the beat rate. +/// Simple averaging is used for anti-alias filtering because the resulting signal +/// quality isn't of that high importance. +/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by +/// taking absolute value that's smoothed by sliding average. Signal levels that +/// are below a couple of times the general RMS amplitude level are cut away to +/// leave only notable peaks there. +/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term +/// autocorrelation function of the enveloped signal. +/// - After whole sound data file has been analyzed as above, the bpm level is +/// detected by function 'getBpm' that finds the highest peak of the autocorrelation +/// function, calculates it's precise location and converts this reading to bpm's. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-08-30 22:53:44 +0300 (Thu, 30 Aug 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: BPMDetect.h 150 2012-08-30 19:53:44Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _BPMDetect_H_ +#define _BPMDetect_H_ + +#include "STTypes.h" +#include "FIFOSampleBuffer.h" + +namespace soundtouch +{ + +/// Minimum allowed BPM rate. Used to restrict accepted result above a reasonable limit. +#define MIN_BPM 29 + +/// Maximum allowed BPM rate. Used to restrict accepted result below a reasonable limit. +#define MAX_BPM 200 + + +/// Class for calculating BPM rate for audio data. +class BPMDetect +{ +protected: + /// Auto-correlation accumulator bins. + float *xcorr; + + /// Amplitude envelope sliding average approximation level accumulator + double envelopeAccu; + + /// RMS volume sliding average approximation level accumulator + double RMSVolumeAccu; + + /// Sample average counter. + int decimateCount; + + /// Sample average accumulator for FIFO-like decimation. + soundtouch::LONG_SAMPLETYPE decimateSum; + + /// Decimate sound by this coefficient to reach approx. 500 Hz. + int decimateBy; + + /// Auto-correlation window length + int windowLen; + + /// Number of channels (1 = mono, 2 = stereo) + int channels; + + /// sample rate + int sampleRate; + + /// Beginning of auto-correlation window: Autocorrelation isn't being updated for + /// the first these many correlation bins. + int windowStart; + + /// FIFO-buffer for decimated processing samples. + soundtouch::FIFOSampleBuffer *buffer; + + /// Updates auto-correlation function for given number of decimated samples that + /// are read from the internal 'buffer' pipe (samples aren't removed from the pipe + /// though). + void updateXCorr(int process_samples /// How many samples are processed. + ); + + /// Decimates samples to approx. 500 Hz. + /// + /// \return Number of output samples. + int decimate(soundtouch::SAMPLETYPE *dest, ///< Destination buffer + const soundtouch::SAMPLETYPE *src, ///< Source sample buffer + int numsamples ///< Number of source samples. + ); + + /// Calculates amplitude envelope for the buffer of samples. + /// Result is output to 'samples'. + void calcEnvelope(soundtouch::SAMPLETYPE *samples, ///< Pointer to input/output data buffer + int numsamples ///< Number of samples in buffer + ); + + /// remove constant bias from xcorr data + void removeBias(); + +public: + /// Constructor. + BPMDetect(int numChannels, ///< Number of channels in sample data. + int sampleRate ///< Sample rate in Hz. + ); + + /// Destructor. + virtual ~BPMDetect(); + + /// Inputs a block of samples for analyzing: Envelopes the samples and then + /// updates the autocorrelation estimation. When whole song data has been input + /// in smaller blocks using this function, read the resulting bpm with 'getBpm' + /// function. + /// + /// Notice that data in 'samples' array can be disrupted in processing. + void inputSamples(const soundtouch::SAMPLETYPE *samples, ///< Pointer to input/working data buffer + int numSamples ///< Number of samples in buffer + ); + + + /// Analyzes the results and returns the BPM rate. Use this function to read result + /// after whole song data has been input to the class by consecutive calls of + /// 'inputSamples' function. + /// + /// \return Beats-per-minute rate, or zero if detection failed. + float getBpm(); +}; + +} + +#endif // _BPMDetect_H_ diff --git a/Externals/soundtouch/CMakeLists.txt b/Externals/soundtouch/CMakeLists.txt new file mode 100644 index 0000000000..a09aac1946 --- /dev/null +++ b/Externals/soundtouch/CMakeLists.txt @@ -0,0 +1,15 @@ +set(SRCS + AAFilter.cpp + BPMDetect.cpp + cpu_detect_x86.cpp + FIFOSampleBuffer.cpp + FIRFilter.cpp + mmx_optimized.cpp + PeakFinder.cpp + RateTransposer.cpp + SoundTouch.cpp + sse_optimized.cpp + TDStretch.cpp + ) + +add_library(SoundTouch STATIC ${SRCS}) diff --git a/Externals/soundtouch/FIFOSampleBuffer.cpp b/Externals/soundtouch/FIFOSampleBuffer.cpp new file mode 100644 index 0000000000..7f088b80be --- /dev/null +++ b/Externals/soundtouch/FIFOSampleBuffer.cpp @@ -0,0 +1,274 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A buffer class for temporarily storaging sound samples, operates as a +/// first-in-first-out pipe. +/// +/// Samples are added to the end of the sample buffer with the 'putSamples' +/// function, and are received from the beginning of the buffer by calling +/// the 'receiveSamples' function. The class automatically removes the +/// outputted samples from the buffer, as well as grows the buffer size +/// whenever necessary. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSampleBuffer.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include + +#include "FIFOSampleBuffer.h" + +using namespace soundtouch; + +// Constructor +FIFOSampleBuffer::FIFOSampleBuffer(int numChannels) +{ + assert(numChannels > 0); + sizeInBytes = 0; // reasonable initial value + buffer = NULL; + bufferUnaligned = NULL; + samplesInBuffer = 0; + bufferPos = 0; + channels = (uint)numChannels; + ensureCapacity(32); // allocate initial capacity +} + + +// destructor +FIFOSampleBuffer::~FIFOSampleBuffer() +{ + delete[] bufferUnaligned; + bufferUnaligned = NULL; + buffer = NULL; +} + + +// Sets number of channels, 1 = mono, 2 = stereo +void FIFOSampleBuffer::setChannels(int numChannels) +{ + uint usedBytes; + + assert(numChannels > 0); + usedBytes = channels * samplesInBuffer; + channels = (uint)numChannels; + samplesInBuffer = usedBytes / channels; +} + + +// if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and +// zeroes this pointer by copying samples from the 'bufferPos' pointer +// location on to the beginning of the buffer. +void FIFOSampleBuffer::rewind() +{ + if (buffer && bufferPos) + { + memmove(buffer, ptrBegin(), sizeof(SAMPLETYPE) * channels * samplesInBuffer); + bufferPos = 0; + } +} + + +// Adds 'numSamples' pcs of samples from the 'samples' memory position to +// the sample buffer. +void FIFOSampleBuffer::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + memcpy(ptrEnd(nSamples), samples, sizeof(SAMPLETYPE) * nSamples * channels); + samplesInBuffer += nSamples; +} + + +// Increases the number of samples in the buffer without copying any actual +// samples. +// +// This function is used to update the number of samples in the sample buffer +// when accessing the buffer directly with 'ptrEnd' function. Please be +// careful though! +void FIFOSampleBuffer::putSamples(uint nSamples) +{ + uint req; + + req = samplesInBuffer + nSamples; + ensureCapacity(req); + samplesInBuffer += nSamples; +} + + +// Returns a pointer to the end of the used part of the sample buffer (i.e. +// where the new samples are to be inserted). This function may be used for +// inserting new samples into the sample buffer directly. Please be careful! +// +// Parameter 'slackCapacity' tells the function how much free capacity (in +// terms of samples) there _at least_ should be, in order to the caller to +// succesfully insert all the required samples to the buffer. When necessary, +// the function grows the buffer size to comply with this requirement. +// +// When using this function as means for inserting new samples, also remember +// to increase the sample count afterwards, by calling the +// 'putSamples(numSamples)' function. +SAMPLETYPE *FIFOSampleBuffer::ptrEnd(uint slackCapacity) +{ + ensureCapacity(samplesInBuffer + slackCapacity); + return buffer + samplesInBuffer * channels; +} + + +// Returns a pointer to the beginning of the currently non-outputted samples. +// This function is provided for accessing the output samples directly. +// Please be careful! +// +// When using this function to output samples, also remember to 'remove' the +// outputted samples from the buffer by calling the +// 'receiveSamples(numSamples)' function +SAMPLETYPE *FIFOSampleBuffer::ptrBegin() +{ + assert(buffer); + return buffer + bufferPos * channels; +} + + +// Ensures that the buffer has enought capacity, i.e. space for _at least_ +// 'capacityRequirement' number of samples. The buffer is grown in steps of +// 4 kilobytes to eliminate the need for frequently growing up the buffer, +// as well as to round the buffer size up to the virtual memory page size. +void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement) +{ + SAMPLETYPE *tempUnaligned, *temp; + + if (capacityRequirement > getCapacity()) + { + // enlarge the buffer in 4kbyte steps (round up to next 4k boundary) + sizeInBytes = (capacityRequirement * channels * sizeof(SAMPLETYPE) + 4095) & (uint)-4096; + assert(sizeInBytes % 2 == 0); + tempUnaligned = new SAMPLETYPE[sizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE)]; + if (tempUnaligned == NULL) + { + ST_THROW_RT_ERROR("Couldn't allocate memory!\n"); + } + // Align the buffer to begin at 16byte cache line boundary for optimal performance + temp = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(tempUnaligned); + if (samplesInBuffer) + { + memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE)); + } + delete[] bufferUnaligned; + buffer = temp; + bufferUnaligned = tempUnaligned; + bufferPos = 0; + } + else + { + // simply rewind the buffer (if necessary) + rewind(); + } +} + + +// Returns the current buffer capacity in terms of samples +uint FIFOSampleBuffer::getCapacity() const +{ + return sizeInBytes / (channels * sizeof(SAMPLETYPE)); +} + + +// Returns the number of samples currently in the buffer +uint FIFOSampleBuffer::numSamples() const +{ + return samplesInBuffer; +} + + +// Output samples from beginning of the sample buffer. Copies demanded number +// of samples to output and removes them from the sample buffer. If there +// are less than 'numsample' samples in the buffer, returns all available. +// +// Returns number of samples copied. +uint FIFOSampleBuffer::receiveSamples(SAMPLETYPE *output, uint maxSamples) +{ + uint num; + + num = (maxSamples > samplesInBuffer) ? samplesInBuffer : maxSamples; + + memcpy(output, ptrBegin(), channels * sizeof(SAMPLETYPE) * num); + return receiveSamples(num); +} + + +// Removes samples from the beginning of the sample buffer without copying them +// anywhere. Used to reduce the number of samples in the buffer, when accessing +// the sample buffer with the 'ptrBegin' function. +uint FIFOSampleBuffer::receiveSamples(uint maxSamples) +{ + if (maxSamples >= samplesInBuffer) + { + uint temp; + + temp = samplesInBuffer; + samplesInBuffer = 0; + return temp; + } + + samplesInBuffer -= maxSamples; + bufferPos += maxSamples; + + return maxSamples; +} + + +// Returns nonzero if the sample buffer is empty +int FIFOSampleBuffer::isEmpty() const +{ + return (samplesInBuffer == 0) ? 1 : 0; +} + + +// Clears the sample buffer +void FIFOSampleBuffer::clear() +{ + samplesInBuffer = 0; + bufferPos = 0; +} + + +/// allow trimming (downwards) amount of samples in pipeline. +/// Returns adjusted amount of samples +uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples) +{ + if (numSamples < samplesInBuffer) + { + samplesInBuffer = numSamples; + } + return samplesInBuffer; +} + diff --git a/Externals/soundtouch/FIFOSampleBuffer.h b/Externals/soundtouch/FIFOSampleBuffer.h new file mode 100644 index 0000000000..3789b4d307 --- /dev/null +++ b/Externals/soundtouch/FIFOSampleBuffer.h @@ -0,0 +1,178 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A buffer class for temporarily storaging sound samples, operates as a +/// first-in-first-out pipe. +/// +/// Samples are added to the end of the sample buffer with the 'putSamples' +/// function, and are received from the beginning of the buffer by calling +/// the 'receiveSamples' function. The class automatically removes the +/// output samples from the buffer as well as grows the storage size +/// whenever necessary. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSampleBuffer.h 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIFOSampleBuffer_H +#define FIFOSampleBuffer_H + +#include "FIFOSamplePipe.h" + +namespace soundtouch +{ + +/// Sample buffer working in FIFO (first-in-first-out) principle. The class takes +/// care of storage size adjustment and data moving during input/output operations. +/// +/// Notice that in case of stereo audio, one sample is considered to consist of +/// both channel data. +class FIFOSampleBuffer : public FIFOSamplePipe +{ +private: + /// Sample buffer. + SAMPLETYPE *buffer; + + // Raw unaligned buffer memory. 'buffer' is made aligned by pointing it to first + // 16-byte aligned location of this buffer + SAMPLETYPE *bufferUnaligned; + + /// Sample buffer size in bytes + uint sizeInBytes; + + /// How many samples are currently in buffer. + uint samplesInBuffer; + + /// Channels, 1=mono, 2=stereo. + uint channels; + + /// Current position pointer to the buffer. This pointer is increased when samples are + /// removed from the pipe so that it's necessary to actually rewind buffer (move data) + /// only new data when is put to the pipe. + uint bufferPos; + + /// Rewind the buffer by moving data from position pointed by 'bufferPos' to real + /// beginning of the buffer. + void rewind(); + + /// Ensures that the buffer has capacity for at least this many samples. + void ensureCapacity(uint capacityRequirement); + + /// Returns current capacity. + uint getCapacity() const; + +public: + + /// Constructor + FIFOSampleBuffer(int numChannels = 2 ///< Number of channels, 1=mono, 2=stereo. + ///< Default is stereo. + ); + + /// destructor + ~FIFOSampleBuffer(); + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin(); + + /// Returns a pointer to the end of the used part of the sample buffer (i.e. + /// where the new samples are to be inserted). This function may be used for + /// inserting new samples into the sample buffer directly. Please be careful + /// not corrupt the book-keeping! + /// + /// When using this function as means for inserting new samples, also remember + /// to increase the sample count afterwards, by calling the + /// 'putSamples(numSamples)' function. + SAMPLETYPE *ptrEnd( + uint slackCapacity ///< How much free capacity (in samples) there _at least_ + ///< should be so that the caller can succesfully insert the + ///< desired samples to the buffer. If necessary, the function + ///< grows the buffer size to comply with this requirement. + ); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position to + /// the sample buffer. + virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples. + uint numSamples ///< Number of samples to insert. + ); + + /// Adjusts the book-keeping to increase number of samples in the buffer without + /// copying any actual samples. + /// + /// This function is used to update the number of samples in the sample buffer + /// when accessing the buffer directly with 'ptrEnd' function. Please be + /// careful though! + virtual void putSamples(uint numSamples ///< Number of samples been inserted. + ); + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ); + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ); + + /// Returns number of samples currently available. + virtual uint numSamples() const; + + /// Sets number of channels, 1 = mono, 2 = stereo. + void setChannels(int numChannels); + + /// Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const; + + /// Clears all the samples. + virtual void clear(); + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + uint adjustAmountOfSamples(uint numSamples); +}; + +} + +#endif diff --git a/Externals/soundtouch/FIFOSamplePipe.h b/Externals/soundtouch/FIFOSamplePipe.h new file mode 100644 index 0000000000..f26c57b0b2 --- /dev/null +++ b/Externals/soundtouch/FIFOSamplePipe.h @@ -0,0 +1,234 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound +/// samples by operating like a first-in-first-out pipe: New samples are fed +/// into one end of the pipe with the 'putSamples' function, and the processed +/// samples are received from the other end with the 'receiveSamples' function. +/// +/// 'FIFOProcessor' : A base class for classes the do signal processing with +/// the samples while operating like a first-in-first-out pipe. When samples +/// are input with the 'putSamples' function, the class processes them +/// and moves the processed samples to the given 'output' pipe object, which +/// may be either another processing stage, or a fifo sample buffer object. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIFOSamplePipe_H +#define FIFOSamplePipe_H + +#include +#include +#include "STTypes.h" + +namespace soundtouch +{ + +/// Abstract base class for FIFO (first-in-first-out) sample processing classes. +class FIFOSamplePipe +{ +public: + // virtual default destructor + virtual ~FIFOSamplePipe() {} + + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin() = 0; + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position to + /// the sample buffer. + virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples. + uint numSamples ///< Number of samples to insert. + ) = 0; + + + // Moves samples from the 'other' pipe instance to this instance. + void moveSamples(FIFOSamplePipe &other ///< Other pipe instance where from the receive the data. + ) + { + int oNumSamples = other.numSamples(); + + putSamples(other.ptrBegin(), oNumSamples); + other.receiveSamples(oNumSamples); + }; + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ) = 0; + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ) = 0; + + /// Returns number of samples currently available. + virtual uint numSamples() const = 0; + + // Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const = 0; + + /// Clears all the samples. + virtual void clear() = 0; + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + virtual uint adjustAmountOfSamples(uint numSamples) = 0; + +}; + + + +/// Base-class for sound processing routines working in FIFO principle. With this base +/// class it's easy to implement sound processing stages that can be chained together, +/// so that samples that are fed into beginning of the pipe automatically go through +/// all the processing stages. +/// +/// When samples are input to this class, they're first processed and then put to +/// the FIFO pipe that's defined as output of this class. This output pipe can be +/// either other processing stage or a FIFO sample buffer. +class FIFOProcessor :public FIFOSamplePipe +{ +protected: + /// Internal pipe where processed samples are put. + FIFOSamplePipe *output; + + /// Sets output pipe. + void setOutPipe(FIFOSamplePipe *pOutput) + { + assert(output == NULL); + assert(pOutput != NULL); + output = pOutput; + } + + + /// Constructor. Doesn't define output pipe; it has to be set be + /// 'setOutPipe' function. + FIFOProcessor() + { + output = NULL; + } + + + /// Constructor. Configures output pipe. + FIFOProcessor(FIFOSamplePipe *pOutput ///< Output pipe. + ) + { + output = pOutput; + } + + + /// Destructor. + virtual ~FIFOProcessor() + { + } + + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin() + { + return output->ptrBegin(); + } + +public: + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ) + { + return output->receiveSamples(outBuffer, maxSamples); + } + + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ) + { + return output->receiveSamples(maxSamples); + } + + + /// Returns number of samples currently available. + virtual uint numSamples() const + { + return output->numSamples(); + } + + + /// Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const + { + return output->isEmpty(); + } + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + virtual uint adjustAmountOfSamples(uint numSamples) + { + return output->adjustAmountOfSamples(numSamples); + } + +}; + +} + +#endif diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp new file mode 100644 index 0000000000..1570516b77 --- /dev/null +++ b/Externals/soundtouch/FIRFilter.cpp @@ -0,0 +1,259 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// General FIR digital filter routines with MMX optimization. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific file, +/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: FIRFilter.cpp 131 2011-09-02 18:56:11Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "FIRFilter.h" +#include "cpu_detect.h" + +using namespace soundtouch; + +/***************************************************************************** + * + * Implementation of the class 'FIRFilter' + * + *****************************************************************************/ + +FIRFilter::FIRFilter() +{ + resultDivFactor = 0; + resultDivider = 0; + length = 0; + lengthDiv8 = 0; + filterCoeffs = NULL; +} + + +FIRFilter::~FIRFilter() +{ + delete[] filterCoeffs; +} + +// Usual C-version of the filter routine for stereo sound +uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const +{ + uint i, j, end; + LONG_SAMPLETYPE suml, sumr; +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + // when using floating point samples, use a scaler instead of a divider + // because division is much slower operation than multiplying. + double dScaler = 1.0 / (double)resultDivider; +#endif + + assert(length != 0); + assert(src != NULL); + assert(dest != NULL); + assert(filterCoeffs != NULL); + + end = 2 * (numSamples - length); + + for (j = 0; j < end; j += 2) + { + const SAMPLETYPE *ptr; + + suml = sumr = 0; + ptr = src + j; + + for (i = 0; i < length; i += 4) + { + // loop is unrolled by factor of 4 here for efficiency + suml += ptr[2 * i + 0] * filterCoeffs[i + 0] + + ptr[2 * i + 2] * filterCoeffs[i + 1] + + ptr[2 * i + 4] * filterCoeffs[i + 2] + + ptr[2 * i + 6] * filterCoeffs[i + 3]; + sumr += ptr[2 * i + 1] * filterCoeffs[i + 0] + + ptr[2 * i + 3] * filterCoeffs[i + 1] + + ptr[2 * i + 5] * filterCoeffs[i + 2] + + ptr[2 * i + 7] * filterCoeffs[i + 3]; + } + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + suml >>= resultDivFactor; + sumr >>= resultDivFactor; + // saturate to 16 bit integer limits + suml = (suml < -32768) ? -32768 : (suml > 32767) ? 32767 : suml; + // saturate to 16 bit integer limits + sumr = (sumr < -32768) ? -32768 : (sumr > 32767) ? 32767 : sumr; +#else + suml *= dScaler; + sumr *= dScaler; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[j] = (SAMPLETYPE)suml; + dest[j + 1] = (SAMPLETYPE)sumr; + } + return numSamples - length; +} + + + + +// Usual C-version of the filter routine for mono sound +uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const +{ + uint i, j, end; + LONG_SAMPLETYPE sum; +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + // when using floating point samples, use a scaler instead of a divider + // because division is much slower operation than multiplying. + double dScaler = 1.0 / (double)resultDivider; +#endif + + + assert(length != 0); + + end = numSamples - length; + for (j = 0; j < end; j ++) + { + sum = 0; + for (i = 0; i < length; i += 4) + { + // loop is unrolled by factor of 4 here for efficiency + sum += src[i + 0] * filterCoeffs[i + 0] + + src[i + 1] * filterCoeffs[i + 1] + + src[i + 2] * filterCoeffs[i + 2] + + src[i + 3] * filterCoeffs[i + 3]; + } +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + sum >>= resultDivFactor; + // saturate to 16 bit integer limits + sum = (sum < -32768) ? -32768 : (sum > 32767) ? 32767 : sum; +#else + sum *= dScaler; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[j] = (SAMPLETYPE)sum; + src ++; + } + return end; +} + + +// Set filter coeffiecients and length. +// +// Throws an exception if filter length isn't divisible by 8 +void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor) +{ + assert(newLength > 0); + if (newLength % 8) ST_THROW_RT_ERROR("FIR filter length not divisible by 8"); + + lengthDiv8 = newLength / 8; + length = lengthDiv8 * 8; + assert(length == newLength); + + resultDivFactor = uResultDivFactor; + resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor); + + delete[] filterCoeffs; + filterCoeffs = new SAMPLETYPE[length]; + memcpy(filterCoeffs, coeffs, length * sizeof(SAMPLETYPE)); +} + + +uint FIRFilter::getLength() const +{ + return length; +} + + + +// Applies the filter to the given sequence of samples. +// +// Note : The amount of outputted samples is by value of 'filter_length' +// smaller than the amount of input samples. +uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const +{ + assert(numChannels == 1 || numChannels == 2); + + assert(length > 0); + assert(lengthDiv8 * 8 == length); + if (numSamples < length) return 0; + if (numChannels == 2) + { + return evaluateFilterStereo(dest, src, numSamples); + } else { + return evaluateFilterMono(dest, src, numSamples); + } +} + + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX-capable CPU available or not. +void * FIRFilter::operator new(size_t s) +{ + // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead! + ST_THROW_RT_ERROR("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!"); + return newInstance(); +} + + +FIRFilter * FIRFilter::newInstance() +{ + uint uExtensions; + + uExtensions = detectCPUextensions(); + + // Check if MMX/SSE instruction set extensions supported by CPU + +#ifdef SOUNDTOUCH_ALLOW_MMX + // MMX routines available only with integer sample types + if (uExtensions & SUPPORT_MMX) + { + return ::new FIRFilterMMX; + } + else +#endif // SOUNDTOUCH_ALLOW_MMX + +#ifdef SOUNDTOUCH_ALLOW_SSE + if (uExtensions & SUPPORT_SSE) + { + // SSE support + return ::new FIRFilterSSE; + } + else +#endif // SOUNDTOUCH_ALLOW_SSE + + { + // ISA optimizations not supported, use plain C version + return ::new FIRFilter; + } +} diff --git a/Externals/soundtouch/FIRFilter.h b/Externals/soundtouch/FIRFilter.h new file mode 100644 index 0000000000..e1563094af --- /dev/null +++ b/Externals/soundtouch/FIRFilter.h @@ -0,0 +1,145 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// General FIR digital filter routines with MMX optimization. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific file, +/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-02-13 21:13:57 +0200 (Sun, 13 Feb 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: FIRFilter.h 104 2011-02-13 19:13:57Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIRFilter_H +#define FIRFilter_H + +#include +#include "STTypes.h" + +namespace soundtouch +{ + +class FIRFilter +{ +protected: + // Number of FIR filter taps + uint length; + // Number of FIR filter taps divided by 8 + uint lengthDiv8; + + // Result divider factor in 2^k format + uint resultDivFactor; + + // Result divider value. + SAMPLETYPE resultDivider; + + // Memory for filter coefficients + SAMPLETYPE *filterCoeffs; + + virtual uint evaluateFilterStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) const; + virtual uint evaluateFilterMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) const; + +public: + FIRFilter(); + virtual ~FIRFilter(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we've a MMX-capable CPU available or not. + static void * operator new(size_t s); + + static FIRFilter *newInstance(); + + /// Applies the filter to the given sequence of samples. + /// Note : The amount of outputted samples is by value of 'filter_length' + /// smaller than the amount of input samples. + /// + /// \return Number of samples copied to 'dest'. + uint evaluate(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples, + uint numChannels) const; + + uint getLength() const; + + virtual void setCoefficients(const SAMPLETYPE *coeffs, + uint newLength, + uint uResultDivFactor); +}; + + +// Optional subclasses that implement CPU-specific optimizations: + +#ifdef SOUNDTOUCH_ALLOW_MMX + +/// Class that implements MMX optimized functions exclusive for 16bit integer samples type. + class FIRFilterMMX : public FIRFilter + { + protected: + short *filterCoeffsUnalign; + short *filterCoeffsAlign; + + virtual uint evaluateFilterStereo(short *dest, const short *src, uint numSamples) const; + public: + FIRFilterMMX(); + ~FIRFilterMMX(); + + virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor); + }; + +#endif // SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + /// Class that implements SSE optimized functions exclusive for floating point samples type. + class FIRFilterSSE : public FIRFilter + { + protected: + float *filterCoeffsUnalign; + float *filterCoeffsAlign; + + virtual uint evaluateFilterStereo(float *dest, const float *src, uint numSamples) const; + public: + FIRFilterSSE(); + ~FIRFilterSSE(); + + virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor); + }; + +#endif // SOUNDTOUCH_ALLOW_SSE + +} + +#endif // FIRFilter_H diff --git a/Externals/soundtouch/PeakFinder.cpp b/Externals/soundtouch/PeakFinder.cpp new file mode 100644 index 0000000000..47ed27cb50 --- /dev/null +++ b/Externals/soundtouch/PeakFinder.cpp @@ -0,0 +1,276 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Peak detection routine. +/// +/// The routine detects highest value on an array of values and calculates the +/// precise peak location as a mass-center of the 'hump' around the peak value. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 21:52:47 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: PeakFinder.cpp 164 2012-12-28 19:52:47Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include + +#include "PeakFinder.h" + +using namespace soundtouch; + +#define max(x, y) (((x) > (y)) ? (x) : (y)) + + +PeakFinder::PeakFinder() +{ + minPos = maxPos = 0; +} + + +// Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'. +int PeakFinder::findTop(const float *data, int peakpos) const +{ + int i; + int start, end; + float refvalue; + + refvalue = data[peakpos]; + + // seek within ±10 points + start = peakpos - 10; + if (start < minPos) start = minPos; + end = peakpos + 10; + if (end > maxPos) end = maxPos; + + for (i = start; i <= end; i ++) + { + if (data[i] > refvalue) + { + peakpos = i; + refvalue = data[i]; + } + } + + // failure if max value is at edges of seek range => it's not peak, it's at slope. + if ((peakpos == start) || (peakpos == end)) return 0; + + return peakpos; +} + + +// Finds 'ground level' of a peak hump by starting from 'peakpos' and proceeding +// to direction defined by 'direction' until next 'hump' after minimum value will +// begin +int PeakFinder::findGround(const float *data, int peakpos, int direction) const +{ + int lowpos; + int pos; + int climb_count; + float refvalue; + float delta; + + climb_count = 0; + refvalue = data[peakpos]; + lowpos = peakpos; + + pos = peakpos; + + while ((pos > minPos+1) && (pos < maxPos-1)) + { + int prevpos; + + prevpos = pos; + pos += direction; + + // calculate derivate + delta = data[pos] - data[prevpos]; + if (delta <= 0) + { + // going downhill, ok + if (climb_count) + { + climb_count --; // decrease climb count + } + + // check if new minimum found + if (data[pos] < refvalue) + { + // new minimum found + lowpos = pos; + refvalue = data[pos]; + } + } + else + { + // going uphill, increase climbing counter + climb_count ++; + if (climb_count > 5) break; // we've been climbing too long => it's next uphill => quit + } + } + return lowpos; +} + + +// Find offset where the value crosses the given level, when starting from 'peakpos' and +// proceeds to direction defined in 'direction' +int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, int direction) const +{ + float peaklevel; + int pos; + + peaklevel = data[peakpos]; + assert(peaklevel >= level); + pos = peakpos; + while ((pos >= minPos) && (pos < maxPos)) + { + if (data[pos + direction] < level) return pos; // crossing found + pos += direction; + } + return -1; // not found +} + + +// Calculates the center of mass location of 'data' array items between 'firstPos' and 'lastPos' +double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos) const +{ + int i; + float sum; + float wsum; + + sum = 0; + wsum = 0; + for (i = firstPos; i <= lastPos; i ++) + { + sum += (float)i * data[i]; + wsum += data[i]; + } + + if (wsum < 1e-6) return 0; + return sum / wsum; +} + + + +/// get exact center of peak near given position by calculating local mass of center +double PeakFinder::getPeakCenter(const float *data, int peakpos) const +{ + float peakLevel; // peak level + int crosspos1, crosspos2; // position where the peak 'hump' crosses cutting level + float cutLevel; // cutting value + float groundLevel; // ground level of the peak + int gp1, gp2; // bottom positions of the peak 'hump' + + // find ground positions. + gp1 = findGround(data, peakpos, -1); + gp2 = findGround(data, peakpos, 1); + + groundLevel = 0.5f * (data[gp1] + data[gp2]); + peakLevel = data[peakpos]; + + // calculate 70%-level of the peak + cutLevel = 0.70f * peakLevel + 0.30f * groundLevel; + // find mid-level crossings + crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1); + crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1); + + if ((crosspos1 < 0) || (crosspos2 < 0)) return 0; // no crossing, no peak.. + + // calculate mass center of the peak surroundings + return calcMassCenter(data, crosspos1, crosspos2); +} + + + +double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) +{ + + int i; + int peakpos; // position of peak level + double highPeak, peak; + + this->minPos = aminPos; + this->maxPos = amaxPos; + + // find absolute peak + peakpos = minPos; + peak = data[minPos]; + for (i = minPos + 1; i < maxPos; i ++) + { + if (data[i] > peak) + { + peak = data[i]; + peakpos = i; + } + } + + // Calculate exact location of the highest peak mass center + highPeak = getPeakCenter(data, peakpos); + peak = highPeak; + + // Now check if the highest peak were in fact harmonic of the true base beat peak + // - sometimes the highest peak can be Nth harmonic of the true base peak yet + // just a slightly higher than the true base + + for (i = 3; i < 10; i ++) + { + double peaktmp, harmonic; + int i1,i2; + + harmonic = (double)i * 0.5; + peakpos = (int)(highPeak / harmonic + 0.5f); + if (peakpos < minPos) break; + peakpos = findTop(data, peakpos); // seek true local maximum index + if (peakpos == 0) continue; // no local max here + + // calculate mass-center of possible harmonic peak + peaktmp = getPeakCenter(data, peakpos); + + // accept harmonic peak if + // (a) it is found + // (b) is within ±4% of the expected harmonic interval + // (c) has at least half x-corr value of the max. peak + + double diff = harmonic * peaktmp / highPeak; + if ((diff < 0.96) || (diff > 1.04)) continue; // peak too afar from expected + + // now compare to highest detected peak + i1 = (int)(highPeak + 0.5); + i2 = (int)(peaktmp + 0.5); + if (data[i2] >= 0.4*data[i1]) + { + // The harmonic is at least half as high primary peak, + // thus use the harmonic peak instead + peak = peaktmp; + } + } + + return peak; +} diff --git a/Externals/soundtouch/PeakFinder.h b/Externals/soundtouch/PeakFinder.h new file mode 100644 index 0000000000..d170b1c58b --- /dev/null +++ b/Externals/soundtouch/PeakFinder.h @@ -0,0 +1,97 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// The routine detects highest value on an array of values and calculates the +/// precise peak location as a mass-center of the 'hump' around the peak value. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-12-30 22:33:46 +0200 (Fri, 30 Dec 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: PeakFinder.h 132 2011-12-30 20:33:46Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _PeakFinder_H_ +#define _PeakFinder_H_ + +namespace soundtouch +{ + +class PeakFinder +{ +protected: + /// Min, max allowed peak positions within the data vector + int minPos, maxPos; + + /// Calculates the mass center between given vector items. + double calcMassCenter(const float *data, ///< Data vector. + int firstPos, ///< Index of first vector item beloging to the peak. + int lastPos ///< Index of last vector item beloging to the peak. + ) const; + + /// Finds the data vector index where the monotoniously decreasing signal crosses the + /// given level. + int findCrossingLevel(const float *data, ///< Data vector. + float level, ///< Goal crossing level. + int peakpos, ///< Peak position index within the data vector. + int direction /// Direction where to proceed from the peak: 1 = right, -1 = left. + ) const; + + // Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'. + int findTop(const float *data, int peakpos) const; + + + /// Finds the 'ground' level, i.e. smallest level between two neighbouring peaks, to right- + /// or left-hand side of the given peak position. + int findGround(const float *data, /// Data vector. + int peakpos, /// Peak position index within the data vector. + int direction /// Direction where to proceed from the peak: 1 = right, -1 = left. + ) const; + + /// get exact center of peak near given position by calculating local mass of center + double getPeakCenter(const float *data, int peakpos) const; + +public: + /// Constructor. + PeakFinder(); + + /// Detect exact peak position of the data vector by finding the largest peak 'hump' + /// and calculating the mass-center location of the peak hump. + /// + /// \return The location of the largest base harmonic peak hump. + double detectPeak(const float *data, /// Data vector to be analyzed. The data vector has + /// to be at least 'maxPos' items long. + int minPos, ///< Min allowed peak location within the vector data. + int maxPos ///< Max allowed peak location within the vector data. + ); +}; + +} + +#endif // _PeakFinder_H_ diff --git a/Externals/soundtouch/RateTransposer.cpp b/Externals/soundtouch/RateTransposer.cpp new file mode 100644 index 0000000000..3ad8d93e5c --- /dev/null +++ b/Externals/soundtouch/RateTransposer.cpp @@ -0,0 +1,626 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sample rate transposer. Changes sample rate by using linear interpolation +/// together with anti-alias filtering (first order interpolation with anti- +/// alias filtering should be quite adequate for this application) +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: RateTransposer.cpp 131 2011-09-02 18:56:11Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "RateTransposer.h" +#include "AAFilter.h" + +using namespace soundtouch; + + +/// A linear samplerate transposer class that uses integer arithmetics. +/// for the transposing. +class RateTransposerInteger : public RateTransposer +{ +protected: + int iSlopeCount; + int iRate; + SAMPLETYPE sPrevSampleL, sPrevSampleR; + + virtual void resetRegisters(); + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + +public: + RateTransposerInteger(); + virtual ~RateTransposerInteger(); + + /// Sets new target rate. Normal rate = 1.0, smaller values represent slower + /// rate, larger faster rates. + virtual void setRate(float newRate); + +}; + + +/// A linear samplerate transposer class that uses floating point arithmetics +/// for the transposing. +class RateTransposerFloat : public RateTransposer +{ +protected: + float fSlopeCount; + SAMPLETYPE sPrevSampleL, sPrevSampleR; + + virtual void resetRegisters(); + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + +public: + RateTransposerFloat(); + virtual ~RateTransposerFloat(); +}; + + + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX/SSE/etc-capable CPU available or not. +void * RateTransposer::operator new(size_t s) +{ + ST_THROW_RT_ERROR("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!"); + return newInstance(); +} + + +RateTransposer *RateTransposer::newInstance() +{ +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + return ::new RateTransposerInteger; +#else + return ::new RateTransposerFloat; +#endif +} + + +// Constructor +RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer) +{ + numChannels = 2; + bUseAAFilter = TRUE; + fRate = 0; + + // Instantiates the anti-alias filter with default tap length + // of 32 + pAAFilter = new AAFilter(32); +} + + + +RateTransposer::~RateTransposer() +{ + delete pAAFilter; +} + + + +/// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable +void RateTransposer::enableAAFilter(BOOL newMode) +{ + bUseAAFilter = newMode; +} + + +/// Returns nonzero if anti-alias filter is enabled. +BOOL RateTransposer::isAAFilterEnabled() const +{ + return bUseAAFilter; +} + + +AAFilter *RateTransposer::getAAFilter() +{ + return pAAFilter; +} + + + +// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower +// iRate, larger faster iRates. +void RateTransposer::setRate(float newRate) +{ + double fCutoff; + + fRate = newRate; + + // design a new anti-alias filter + if (newRate > 1.0f) + { + fCutoff = 0.5f / newRate; + } + else + { + fCutoff = 0.5f * newRate; + } + pAAFilter->setCutoffFreq(fCutoff); +} + + +// Outputs as many samples of the 'outputBuffer' as possible, and if there's +// any room left, outputs also as many of the incoming samples as possible. +// The goal is to drive the outputBuffer empty. +// +// It's allowed for 'output' and 'input' parameters to point to the same +// memory position. +/* +void RateTransposer::flushStoreBuffer() +{ + if (storeBuffer.isEmpty()) return; + + outputBuffer.moveSamples(storeBuffer); +} +*/ + + +// Adds 'nSamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + processSamples(samples, nSamples); +} + + + +// Transposes up the sample rate, causing the observed playback 'rate' of the +// sound to decrease +void RateTransposer::upsample(const SAMPLETYPE *src, uint nSamples) +{ + uint count, sizeTemp, num; + + // If the parameter 'uRate' value is smaller than 'SCALE', first transpose + // the samples and then apply the anti-alias filter to remove aliasing. + + // First check that there's enough room in 'storeBuffer' + // (+16 is to reserve some slack in the destination buffer) + sizeTemp = (uint)((float)nSamples / fRate + 16.0f); + + // Transpose the samples, store the result into the end of "storeBuffer" + count = transpose(storeBuffer.ptrEnd(sizeTemp), src, nSamples); + storeBuffer.putSamples(count); + + // Apply the anti-alias filter to samples in "store output", output the + // result to "dest" + num = storeBuffer.numSamples(); + count = pAAFilter->evaluate(outputBuffer.ptrEnd(num), + storeBuffer.ptrBegin(), num, (uint)numChannels); + outputBuffer.putSamples(count); + + // Remove the processed samples from "storeBuffer" + storeBuffer.receiveSamples(count); +} + + +// Transposes down the sample rate, causing the observed playback 'rate' of the +// sound to increase +void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples) +{ + uint count, sizeTemp; + + // If the parameter 'uRate' value is larger than 'SCALE', first apply the + // anti-alias filter to remove high frequencies (prevent them from folding + // over the lover frequencies), then transpose. + + // Add the new samples to the end of the storeBuffer + storeBuffer.putSamples(src, nSamples); + + // Anti-alias filter the samples to prevent folding and output the filtered + // data to tempBuffer. Note : because of the FIR filter length, the + // filtering routine takes in 'filter_length' more samples than it outputs. + assert(tempBuffer.isEmpty()); + sizeTemp = storeBuffer.numSamples(); + + count = pAAFilter->evaluate(tempBuffer.ptrEnd(sizeTemp), + storeBuffer.ptrBegin(), sizeTemp, (uint)numChannels); + + if (count == 0) return; + + // Remove the filtered samples from 'storeBuffer' + storeBuffer.receiveSamples(count); + + // Transpose the samples (+16 is to reserve some slack in the destination buffer) + sizeTemp = (uint)((float)nSamples / fRate + 16.0f); + count = transpose(outputBuffer.ptrEnd(sizeTemp), tempBuffer.ptrBegin(), count); + outputBuffer.putSamples(count); +} + + +// Transposes sample rate by applying anti-alias filter to prevent folding. +// Returns amount of samples returned in the "dest" buffer. +// The maximum amount of samples that can be returned at a time is set by +// the 'set_returnBuffer_size' function. +void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples) +{ + uint count; + uint sizeReq; + + if (nSamples == 0) return; + assert(pAAFilter); + + // If anti-alias filter is turned off, simply transpose without applying + // the filter + if (bUseAAFilter == FALSE) + { + sizeReq = (uint)((float)nSamples / fRate + 1.0f); + count = transpose(outputBuffer.ptrEnd(sizeReq), src, nSamples); + outputBuffer.putSamples(count); + return; + } + + // Transpose with anti-alias filter + if (fRate < 1.0f) + { + upsample(src, nSamples); + } + else + { + downsample(src, nSamples); + } +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// Returns the number of samples returned in the "dest" buffer +inline uint RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + if (numChannels == 2) + { + return transposeStereo(dest, src, nSamples); + } + else + { + return transposeMono(dest, src, nSamples); + } +} + + +// Sets the number of channels, 1 = mono, 2 = stereo +void RateTransposer::setChannels(int nChannels) +{ + assert(nChannels > 0); + if (numChannels == nChannels) return; + + assert(nChannels == 1 || nChannels == 2); + numChannels = nChannels; + + storeBuffer.setChannels(numChannels); + tempBuffer.setChannels(numChannels); + outputBuffer.setChannels(numChannels); + + // Inits the linear interpolation registers + resetRegisters(); +} + + +// Clears all the samples in the object +void RateTransposer::clear() +{ + outputBuffer.clear(); + storeBuffer.clear(); +} + + +// Returns nonzero if there aren't any samples available for outputting. +int RateTransposer::isEmpty() const +{ + int res; + + res = FIFOProcessor::isEmpty(); + if (res == 0) return 0; + return storeBuffer.isEmpty(); +} + + +////////////////////////////////////////////////////////////////////////////// +// +// RateTransposerInteger - integer arithmetic implementation +// + +/// fixed-point interpolation routine precision +#define SCALE 65536 + +// Constructor +RateTransposerInteger::RateTransposerInteger() : RateTransposer() +{ + // Notice: use local function calling syntax for sake of clarity, + // to indicate the fact that C++ constructor can't call virtual functions. + RateTransposerInteger::resetRegisters(); + RateTransposerInteger::setRate(1.0f); +} + + +RateTransposerInteger::~RateTransposerInteger() +{ +} + + +void RateTransposerInteger::resetRegisters() +{ + iSlopeCount = 0; + sPrevSampleL = + sPrevSampleR = 0; +} + + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int i, used; + LONG_SAMPLETYPE temp, vol1; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the previous call first... + while (iSlopeCount <= SCALE) + { + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = vol1 * sPrevSampleL + iSlopeCount * src[0]; + dest[i] = (SAMPLETYPE)(temp / SCALE); + i++; + iSlopeCount += iRate; + } + // now always (iSlopeCount > SCALE) + iSlopeCount -= SCALE; + + while (1) + { + while (iSlopeCount > SCALE) + { + iSlopeCount -= SCALE; + used ++; + if (used >= nSamples - 1) goto end; + } + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = src[used] * vol1 + iSlopeCount * src[used + 1]; + dest[i] = (SAMPLETYPE)(temp / SCALE); + + i++; + iSlopeCount += iRate; + } +end: + // Store the last sample for the next round + sPrevSampleL = src[nSamples - 1]; + + return i; +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Stereo' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int srcPos, i, used; + LONG_SAMPLETYPE temp, vol1; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the sPrevSampleLious call first... + while (iSlopeCount <= SCALE) + { + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = vol1 * sPrevSampleL + iSlopeCount * src[0]; + dest[2 * i] = (SAMPLETYPE)(temp / SCALE); + temp = vol1 * sPrevSampleR + iSlopeCount * src[1]; + dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE); + i++; + iSlopeCount += iRate; + } + // now always (iSlopeCount > SCALE) + iSlopeCount -= SCALE; + + while (1) + { + while (iSlopeCount > SCALE) + { + iSlopeCount -= SCALE; + used ++; + if (used >= nSamples - 1) goto end; + } + srcPos = 2 * used; + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = src[srcPos] * vol1 + iSlopeCount * src[srcPos + 2]; + dest[2 * i] = (SAMPLETYPE)(temp / SCALE); + temp = src[srcPos + 1] * vol1 + iSlopeCount * src[srcPos + 3]; + dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE); + + i++; + iSlopeCount += iRate; + } +end: + // Store the last sample for the next round + sPrevSampleL = src[2 * nSamples - 2]; + sPrevSampleR = src[2 * nSamples - 1]; + + return i; +} + + +// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower +// iRate, larger faster iRates. +void RateTransposerInteger::setRate(float newRate) +{ + iRate = (int)(newRate * SCALE + 0.5f); + RateTransposer::setRate(newRate); +} + + +////////////////////////////////////////////////////////////////////////////// +// +// RateTransposerFloat - floating point arithmetic implementation +// +////////////////////////////////////////////////////////////////////////////// + +// Constructor +RateTransposerFloat::RateTransposerFloat() : RateTransposer() +{ + // Notice: use local function calling syntax for sake of clarity, + // to indicate the fact that C++ constructor can't call virtual functions. + RateTransposerFloat::resetRegisters(); + RateTransposerFloat::setRate(1.0f); +} + + +RateTransposerFloat::~RateTransposerFloat() +{ +} + + +void RateTransposerFloat::resetRegisters() +{ + fSlopeCount = 0; + sPrevSampleL = + sPrevSampleR = 0; +} + + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int i, used; + + used = 0; + i = 0; + + // Process the last sample saved from the previous call first... + while (fSlopeCount <= 1.0f) + { + dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]); + i++; + fSlopeCount += fRate; + } + fSlopeCount -= 1.0f; + + if (nSamples > 1) + { + while (1) + { + while (fSlopeCount > 1.0f) + { + fSlopeCount -= 1.0f; + used ++; + if (used >= nSamples - 1) goto end; + } + dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[used] + fSlopeCount * src[used + 1]); + i++; + fSlopeCount += fRate; + } + } +end: + // Store the last sample for the next round + sPrevSampleL = src[nSamples - 1]; + + return i; +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int srcPos, i, used; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the sPrevSampleLious call first... + while (fSlopeCount <= 1.0f) + { + dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]); + dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleR + fSlopeCount * src[1]); + i++; + fSlopeCount += fRate; + } + // now always (iSlopeCount > 1.0f) + fSlopeCount -= 1.0f; + + if (nSamples > 1) + { + while (1) + { + while (fSlopeCount > 1.0f) + { + fSlopeCount -= 1.0f; + used ++; + if (used >= nSamples - 1) goto end; + } + srcPos = 2 * used; + + dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos] + + fSlopeCount * src[srcPos + 2]); + dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos + 1] + + fSlopeCount * src[srcPos + 3]); + + i++; + fSlopeCount += fRate; + } + } +end: + // Store the last sample for the next round + sPrevSampleL = src[2 * nSamples - 2]; + sPrevSampleR = src[2 * nSamples - 1]; + + return i; +} diff --git a/Externals/soundtouch/RateTransposer.h b/Externals/soundtouch/RateTransposer.h new file mode 100644 index 0000000000..48f7bed5c2 --- /dev/null +++ b/Externals/soundtouch/RateTransposer.h @@ -0,0 +1,159 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sample rate transposer. Changes sample rate by using linear interpolation +/// together with anti-alias filtering (first order interpolation with anti- +/// alias filtering should be quite adequate for this application). +/// +/// Use either of the derived classes of 'RateTransposerInteger' or +/// 'RateTransposerFloat' for corresponding integer/floating point tranposing +/// algorithm implementation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $ +// File revision : $Revision: 4 $ +// +// $Id: RateTransposer.h 63 2009-02-21 16:00:14Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef RateTransposer_H +#define RateTransposer_H + +#include +#include "AAFilter.h" +#include "FIFOSamplePipe.h" +#include "FIFOSampleBuffer.h" + +#include "STTypes.h" + +namespace soundtouch +{ + +/// A common linear samplerate transposer class. +/// +/// Note: Use function "RateTransposer::newInstance()" to create a new class +/// instance instead of the "new" operator; that function automatically +/// chooses a correct implementation depending on if integer or floating +/// arithmetics are to be used. +class RateTransposer : public FIFOProcessor +{ +protected: + /// Anti-alias filter object + AAFilter *pAAFilter; + + float fRate; + + int numChannels; + + /// Buffer for collecting samples to feed the anti-alias filter between + /// two batches + FIFOSampleBuffer storeBuffer; + + /// Buffer for keeping samples between transposing & anti-alias filter + FIFOSampleBuffer tempBuffer; + + /// Output sample buffer + FIFOSampleBuffer outputBuffer; + + BOOL bUseAAFilter; + + virtual void resetRegisters() = 0; + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) = 0; + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) = 0; + inline uint transpose(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + + void downsample(const SAMPLETYPE *src, + uint numSamples); + void upsample(const SAMPLETYPE *src, + uint numSamples); + + /// Transposes sample rate by applying anti-alias filter to prevent folding. + /// Returns amount of samples returned in the "dest" buffer. + /// The maximum amount of samples that can be returned at a time is set by + /// the 'set_returnBuffer_size' function. + void processSamples(const SAMPLETYPE *src, + uint numSamples); + + +public: + RateTransposer(); + virtual ~RateTransposer(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we're to use integer or floating point arithmetics. + static void *operator new(size_t s); + + /// Use this function instead of "new" operator to create a new instance of this class. + /// This function automatically chooses a correct implementation, depending on if + /// integer ot floating point arithmetics are to be used. + static RateTransposer *newInstance(); + + /// Returns the output buffer object + FIFOSamplePipe *getOutput() { return &outputBuffer; }; + + /// Returns the store buffer object + FIFOSamplePipe *getStore() { return &storeBuffer; }; + + /// Return anti-alias filter object + AAFilter *getAAFilter(); + + /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable + void enableAAFilter(BOOL newMode); + + /// Returns nonzero if anti-alias filter is enabled. + BOOL isAAFilterEnabled() const; + + /// Sets new target rate. Normal rate = 1.0, smaller values represent slower + /// rate, larger faster rates. + virtual void setRate(float newRate); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(int channels); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position into + /// the input of the object. + void putSamples(const SAMPLETYPE *samples, uint numSamples); + + /// Clears all the samples in the object + void clear(); + + /// Returns nonzero if there aren't any samples available for outputting. + int isEmpty() const; +}; + +} + +#endif diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h new file mode 100644 index 0000000000..9855939119 --- /dev/null +++ b/Externals/soundtouch/STTypes.h @@ -0,0 +1,191 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Common type definitions for SoundTouch audio processing library. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 16:53:56 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 3 $ +// +// $Id: STTypes.h 162 2012-12-28 14:53:56Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef STTypes_H +#define STTypes_H + +typedef unsigned int uint; +typedef unsigned long ulong; + +// Patch for MinGW: on Win64 long is 32-bit +#ifdef _WIN64 + typedef unsigned long long ulongptr; +#else + typedef ulong ulongptr; +#endif + + +// Helper macro for aligning pointer up to next 16-byte boundary +#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 ) + + +#if (defined(__GNUC__) && !defined(ANDROID)) + // In GCC, include soundtouch_config.h made by config scritps. + // Skip this in Android compilation that uses GCC but without configure scripts. + //#include "soundtouch_config.h" +#endif + +#ifndef _WINDEF_ + // if these aren't defined already by Windows headers, define now +#if defined(__APPLE__) + typedef signed char BOOL; +#else + typedef int BOOL; +#endif + #define FALSE 0 + #define TRUE 1 + +#endif // _WINDEF_ + + +namespace soundtouch +{ + /// Activate these undef's to overrule the possible sampletype + /// setting inherited from some other header file: + #undef SOUNDTOUCH_INTEGER_SAMPLES + #undef SOUNDTOUCH_FLOAT_SAMPLES + + #if (defined(__SOFTFP__)) + // For Android compilation: Force use of Integer samples in case that + // compilation uses soft-floating point emulation - soft-fp is way too slow + #undef SOUNDTOUCH_FLOAT_SAMPLES + #define SOUNDTOUCH_INTEGER_SAMPLES 1 + #endif + + #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES) + + /// Choose either 32bit floating point or 16bit integer sampletype + /// by choosing one of the following defines, unless this selection + /// has already been done in some other file. + //// + /// Notes: + /// - In Windows environment, choose the sample format with the + /// following defines. + /// - In GNU environment, the floating point samples are used by + /// default, but integer samples can be chosen by giving the + /// following switch to the configure script: + /// ./configure --enable-integer-samples + /// However, if you still prefer to select the sample format here + /// also in GNU environment, then please #undef the INTEGER_SAMPLE + /// and FLOAT_SAMPLE defines first as in comments above. + //#define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples + #define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples + + #endif + + #if (_M_IX86 || __i386__ || __x86_64__ || _M_X64) + /// Define this to allow X86-specific assembler/intrinsic optimizations. + /// Notice that library contains also usual C++ versions of each of these + /// these routines, so if you're having difficulties getting the optimized + /// routines compiled for whatever reason, you may disable these optimizations + /// to make the library compile. + + #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS 1 + + /// In GNU environment, allow the user to override this setting by + /// giving the following switch to the configure script: + /// ./configure --disable-x86-optimizations + /// ./configure --enable-x86-optimizations=no + #ifdef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS + #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + #endif + #else + /// Always disable optimizations when not using a x86 systems. + #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + + #endif + + // If defined, allows the SIMD-optimized routines to take minor shortcuts + // for improved performance. Undefine to require faithfully similar SIMD + // calculations as in normal C implementation. + #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION 1 + + + #ifdef SOUNDTOUCH_INTEGER_SAMPLES + // 16bit integer sample type + typedef short SAMPLETYPE; + // data type for sample accumulation: Use 32bit integer to prevent overflows + typedef long LONG_SAMPLETYPE; + + #ifdef SOUNDTOUCH_FLOAT_SAMPLES + // check that only one sample type is defined + #error "conflicting sample types defined" + #endif // SOUNDTOUCH_FLOAT_SAMPLES + + #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + // Allow MMX optimizations +#ifndef _M_X64 + #define SOUNDTOUCH_ALLOW_MMX 1 +#endif + #endif + + #else + + // floating point samples + typedef float SAMPLETYPE; + // data type for sample accumulation: Use double to utilize full precision. + typedef double LONG_SAMPLETYPE; + + #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + // Allow SSE optimizations + #define SOUNDTOUCH_ALLOW_SSE 1 + #endif + + #endif // SOUNDTOUCH_INTEGER_SAMPLES + +}; + +// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions: +#define ST_NO_EXCEPTION_HANDLING 1 +#ifdef ST_NO_EXCEPTION_HANDLING + // Exceptions disabled. Throw asserts instead if enabled. + #include + #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} +#else + // use c++ standard exceptions + #include + #define ST_THROW_RT_ERROR(x) {throw std::runtime_error(x);} +#endif + +// When this #define is active, eliminates a clicking sound when the "rate" or "pitch" +// parameter setting crosses from value <1 to >=1 or vice versa during processing. +// Default is off as such crossover is untypical case and involves a slight sound +// quality compromise. +//#define SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER 1 + +#endif diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp new file mode 100644 index 0000000000..f9160ed56d --- /dev/null +++ b/Externals/soundtouch/SoundTouch.cpp @@ -0,0 +1,501 @@ +////////////////////////////////////////////////////////////////////////////// +/// +/// SoundTouch - main class for tempo/pitch/rate adjusting routines. +/// +/// Notes: +/// - Initialize the SoundTouch object instance by setting up the sound stream +/// parameters with functions 'setSampleRate' and 'setChannels', then set +/// desired tempo/pitch/rate settings with the corresponding functions. +/// +/// - The SoundTouch class behaves like a first-in-first-out pipeline: The +/// samples that are to be processed are fed into one of the pipe by calling +/// function 'putSamples', while the ready processed samples can be read +/// from the other end of the pipeline with function 'receiveSamples'. +/// +/// - The SoundTouch processing classes require certain sized 'batches' of +/// samples in order to process the sound. For this reason the classes buffer +/// incoming samples until there are enough of samples available for +/// processing, then they carry out the processing step and consequently +/// make the processed samples available for outputting. +/// +/// - For the above reason, the processing routines introduce a certain +/// 'latency' between the input and output, so that the samples input to +/// SoundTouch may not be immediately available in the output, and neither +/// the amount of outputtable samples may not immediately be in direct +/// relationship with the amount of previously input samples. +/// +/// - The tempo/pitch/rate control parameters can be altered during processing. +/// Please notice though that they aren't currently protected by semaphores, +/// so in multi-thread application external semaphore protection may be +/// required. +/// +/// - This class utilizes classes 'TDStretch' for tempo change (without modifying +/// pitch) and 'RateTransposer' for changing the playback rate (that is, both +/// tempo and pitch in the same ratio) of the sound. The third available control +/// 'pitch' (change pitch but maintain tempo) is produced by a combination of +/// combining the two other controls. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: SoundTouch.cpp 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include + +#include "SoundTouch.h" +#include "TDStretch.h" +#include "RateTransposer.h" +#include "cpu_detect.h" + +using namespace soundtouch; + +/// test if two floating point numbers are equal +#define TEST_FLOAT_EQUAL(a, b) (fabs(a - b) < 1e-10) + + +/// Print library version string for autoconf +extern "C" void soundtouch_ac_test() +{ + printf("SoundTouch Version: %s\n",SOUNDTOUCH_VERSION); +} + + +SoundTouch::SoundTouch() +{ + // Initialize rate transposer and tempo changer instances + + pRateTransposer = RateTransposer::newInstance(); + pTDStretch = TDStretch::newInstance(); + + setOutPipe(pTDStretch); + + rate = tempo = 0; + + virtualPitch = + virtualRate = + virtualTempo = 1.0; + + calcEffectiveRateAndTempo(); + + channels = 0; + bSrateSet = FALSE; +} + + + +SoundTouch::~SoundTouch() +{ + delete pRateTransposer; + delete pTDStretch; +} + + + +/// Get SoundTouch library version string +const char *SoundTouch::getVersionString() +{ + static const char *_version = SOUNDTOUCH_VERSION; + + return _version; +} + + +/// Get SoundTouch library version Id +uint SoundTouch::getVersionId() +{ + return SOUNDTOUCH_VERSION_ID; +} + + +// Sets the number of channels, 1 = mono, 2 = stereo +void SoundTouch::setChannels(uint numChannels) +{ + if (numChannels != 1 && numChannels != 2) + { + ST_THROW_RT_ERROR("Illegal number of channels"); + } + channels = numChannels; + pRateTransposer->setChannels((int)numChannels); + pTDStretch->setChannels((int)numChannels); +} + + + +// Sets new rate control value. Normal rate = 1.0, smaller values +// represent slower rate, larger faster rates. +void SoundTouch::setRate(float newRate) +{ + virtualRate = newRate; + calcEffectiveRateAndTempo(); +} + + + +// Sets new rate control value as a difference in percents compared +// to the original rate (-50 .. +100 %) +void SoundTouch::setRateChange(float newRate) +{ + virtualRate = 1.0f + 0.01f * newRate; + calcEffectiveRateAndTempo(); +} + + + +// Sets new tempo control value. Normal tempo = 1.0, smaller values +// represent slower tempo, larger faster tempo. +void SoundTouch::setTempo(float newTempo) +{ + virtualTempo = newTempo; + calcEffectiveRateAndTempo(); +} + + + +// Sets new tempo control value as a difference in percents compared +// to the original tempo (-50 .. +100 %) +void SoundTouch::setTempoChange(float newTempo) +{ + virtualTempo = 1.0f + 0.01f * newTempo; + calcEffectiveRateAndTempo(); +} + + + +// Sets new pitch control value. Original pitch = 1.0, smaller values +// represent lower pitches, larger values higher pitch. +void SoundTouch::setPitch(float newPitch) +{ + virtualPitch = newPitch; + calcEffectiveRateAndTempo(); +} + + + +// Sets pitch change in octaves compared to the original pitch +// (-1.00 .. +1.00) +void SoundTouch::setPitchOctaves(float newPitch) +{ + virtualPitch = (float)exp(0.69314718056f * newPitch); + calcEffectiveRateAndTempo(); +} + + + +// Sets pitch change in semi-tones compared to the original pitch +// (-12 .. +12) +void SoundTouch::setPitchSemiTones(int newPitch) +{ + setPitchOctaves((float)newPitch / 12.0f); +} + + + +void SoundTouch::setPitchSemiTones(float newPitch) +{ + setPitchOctaves(newPitch / 12.0f); +} + + +// Calculates 'effective' rate and tempo values from the +// nominal control values. +void SoundTouch::calcEffectiveRateAndTempo() +{ + float oldTempo = tempo; + float oldRate = rate; + + tempo = virtualTempo / virtualPitch; + rate = virtualPitch * virtualRate; + + if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate); + if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo); + +#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER + if (rate <= 1.0f) + { + if (output != pTDStretch) + { + FIFOSamplePipe *tempoOut; + + assert(output == pRateTransposer); + // move samples in the current output buffer to the output of pTDStretch + tempoOut = pTDStretch->getOutput(); + tempoOut->moveSamples(*output); + // move samples in pitch transposer's store buffer to tempo changer's input + pTDStretch->moveSamples(*pRateTransposer->getStore()); + + output = pTDStretch; + } + } + else +#endif + { + if (output != pRateTransposer) + { + FIFOSamplePipe *transOut; + + assert(output == pTDStretch); + // move samples in the current output buffer to the output of pRateTransposer + transOut = pRateTransposer->getOutput(); + transOut->moveSamples(*output); + // move samples in tempo changer's input to pitch transposer's input + pRateTransposer->moveSamples(*pTDStretch->getInput()); + + output = pRateTransposer; + } + } +} + + +// Sets sample rate. +void SoundTouch::setSampleRate(uint srate) +{ + bSrateSet = TRUE; + // set sample rate, leave other tempo changer parameters as they are. + pTDStretch->setParameters((int)srate); +} + + +// Adds 'numSamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + if (bSrateSet == FALSE) + { + ST_THROW_RT_ERROR("SoundTouch : Sample rate not defined"); + } + else if (channels == 0) + { + ST_THROW_RT_ERROR("SoundTouch : Number of channels not defined"); + } + + // Transpose the rate of the new samples if necessary + /* Bypass the nominal setting - can introduce a click in sound when tempo/pitch control crosses the nominal value... + if (rate == 1.0f) + { + // The rate value is same as the original, simply evaluate the tempo changer. + assert(output == pTDStretch); + if (pRateTransposer->isEmpty() == 0) + { + // yet flush the last samples in the pitch transposer buffer + // (may happen if 'rate' changes from a non-zero value to zero) + pTDStretch->moveSamples(*pRateTransposer); + } + pTDStretch->putSamples(samples, nSamples); + } + */ +#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER + else if (rate <= 1.0f) + { + // transpose the rate down, output the transposed sound to tempo changer buffer + assert(output == pTDStretch); + pRateTransposer->putSamples(samples, nSamples); + pTDStretch->moveSamples(*pRateTransposer); + } + else +#endif + { + // evaluate the tempo changer, then transpose the rate up, + assert(output == pRateTransposer); + pTDStretch->putSamples(samples, nSamples); + pRateTransposer->moveSamples(*pTDStretch); + } +} + + +// Flushes the last samples from the processing pipeline to the output. +// Clears also the internal processing buffers. +// +// Note: This function is meant for extracting the last samples of a sound +// stream. This function may introduce additional blank samples in the end +// of the sound stream, and thus it's not recommended to call this function +// in the middle of a sound stream. +void SoundTouch::flush() +{ + int i; + int nUnprocessed; + int nOut; + SAMPLETYPE buff[64*2]; // note: allocate 2*64 to cater 64 sample frames of stereo sound + + // check how many samples still await processing, and scale + // that by tempo & rate to get expected output sample count + nUnprocessed = numUnprocessedSamples(); + nUnprocessed = (int)((double)nUnprocessed / (tempo * rate) + 0.5); + + nOut = numSamples(); // ready samples currently in buffer ... + nOut += nUnprocessed; // ... and how many we expect there to be in the end + + memset(buff, 0, 64 * channels * sizeof(SAMPLETYPE)); + // "Push" the last active samples out from the processing pipeline by + // feeding blank samples into the processing pipeline until new, + // processed samples appear in the output (not however, more than + // 8ksamples in any case) + for (i = 0; i < 128; i ++) + { + putSamples(buff, 64); + if ((int)numSamples() >= nOut) + { + // Enough new samples have appeared into the output! + // As samples come from processing with bigger chunks, now truncate it + // back to maximum "nOut" samples to improve duration accuracy + adjustAmountOfSamples(nOut); + + // finish + break; + } + } + + // Clear working buffers + pRateTransposer->clear(); + pTDStretch->clearInput(); + // yet leave the 'tempoChanger' output intouched as that's where the + // flushed samples are! +} + + +// Changes a setting controlling the processing system behaviour. See the +// 'SETTING_...' defines for available setting ID's. +BOOL SoundTouch::setSetting(int settingId, int value) +{ + int sampleRate, sequenceMs, seekWindowMs, overlapMs; + + // read current tdstretch routine parameters + pTDStretch->getParameters(&sampleRate, &sequenceMs, &seekWindowMs, &overlapMs); + + switch (settingId) + { + case SETTING_USE_AA_FILTER : + // enables / disabless anti-alias filter + pRateTransposer->enableAAFilter((value != 0) ? TRUE : FALSE); + return TRUE; + + case SETTING_AA_FILTER_LENGTH : + // sets anti-alias filter length + pRateTransposer->getAAFilter()->setLength(value); + return TRUE; + + case SETTING_USE_QUICKSEEK : + // enables / disables tempo routine quick seeking algorithm + pTDStretch->enableQuickSeek((value != 0) ? TRUE : FALSE); + return TRUE; + + case SETTING_SEQUENCE_MS: + // change time-stretch sequence duration parameter + pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs); + return TRUE; + + case SETTING_SEEKWINDOW_MS: + // change time-stretch seek window length parameter + pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs); + return TRUE; + + case SETTING_OVERLAP_MS: + // change time-stretch overlap length parameter + pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value); + return TRUE; + + default : + return FALSE; + } +} + + +// Reads a setting controlling the processing system behaviour. See the +// 'SETTING_...' defines for available setting ID's. +// +// Returns the setting value. +int SoundTouch::getSetting(int settingId) const +{ + int temp; + + switch (settingId) + { + case SETTING_USE_AA_FILTER : + return (uint)pRateTransposer->isAAFilterEnabled(); + + case SETTING_AA_FILTER_LENGTH : + return pRateTransposer->getAAFilter()->getLength(); + + case SETTING_USE_QUICKSEEK : + return (uint) pTDStretch->isQuickSeekEnabled(); + + case SETTING_SEQUENCE_MS: + pTDStretch->getParameters(NULL, &temp, NULL, NULL); + return temp; + + case SETTING_SEEKWINDOW_MS: + pTDStretch->getParameters(NULL, NULL, &temp, NULL); + return temp; + + case SETTING_OVERLAP_MS: + pTDStretch->getParameters(NULL, NULL, NULL, &temp); + return temp; + + case SETTING_NOMINAL_INPUT_SEQUENCE : + return pTDStretch->getInputSampleReq(); + + case SETTING_NOMINAL_OUTPUT_SEQUENCE : + return pTDStretch->getOutputBatchSize(); + + default : + return 0; + } +} + + +// Clears all the samples in the object's output and internal processing +// buffers. +void SoundTouch::clear() +{ + pRateTransposer->clear(); + pTDStretch->clear(); +} + + + +/// Returns number of samples currently unprocessed. +uint SoundTouch::numUnprocessedSamples() const +{ + FIFOSamplePipe * psp; + if (pTDStretch) + { + psp = pTDStretch->getInput(); + if (psp) + { + return psp->numSamples(); + } + } + return 0; +} diff --git a/Externals/soundtouch/SoundTouch.h b/Externals/soundtouch/SoundTouch.h new file mode 100644 index 0000000000..c6af895811 --- /dev/null +++ b/Externals/soundtouch/SoundTouch.h @@ -0,0 +1,277 @@ +////////////////////////////////////////////////////////////////////////////// +/// +/// SoundTouch - main class for tempo/pitch/rate adjusting routines. +/// +/// Notes: +/// - Initialize the SoundTouch object instance by setting up the sound stream +/// parameters with functions 'setSampleRate' and 'setChannels', then set +/// desired tempo/pitch/rate settings with the corresponding functions. +/// +/// - The SoundTouch class behaves like a first-in-first-out pipeline: The +/// samples that are to be processed are fed into one of the pipe by calling +/// function 'putSamples', while the ready processed samples can be read +/// from the other end of the pipeline with function 'receiveSamples'. +/// +/// - The SoundTouch processing classes require certain sized 'batches' of +/// samples in order to process the sound. For this reason the classes buffer +/// incoming samples until there are enough of samples available for +/// processing, then they carry out the processing step and consequently +/// make the processed samples available for outputting. +/// +/// - For the above reason, the processing routines introduce a certain +/// 'latency' between the input and output, so that the samples input to +/// SoundTouch may not be immediately available in the output, and neither +/// the amount of outputtable samples may not immediately be in direct +/// relationship with the amount of previously input samples. +/// +/// - The tempo/pitch/rate control parameters can be altered during processing. +/// Please notice though that they aren't currently protected by semaphores, +/// so in multi-thread application external semaphore protection may be +/// required. +/// +/// - This class utilizes classes 'TDStretch' for tempo change (without modifying +/// pitch) and 'RateTransposer' for changing the playback rate (that is, both +/// tempo and pitch in the same ratio) of the sound. The third available control +/// 'pitch' (change pitch but maintain tempo) is produced by a combination of +/// combining the two other controls. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 21:32:59 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: SoundTouch.h 163 2012-12-28 19:32:59Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef SoundTouch_H +#define SoundTouch_H + +#include "FIFOSamplePipe.h" +#include "STTypes.h" + +namespace soundtouch +{ + +/// Soundtouch library version string +#define SOUNDTOUCH_VERSION "1.7.1" + +/// SoundTouch library version id +#define SOUNDTOUCH_VERSION_ID (10701) + +// +// Available setting IDs for the 'setSetting' & 'get_setting' functions: + +/// Enable/disable anti-alias filter in pitch transposer (0 = disable) +#define SETTING_USE_AA_FILTER 0 + +/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32) +#define SETTING_AA_FILTER_LENGTH 1 + +/// Enable/disable quick seeking algorithm in tempo changer routine +/// (enabling quick seeking lowers CPU utilization but causes a minor sound +/// quality compromising) +#define SETTING_USE_QUICKSEEK 2 + +/// Time-stretch algorithm single processing sequence length in milliseconds. This determines +/// to how long sequences the original sound is chopped in the time-stretch algorithm. +/// See "STTypes.h" or README for more information. +#define SETTING_SEQUENCE_MS 3 + +/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the +/// best possible overlapping location. This determines from how wide window the algorithm +/// may look for an optimal joining location when mixing the sound sequences back together. +/// See "STTypes.h" or README for more information. +#define SETTING_SEEKWINDOW_MS 4 + +/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences +/// are mixed back together, to form a continuous sound stream, this parameter defines over +/// how long period the two consecutive sequences are let to overlap each other. +/// See "STTypes.h" or README for more information. +#define SETTING_OVERLAP_MS 5 + + +/// Call "getSetting" with this ID to query nominal average processing sequence +/// size in samples. This value tells approcimate value how many input samples +/// SoundTouch needs to gather before it does DSP processing run for the sample batch. +/// +/// Notices: +/// - This is read-only parameter, i.e. setSetting ignores this parameter +/// - Returned value is approximate average value, exact processing batch +/// size may wary from time to time +/// - This parameter value is not constant but may change depending on +/// tempo/pitch/rate/samplerate settings. +#define SETTING_NOMINAL_INPUT_SEQUENCE 6 + + +/// Call "getSetting" with this ID to query nominal average processing output +/// size in samples. This value tells approcimate value how many output samples +/// SoundTouch outputs once it does DSP processing run for a batch of input samples. +/// +/// Notices: +/// - This is read-only parameter, i.e. setSetting ignores this parameter +/// - Returned value is approximate average value, exact processing batch +/// size may wary from time to time +/// - This parameter value is not constant but may change depending on +/// tempo/pitch/rate/samplerate settings. +#define SETTING_NOMINAL_OUTPUT_SEQUENCE 7 + +class SoundTouch : public FIFOProcessor +{ +private: + /// Rate transposer class instance + class RateTransposer *pRateTransposer; + + /// Time-stretch class instance + class TDStretch *pTDStretch; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualRate; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualTempo; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualPitch; + + /// Flag: Has sample rate been set? + BOOL bSrateSet; + + /// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and + /// 'virtualPitch' parameters. + void calcEffectiveRateAndTempo(); + +protected : + /// Number of channels + uint channels; + + /// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch' + float rate; + + /// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch' + float tempo; + +public: + SoundTouch(); + virtual ~SoundTouch(); + + /// Get SoundTouch library version string + static const char *getVersionString(); + + /// Get SoundTouch library version Id + static uint getVersionId(); + + /// Sets new rate control value. Normal rate = 1.0, smaller values + /// represent slower rate, larger faster rates. + void setRate(float newRate); + + /// Sets new tempo control value. Normal tempo = 1.0, smaller values + /// represent slower tempo, larger faster tempo. + void setTempo(float newTempo); + + /// Sets new rate control value as a difference in percents compared + /// to the original rate (-50 .. +100 %) + void setRateChange(float newRate); + + /// Sets new tempo control value as a difference in percents compared + /// to the original tempo (-50 .. +100 %) + void setTempoChange(float newTempo); + + /// Sets new pitch control value. Original pitch = 1.0, smaller values + /// represent lower pitches, larger values higher pitch. + void setPitch(float newPitch); + + /// Sets pitch change in octaves compared to the original pitch + /// (-1.00 .. +1.00) + void setPitchOctaves(float newPitch); + + /// Sets pitch change in semi-tones compared to the original pitch + /// (-12 .. +12) + void setPitchSemiTones(int newPitch); + void setPitchSemiTones(float newPitch); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(uint numChannels); + + /// Sets sample rate. + void setSampleRate(uint srate); + + /// Flushes the last samples from the processing pipeline to the output. + /// Clears also the internal processing buffers. + // + /// Note: This function is meant for extracting the last samples of a sound + /// stream. This function may introduce additional blank samples in the end + /// of the sound stream, and thus it's not recommended to call this function + /// in the middle of a sound stream. + void flush(); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position into + /// the input of the object. Notice that sample rate _has_to_ be set before + /// calling this function, otherwise throws a runtime_error exception. + virtual void putSamples( + const SAMPLETYPE *samples, ///< Pointer to sample buffer. + uint numSamples ///< Number of samples in buffer. Notice + ///< that in case of stereo-sound a single sample + ///< contains data for both channels. + ); + + /// Clears all the samples in the object's output and internal processing + /// buffers. + virtual void clear(); + + /// Changes a setting controlling the processing system behaviour. See the + /// 'SETTING_...' defines for available setting ID's. + /// + /// \return 'TRUE' if the setting was succesfully changed + BOOL setSetting(int settingId, ///< Setting ID number. see SETTING_... defines. + int value ///< New setting value. + ); + + /// Reads a setting controlling the processing system behaviour. See the + /// 'SETTING_...' defines for available setting ID's. + /// + /// \return the setting value. + int getSetting(int settingId ///< Setting ID number, see SETTING_... defines. + ) const; + + /// Returns number of samples currently unprocessed. + virtual uint numUnprocessedSamples() const; + + + /// Other handy functions that are implemented in the ancestor classes (see + /// classes 'FIFOProcessor' and 'FIFOSamplePipe') + /// + /// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch. + /// - numSamples() : Get number of 'ready' samples that can be received with + /// function 'receiveSamples()' + /// - isEmpty() : Returns nonzero if there aren't any 'ready' samples. + /// - clear() : Clears all samples from ready/processing buffers. +}; + +} +#endif diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj new file mode 100644 index 0000000000..8f5c475687 --- /dev/null +++ b/Externals/soundtouch/SoundTouch.vcxproj @@ -0,0 +1,352 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {68A5DD20-7057-448B-8FE0-B6AC8D205509} + + + + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Release\ + Release\ + Release\ + Release\ + Debug\ + Debug\ + Debug\ + Debug\ + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + Full + AnySuitable + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + Release/SoundTouch.pch + Release/ + Release/ + Release/ + Level3 + true + + + Default + + + Win32\SoundTouch.lib + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Full + AnySuitable + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + Release/SoundTouch.pch + Release/ + Release/ + Release/ + Level3 + true + + + Default + StreamingSIMDExtensions2 + + + Win64\SoundTouch.lib + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Debug/SoundTouch.pch + Debug/ + Debug/ + Debug/ + true + Level3 + true + EditAndContinue + Default + + + Win32\SoundTouch.lib + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Debug/SoundTouch.pch + Debug/ + Debug/ + Debug/ + true + Level3 + true + ProgramDatabase + Default + + + Win64\SoundTouchD.lib + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/soundtouch/SoundTouch.vcxproj.filters b/Externals/soundtouch/SoundTouch.vcxproj.filters new file mode 100644 index 0000000000..1dee5b2a6e --- /dev/null +++ b/Externals/soundtouch/SoundTouch.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {b7786182-6345-4203-8b48-39eec5ec85dc} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {75380bb9-1e58-4186-a9cd-ec7cd284e6a5} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\bpm + + + Source Files\bpm + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/soundtouch/TDStretch.cpp b/Externals/soundtouch/TDStretch.cpp new file mode 100644 index 0000000000..779cf7aa65 --- /dev/null +++ b/Externals/soundtouch/TDStretch.cpp @@ -0,0 +1,808 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like +/// method with several performance-increasing tweaks. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific +/// file, e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 1.12 $ +// +// $Id: TDStretch.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include + +#include "STTypes.h" +#include "cpu_detect.h" +#include "TDStretch.h" + +#include + +using namespace soundtouch; + +#define max(x, y) (((x) > (y)) ? (x) : (y)) + + +/***************************************************************************** + * + * Constant definitions + * + *****************************************************************************/ + +// Table for the hierarchical mixing position seeking algorithm +static const short _scanOffsets[5][24]={ + { 124, 186, 248, 310, 372, 434, 496, 558, 620, 682, 744, 806, + 868, 930, 992, 1054, 1116, 1178, 1240, 1302, 1364, 1426, 1488, 0}, + {-100, -75, -50, -25, 25, 50, 75, 100, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { -20, -15, -10, -5, 5, 10, 15, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { -4, -3, -2, -1, 1, 2, 3, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 121, 114, 97, 114, 98, 105, 108, 32, 104, 99, 117, 111, + 116, 100, 110, 117, 111, 115, 0, 0, 0, 0, 0, 0}}; + +/***************************************************************************** + * + * Implementation of the class 'TDStretch' + * + *****************************************************************************/ + + +TDStretch::TDStretch() : FIFOProcessor(&outputBuffer) +{ + bQuickSeek = FALSE; + channels = 2; + + pMidBuffer = NULL; + pMidBufferUnaligned = NULL; + overlapLength = 0; + + bAutoSeqSetting = TRUE; + bAutoSeekSetting = TRUE; + +// outDebt = 0; + skipFract = 0; + + tempo = 1.0f; + setParameters(44100, DEFAULT_SEQUENCE_MS, DEFAULT_SEEKWINDOW_MS, DEFAULT_OVERLAP_MS); + setTempo(1.0f); + + clear(); +} + + + +TDStretch::~TDStretch() +{ + delete[] pMidBufferUnaligned; +} + + + +// Sets routine control parameters. These control are certain time constants +// defining how the sound is stretched to the desired duration. +// +// 'sampleRate' = sample rate of the sound +// 'sequenceMS' = one processing sequence length in milliseconds (default = 82 ms) +// 'seekwindowMS' = seeking window length for scanning the best overlapping +// position (default = 28 ms) +// 'overlapMS' = overlapping length (default = 12 ms) + +void TDStretch::setParameters(int aSampleRate, int aSequenceMS, + int aSeekWindowMS, int aOverlapMS) +{ + // accept only positive parameter values - if zero or negative, use old values instead + if (aSampleRate > 0) this->sampleRate = aSampleRate; + if (aOverlapMS > 0) this->overlapMs = aOverlapMS; + + if (aSequenceMS > 0) + { + this->sequenceMs = aSequenceMS; + bAutoSeqSetting = FALSE; + } + else if (aSequenceMS == 0) + { + // if zero, use automatic setting + bAutoSeqSetting = TRUE; + } + + if (aSeekWindowMS > 0) + { + this->seekWindowMs = aSeekWindowMS; + bAutoSeekSetting = FALSE; + } + else if (aSeekWindowMS == 0) + { + // if zero, use automatic setting + bAutoSeekSetting = TRUE; + } + + calcSeqParameters(); + + calculateOverlapLength(overlapMs); + + // set tempo to recalculate 'sampleReq' + setTempo(tempo); + +} + + + +/// Get routine control parameters, see setParameters() function. +/// Any of the parameters to this function can be NULL, in such case corresponding parameter +/// value isn't returned. +void TDStretch::getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const +{ + if (pSampleRate) + { + *pSampleRate = sampleRate; + } + + if (pSequenceMs) + { + *pSequenceMs = (bAutoSeqSetting) ? (USE_AUTO_SEQUENCE_LEN) : sequenceMs; + } + + if (pSeekWindowMs) + { + *pSeekWindowMs = (bAutoSeekSetting) ? (USE_AUTO_SEEKWINDOW_LEN) : seekWindowMs; + } + + if (pOverlapMs) + { + *pOverlapMs = overlapMs; + } +} + + +// Overlaps samples in 'midBuffer' with the samples in 'pInput' +void TDStretch::overlapMono(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput) const +{ + int i; + SAMPLETYPE m1, m2; + + m1 = (SAMPLETYPE)0; + m2 = (SAMPLETYPE)overlapLength; + + for (i = 0; i < overlapLength ; i ++) + { + pOutput[i] = (pInput[i] * m1 + pMidBuffer[i] * m2 ) / overlapLength; + m1 += 1; + m2 -= 1; + } +} + + + +void TDStretch::clearMidBuffer() +{ + memset(pMidBuffer, 0, 2 * sizeof(SAMPLETYPE) * overlapLength); +} + + +void TDStretch::clearInput() +{ + inputBuffer.clear(); + clearMidBuffer(); +} + + +// Clears the sample buffers +void TDStretch::clear() +{ + outputBuffer.clear(); + clearInput(); +} + + + +// Enables/disables the quick position seeking algorithm. Zero to disable, nonzero +// to enable +void TDStretch::enableQuickSeek(BOOL enable) +{ + bQuickSeek = enable; +} + + +// Returns nonzero if the quick seeking algorithm is enabled. +BOOL TDStretch::isQuickSeekEnabled() const +{ + return bQuickSeek; +} + + +// Seeks for the optimal overlap-mixing position. +int TDStretch::seekBestOverlapPosition(const SAMPLETYPE *refPos) +{ + if (bQuickSeek) + { + return seekBestOverlapPositionQuick(refPos); + } + else + { + return seekBestOverlapPositionFull(refPos); + } +} + + +// Overlaps samples in 'midBuffer' with the samples in 'pInputBuffer' at position +// of 'ovlPos'. +inline void TDStretch::overlap(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput, uint ovlPos) const +{ + if (channels == 2) + { + // stereo sound + overlapStereo(pOutput, pInput + 2 * ovlPos); + } else { + // mono sound. + overlapMono(pOutput, pInput + ovlPos); + } +} + + + +// Seeks for the optimal overlap-mixing position. The 'stereo' version of the +// routine +// +// The best position is determined as the position where the two overlapped +// sample sequences are 'most alike', in terms of the highest cross-correlation +// value over the overlapping period +int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos) +{ + int bestOffs; + double bestCorr, corr; + int i; + + bestCorr = FLT_MIN; + bestOffs = 0; + + // Scans for the best correlation value by testing each possible position + // over the permitted range. + for (i = 0; i < seekLength; i ++) + { + // Calculates correlation value for the mixing position corresponding + // to 'i' + corr = calcCrossCorr(refPos + channels * i, pMidBuffer); + // heuristic rule to slightly favour values close to mid of the range + double tmp = (double)(2 * i - seekLength) / (double)seekLength; + corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp)); + + // Checks for the highest correlation value + if (corr > bestCorr) + { + bestCorr = corr; + bestOffs = i; + } + } + // clear cross correlation routine state if necessary (is so e.g. in MMX routines). + clearCrossCorrState(); + + return bestOffs; +} + + +// Seeks for the optimal overlap-mixing position. The 'stereo' version of the +// routine +// +// The best position is determined as the position where the two overlapped +// sample sequences are 'most alike', in terms of the highest cross-correlation +// value over the overlapping period +int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos) +{ + int j; + int bestOffs; + double bestCorr, corr; + int scanCount, corrOffset, tempOffset; + + bestCorr = FLT_MIN; + bestOffs = _scanOffsets[0][0]; + corrOffset = 0; + tempOffset = 0; + + // Scans for the best correlation value using four-pass hierarchical search. + // + // The look-up table 'scans' has hierarchical position adjusting steps. + // In first pass the routine searhes for the highest correlation with + // relatively coarse steps, then rescans the neighbourhood of the highest + // correlation with better resolution and so on. + for (scanCount = 0;scanCount < 4; scanCount ++) + { + j = 0; + while (_scanOffsets[scanCount][j]) + { + tempOffset = corrOffset + _scanOffsets[scanCount][j]; + if (tempOffset >= seekLength) break; + + // Calculates correlation value for the mixing position corresponding + // to 'tempOffset' + corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer); + // heuristic rule to slightly favour values close to mid of the range + double tmp = (double)(2 * tempOffset - seekLength) / seekLength; + corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp)); + + // Checks for the highest correlation value + if (corr > bestCorr) + { + bestCorr = corr; + bestOffs = tempOffset; + } + j ++; + } + corrOffset = bestOffs; + } + // clear cross correlation routine state if necessary (is so e.g. in MMX routines). + clearCrossCorrState(); + + return bestOffs; +} + + + +/// clear cross correlation routine state if necessary +void TDStretch::clearCrossCorrState() +{ + // default implementation is empty. +} + + +/// Calculates processing sequence length according to tempo setting +void TDStretch::calcSeqParameters() +{ + // Adjust tempo param according to tempo, so that variating processing sequence length is used + // at varius tempo settings, between the given low...top limits + #define AUTOSEQ_TEMPO_LOW 0.5 // auto setting low tempo range (-50%) + #define AUTOSEQ_TEMPO_TOP 2.0 // auto setting top tempo range (+100%) + + // sequence-ms setting values at above low & top tempo + #define AUTOSEQ_AT_MIN 125.0 + #define AUTOSEQ_AT_MAX 50.0 + #define AUTOSEQ_K ((AUTOSEQ_AT_MAX - AUTOSEQ_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW)) + #define AUTOSEQ_C (AUTOSEQ_AT_MIN - (AUTOSEQ_K) * (AUTOSEQ_TEMPO_LOW)) + + // seek-window-ms setting values at above low & top tempo + #define AUTOSEEK_AT_MIN 25.0 + #define AUTOSEEK_AT_MAX 15.0 + #define AUTOSEEK_K ((AUTOSEEK_AT_MAX - AUTOSEEK_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW)) + #define AUTOSEEK_C (AUTOSEEK_AT_MIN - (AUTOSEEK_K) * (AUTOSEQ_TEMPO_LOW)) + + #define CHECK_LIMITS(x, mi, ma) (((x) < (mi)) ? (mi) : (((x) > (ma)) ? (ma) : (x))) + + double seq, seek; + + if (bAutoSeqSetting) + { + seq = AUTOSEQ_C + AUTOSEQ_K * tempo; + seq = CHECK_LIMITS(seq, AUTOSEQ_AT_MAX, AUTOSEQ_AT_MIN); + sequenceMs = (int)(seq + 0.5); + } + + if (bAutoSeekSetting) + { + seek = AUTOSEEK_C + AUTOSEEK_K * tempo; + seek = CHECK_LIMITS(seek, AUTOSEEK_AT_MAX, AUTOSEEK_AT_MIN); + seekWindowMs = (int)(seek + 0.5); + } + + // Update seek window lengths + seekWindowLength = (sampleRate * sequenceMs) / 1000; + if (seekWindowLength < 2 * overlapLength) + { + seekWindowLength = 2 * overlapLength; + } + seekLength = (sampleRate * seekWindowMs) / 1000; +} + + + +// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower +// tempo, larger faster tempo. +void TDStretch::setTempo(float newTempo) +{ + int intskip; + + tempo = newTempo; + + // Calculate new sequence duration + calcSeqParameters(); + + // Calculate ideal skip length (according to tempo value) + nominalSkip = tempo * (seekWindowLength - overlapLength); + intskip = (int)(nominalSkip + 0.5f); + + // Calculate how many samples are needed in the 'inputBuffer' to + // process another batch of samples + //sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength / 2; + sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength; +} + + + +// Sets the number of channels, 1 = mono, 2 = stereo +void TDStretch::setChannels(int numChannels) +{ + assert(numChannels > 0); + if (channels == numChannels) return; + assert(numChannels == 1 || numChannels == 2); + + channels = numChannels; + inputBuffer.setChannels(channels); + outputBuffer.setChannels(channels); +} + + +// nominal tempo, no need for processing, just pass the samples through +// to outputBuffer +/* +void TDStretch::processNominalTempo() +{ + assert(tempo == 1.0f); + + if (bMidBufferDirty) + { + // If there are samples in pMidBuffer waiting for overlapping, + // do a single sliding overlapping with them in order to prevent a + // clicking distortion in the output sound + if (inputBuffer.numSamples() < overlapLength) + { + // wait until we've got overlapLength input samples + return; + } + // Mix the samples in the beginning of 'inputBuffer' with the + // samples in 'midBuffer' using sliding overlapping + overlap(outputBuffer.ptrEnd(overlapLength), inputBuffer.ptrBegin(), 0); + outputBuffer.putSamples(overlapLength); + inputBuffer.receiveSamples(overlapLength); + clearMidBuffer(); + // now we've caught the nominal sample flow and may switch to + // bypass mode + } + + // Simply bypass samples from input to output + outputBuffer.moveSamples(inputBuffer); +} +*/ + +#include + +// Processes as many processing frames of the samples 'inputBuffer', store +// the result into 'outputBuffer' +void TDStretch::processSamples() +{ + int ovlSkip, offset; + int temp; + + /* Removed this small optimization - can introduce a click to sound when tempo setting + crosses the nominal value + if (tempo == 1.0f) + { + // tempo not changed from the original, so bypass the processing + processNominalTempo(); + return; + } + */ + + // Process samples as long as there are enough samples in 'inputBuffer' + // to form a processing frame. + while ((int)inputBuffer.numSamples() >= sampleReq) + { + // If tempo differs from the normal ('SCALE'), scan for the best overlapping + // position + offset = seekBestOverlapPosition(inputBuffer.ptrBegin()); + + // Mix the samples in the 'inputBuffer' at position of 'offset' with the + // samples in 'midBuffer' using sliding overlapping + // ... first partially overlap with the end of the previous sequence + // (that's in 'midBuffer') + overlap(outputBuffer.ptrEnd((uint)overlapLength), inputBuffer.ptrBegin(), (uint)offset); + outputBuffer.putSamples((uint)overlapLength); + + // ... then copy sequence samples from 'inputBuffer' to output: + + // length of sequence + temp = (seekWindowLength - 2 * overlapLength); + + // crosscheck that we don't have buffer overflow... + if ((int)inputBuffer.numSamples() < (offset + temp + overlapLength * 2)) + { + continue; // just in case, shouldn't really happen + } + + outputBuffer.putSamples(inputBuffer.ptrBegin() + channels * (offset + overlapLength), (uint)temp); + + // Copies the end of the current sequence from 'inputBuffer' to + // 'midBuffer' for being mixed with the beginning of the next + // processing sequence and so on + assert((offset + temp + overlapLength * 2) <= (int)inputBuffer.numSamples()); + memcpy(pMidBuffer, inputBuffer.ptrBegin() + channels * (offset + temp + overlapLength), + channels * sizeof(SAMPLETYPE) * overlapLength); + + // Remove the processed samples from the input buffer. Update + // the difference between integer & nominal skip step to 'skipFract' + // in order to prevent the error from accumulating over time. + skipFract += nominalSkip; // real skip size + ovlSkip = (int)skipFract; // rounded to integer skip + skipFract -= ovlSkip; // maintain the fraction part, i.e. real vs. integer skip + inputBuffer.receiveSamples((uint)ovlSkip); + } +} + + +// Adds 'numsamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void TDStretch::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + // Add the samples into the input buffer + inputBuffer.putSamples(samples, nSamples); + // Process the samples in input buffer + processSamples(); +} + + + +/// Set new overlap length parameter & reallocate RefMidBuffer if necessary. +void TDStretch::acceptNewOverlapLength(int newOverlapLength) +{ + int prevOvl; + + assert(newOverlapLength >= 0); + prevOvl = overlapLength; + overlapLength = newOverlapLength; + + if (overlapLength > prevOvl) + { + delete[] pMidBufferUnaligned; + + pMidBufferUnaligned = new SAMPLETYPE[overlapLength * 2 + 16 / sizeof(SAMPLETYPE)]; + // ensure that 'pMidBuffer' is aligned to 16 byte boundary for efficiency + pMidBuffer = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(pMidBufferUnaligned); + + clearMidBuffer(); + } +} + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX/SSE/etc-capable CPU available or not. +void * TDStretch::operator new(size_t s) +{ + // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead! + ST_THROW_RT_ERROR("Error in TDStretch::new: Don't use 'new TDStretch' directly, use 'newInstance' member instead!"); + return newInstance(); +} + + +TDStretch * TDStretch::newInstance() +{ + uint uExtensions; + + uExtensions = detectCPUextensions(); + + // Check if MMX/SSE instruction set extensions supported by CPU + +#ifdef SOUNDTOUCH_ALLOW_MMX + // MMX routines available only with integer sample types + if (uExtensions & SUPPORT_MMX) + { + return ::new TDStretchMMX; + } + else +#endif // SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + if (uExtensions & SUPPORT_SSE) + { + // SSE support + return ::new TDStretchSSE; + } + else +#endif // SOUNDTOUCH_ALLOW_SSE + + { + // ISA optimizations not supported, use plain C version + return ::new TDStretch; + } +} + + +////////////////////////////////////////////////////////////////////////////// +// +// Integer arithmetics specific algorithm implementations. +// +////////////////////////////////////////////////////////////////////////////// + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + +// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Stereo' +// version of the routine. +void TDStretch::overlapStereo(short *poutput, const short *input) const +{ + int i; + short temp; + int cnt2; + + for (i = 0; i < overlapLength ; i ++) + { + temp = (short)(overlapLength - i); + cnt2 = 2 * i; + poutput[cnt2] = (input[cnt2] * i + pMidBuffer[cnt2] * temp ) / overlapLength; + poutput[cnt2 + 1] = (input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength; + } +} + +// Calculates the x having the closest 2^x value for the given value +static int _getClosest2Power(double value) +{ + return (int)(log(value) / log(2.0) + 0.5); +} + + +/// Calculates overlap period length in samples. +/// Integer version rounds overlap length to closest power of 2 +/// for a divide scaling operation. +void TDStretch::calculateOverlapLength(int aoverlapMs) +{ + int newOvl; + + assert(aoverlapMs >= 0); + + // calculate overlap length so that it's power of 2 - thus it's easy to do + // integer division by right-shifting. Term "-1" at end is to account for + // the extra most significatnt bit left unused in result by signed multiplication + overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0) - 1; + if (overlapDividerBits > 9) overlapDividerBits = 9; + if (overlapDividerBits < 3) overlapDividerBits = 3; + newOvl = (int)pow(2.0, (int)overlapDividerBits + 1); // +1 => account for -1 above + + acceptNewOverlapLength(newOvl); + + // calculate sloping divider so that crosscorrelation operation won't + // overflow 32-bit register. Max. sum of the crosscorrelation sum without + // divider would be 2^30*(N^3-N)/3, where N = overlap length + slopingDivider = (newOvl * newOvl - 1) / 3; +} + + +double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare) const +{ + long corr; + long norm; + int i; + + corr = norm = 0; + // Same routine for stereo and mono. For stereo, unroll loop for better + // efficiency and gives slightly better resolution against rounding. + // For mono it same routine, just unrolls loop by factor of 4 + for (i = 0; i < channels * overlapLength; i += 4) + { + corr += (mixingPos[i] * compare[i] + + mixingPos[i + 1] * compare[i + 1] + + mixingPos[i + 2] * compare[i + 2] + + mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits; + norm += (mixingPos[i] * mixingPos[i] + + mixingPos[i + 1] * mixingPos[i + 1] + + mixingPos[i + 2] * mixingPos[i + 2] + + mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits; + } + + // Normalize result by dividing by sqrt(norm) - this step is easiest + // done using floating point operation + if (norm == 0) norm = 1; // to avoid div by zero + return (double)corr / sqrt((double)norm); +} + +#endif // SOUNDTOUCH_INTEGER_SAMPLES + +////////////////////////////////////////////////////////////////////////////// +// +// Floating point arithmetics specific algorithm implementations. +// + +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + +// Overlaps samples in 'midBuffer' with the samples in 'pInput' +void TDStretch::overlapStereo(float *pOutput, const float *pInput) const +{ + int i; + float fScale; + float f1; + float f2; + + fScale = 1.0f / (float)overlapLength; + + f1 = 0; + f2 = 1.0f; + + for (i = 0; i < 2 * (int)overlapLength ; i += 2) + { + pOutput[i + 0] = pInput[i + 0] * f1 + pMidBuffer[i + 0] * f2; + pOutput[i + 1] = pInput[i + 1] * f1 + pMidBuffer[i + 1] * f2; + + f1 += fScale; + f2 -= fScale; + } +} + + +/// Calculates overlapInMsec period length in samples. +void TDStretch::calculateOverlapLength(int overlapInMsec) +{ + int newOvl; + + assert(overlapInMsec >= 0); + newOvl = (sampleRate * overlapInMsec) / 1000; + if (newOvl < 16) newOvl = 16; + + // must be divisible by 8 + newOvl -= newOvl % 8; + + acceptNewOverlapLength(newOvl); +} + + +double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) const +{ + double corr; + double norm; + int i; + + corr = norm = 0; + // Same routine for stereo and mono. For Stereo, unroll by factor of 2. + // For mono it's same routine yet unrollsd by factor of 4. + for (i = 0; i < channels * overlapLength; i += 4) + { + corr += mixingPos[i] * compare[i] + + mixingPos[i + 1] * compare[i + 1]; + + norm += mixingPos[i] * mixingPos[i] + + mixingPos[i + 1] * mixingPos[i + 1]; + + // unroll the loop for better CPU efficiency: + corr += mixingPos[i + 2] * compare[i + 2] + + mixingPos[i + 3] * compare[i + 3]; + + norm += mixingPos[i + 2] * mixingPos[i + 2] + + mixingPos[i + 3] * mixingPos[i + 3]; + } + + if (norm < 1e-9) norm = 1.0; // to avoid div by zero + return corr / sqrt(norm); +} + +#endif // SOUNDTOUCH_FLOAT_SAMPLES diff --git a/Externals/soundtouch/TDStretch.h b/Externals/soundtouch/TDStretch.h new file mode 100644 index 0000000000..6d6e7359ff --- /dev/null +++ b/Externals/soundtouch/TDStretch.h @@ -0,0 +1,268 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like method +/// with several performance-increasing tweaks. +/// +/// Note : MMX/SSE optimized functions reside in separate, platform-specific files +/// 'mmx_optimized.cpp' and 'sse_optimized.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-04-01 22:49:30 +0300 (Sun, 01 Apr 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: TDStretch.h 137 2012-04-01 19:49:30Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef TDStretch_H +#define TDStretch_H + +#include +#include "STTypes.h" +#include "RateTransposer.h" +#include "FIFOSamplePipe.h" + +namespace soundtouch +{ + +/// Default values for sound processing parameters: +/// Notice that the default parameters are tuned for contemporary popular music +/// processing. For speech processing applications these parameters suit better: +/// #define DEFAULT_SEQUENCE_MS 40 +/// #define DEFAULT_SEEKWINDOW_MS 15 +/// #define DEFAULT_OVERLAP_MS 8 +/// + +/// Default length of a single processing sequence, in milliseconds. This determines to how +/// long sequences the original sound is chopped in the time-stretch algorithm. +/// +/// The larger this value is, the lesser sequences are used in processing. In principle +/// a bigger value sounds better when slowing down tempo, but worse when increasing tempo +/// and vice versa. +/// +/// Increasing this value reduces computational burden & vice versa. +//#define DEFAULT_SEQUENCE_MS 40 +#define DEFAULT_SEQUENCE_MS USE_AUTO_SEQUENCE_LEN + +/// Giving this value for the sequence length sets automatic parameter value +/// according to tempo setting (recommended) +#define USE_AUTO_SEQUENCE_LEN 0 + +/// Seeking window default length in milliseconds for algorithm that finds the best possible +/// overlapping location. This determines from how wide window the algorithm may look for an +/// optimal joining location when mixing the sound sequences back together. +/// +/// The bigger this window setting is, the higher the possibility to find a better mixing +/// position will become, but at the same time large values may cause a "drifting" artifact +/// because consequent sequences will be taken at more uneven intervals. +/// +/// If there's a disturbing artifact that sounds as if a constant frequency was drifting +/// around, try reducing this setting. +/// +/// Increasing this value increases computational burden & vice versa. +//#define DEFAULT_SEEKWINDOW_MS 15 +#define DEFAULT_SEEKWINDOW_MS USE_AUTO_SEEKWINDOW_LEN + +/// Giving this value for the seek window length sets automatic parameter value +/// according to tempo setting (recommended) +#define USE_AUTO_SEEKWINDOW_LEN 0 + +/// Overlap length in milliseconds. When the chopped sound sequences are mixed back together, +/// to form a continuous sound stream, this parameter defines over how long period the two +/// consecutive sequences are let to overlap each other. +/// +/// This shouldn't be that critical parameter. If you reduce the DEFAULT_SEQUENCE_MS setting +/// by a large amount, you might wish to try a smaller value on this. +/// +/// Increasing this value increases computational burden & vice versa. +#define DEFAULT_OVERLAP_MS 8 + + +/// Class that does the time-stretch (tempo change) effect for the processed +/// sound. +class TDStretch : public FIFOProcessor +{ +protected: + int channels; + int sampleReq; + float tempo; + + SAMPLETYPE *pMidBuffer; + SAMPLETYPE *pMidBufferUnaligned; + int overlapLength; + int seekLength; + int seekWindowLength; + int overlapDividerBits; + int slopingDivider; + float nominalSkip; + float skipFract; + FIFOSampleBuffer outputBuffer; + FIFOSampleBuffer inputBuffer; + BOOL bQuickSeek; + + int sampleRate; + int sequenceMs; + int seekWindowMs; + int overlapMs; + BOOL bAutoSeqSetting; + BOOL bAutoSeekSetting; + + void acceptNewOverlapLength(int newOverlapLength); + + virtual void clearCrossCorrState(); + void calculateOverlapLength(int overlapMs); + + virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare) const; + + virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos); + virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos); + int seekBestOverlapPosition(const SAMPLETYPE *refPos); + + virtual void overlapStereo(SAMPLETYPE *output, const SAMPLETYPE *input) const; + virtual void overlapMono(SAMPLETYPE *output, const SAMPLETYPE *input) const; + + void clearMidBuffer(); + void overlap(SAMPLETYPE *output, const SAMPLETYPE *input, uint ovlPos) const; + + void calcSeqParameters(); + + /// Changes the tempo of the given sound samples. + /// Returns amount of samples returned in the "output" buffer. + /// The maximum amount of samples that can be returned at a time is set by + /// the 'set_returnBuffer_size' function. + void processSamples(); + +public: + TDStretch(); + virtual ~TDStretch(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we've a MMX/SSE/etc-capable CPU available or not. + static void *operator new(size_t s); + + /// Use this function instead of "new" operator to create a new instance of this class. + /// This function automatically chooses a correct feature set depending on if the CPU + /// supports MMX/SSE/etc extensions. + static TDStretch *newInstance(); + + /// Returns the output buffer object + FIFOSamplePipe *getOutput() { return &outputBuffer; }; + + /// Returns the input buffer object + FIFOSamplePipe *getInput() { return &inputBuffer; }; + + /// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower + /// tempo, larger faster tempo. + void setTempo(float newTempo); + + /// Returns nonzero if there aren't any samples available for outputting. + virtual void clear(); + + /// Clears the input buffer + void clearInput(); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(int numChannels); + + /// Enables/disables the quick position seeking algorithm. Zero to disable, + /// nonzero to enable + void enableQuickSeek(BOOL enable); + + /// Returns nonzero if the quick seeking algorithm is enabled. + BOOL isQuickSeekEnabled() const; + + /// Sets routine control parameters. These control are certain time constants + /// defining how the sound is stretched to the desired duration. + // + /// 'sampleRate' = sample rate of the sound + /// 'sequenceMS' = one processing sequence length in milliseconds + /// 'seekwindowMS' = seeking window length for scanning the best overlapping + /// position + /// 'overlapMS' = overlapping length + void setParameters(int sampleRate, ///< Samplerate of sound being processed (Hz) + int sequenceMS = -1, ///< Single processing sequence length (ms) + int seekwindowMS = -1, ///< Offset seeking window length (ms) + int overlapMS = -1 ///< Sequence overlapping length (ms) + ); + + /// Get routine control parameters, see setParameters() function. + /// Any of the parameters to this function can be NULL, in such case corresponding parameter + /// value isn't returned. + void getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const; + + /// Adds 'numsamples' pcs of samples from the 'samples' memory position into + /// the input of the object. + virtual void putSamples( + const SAMPLETYPE *samples, ///< Input sample data + uint numSamples ///< Number of samples in 'samples' so that one sample + ///< contains both channels if stereo + ); + + /// return nominal input sample requirement for triggering a processing batch + int getInputSampleReq() const + { + return (int)(nominalSkip + 0.5); + } + + /// return nominal output sample amount when running a processing batch + int getOutputBatchSize() const + { + return seekWindowLength - overlapLength; + } +}; + + + +// Implementation-specific class declarations: + +#ifdef SOUNDTOUCH_ALLOW_MMX + /// Class that implements MMX optimized routines for 16bit integer samples type. + class TDStretchMMX : public TDStretch + { + protected: + double calcCrossCorr(const short *mixingPos, const short *compare) const; + virtual void overlapStereo(short *output, const short *input) const; + virtual void clearCrossCorrState(); + }; +#endif /// SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + /// Class that implements SSE optimized routines for floating point samples type. + class TDStretchSSE : public TDStretch + { + protected: + double calcCrossCorr(const float *mixingPos, const float *compare) const; + }; + +#endif /// SOUNDTOUCH_ALLOW_SSE + +} +#endif /// TDStretch_H diff --git a/Externals/soundtouch/cpu_detect.h b/Externals/soundtouch/cpu_detect.h new file mode 100644 index 0000000000..7859ffb55d --- /dev/null +++ b/Externals/soundtouch/cpu_detect.h @@ -0,0 +1,62 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A header file for detecting the Intel MMX instructions set extension. +/// +/// Please see 'mmx_win.cpp', 'mmx_cpp.cpp' and 'mmx_non_x86.cpp' for the +/// routine implementations for x86 Windows, x86 gnu version and non-x86 +/// platforms, respectively. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $ +// File revision : $Revision: 4 $ +// +// $Id: cpu_detect.h 11 2008-02-10 16:26:55Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _CPU_DETECT_H_ +#define _CPU_DETECT_H_ + +#include "STTypes.h" + +#define SUPPORT_MMX 0x0001 +#define SUPPORT_3DNOW 0x0002 +#define SUPPORT_ALTIVEC 0x0004 +#define SUPPORT_SSE 0x0008 +#define SUPPORT_SSE2 0x0010 + +/// Checks which instruction set extensions are supported by the CPU. +/// +/// \return A bitmask of supported extensions, see SUPPORT_... defines. +uint detectCPUextensions(void); + +/// Disables given set of instruction extensions. See SUPPORT_... defines. +void disableExtensions(uint wDisableMask); + +#endif // _CPU_DETECT_H_ diff --git a/Externals/soundtouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp new file mode 100644 index 0000000000..1103adab57 --- /dev/null +++ b/Externals/soundtouch/cpu_detect_x86.cpp @@ -0,0 +1,137 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Generic version of the x86 CPU extension detection routine. +/// +/// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp' +/// for the Microsoft compiler version. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:44:37 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: cpu_detect_x86.cpp 159 2012-11-08 18:44:37Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "cpu_detect.h" +#include "STTypes.h" + +#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + + #if defined(__GNUC__) && defined(__i386__) + // gcc + #include "cpuid.h" + #elif defined(_M_IX86) + // windows non-gcc + #include + #endif + + #define bit_MMX (1 << 23) + #define bit_SSE (1 << 25) + #define bit_SSE2 (1 << 26) +#endif + + +////////////////////////////////////////////////////////////////////////////// +// +// processor instructions extension detection routines +// +////////////////////////////////////////////////////////////////////////////// + +// Flag variable indicating whick ISA extensions are disabled (for debugging) +static uint _dwDisabledISA = 0x00; // 0xffffffff; //<- use this to disable all extensions + +// Disables given set of instruction extensions. See SUPPORT_... defines. +void disableExtensions(uint dwDisableMask) +{ + _dwDisabledISA = dwDisableMask; +} + + + +/// Checks which instruction set extensions are supported by the CPU. +uint detectCPUextensions(void) +{ +/// If building for a 64bit system (no Itanium) and the user wants optimizations. +/// Return the OR of SUPPORT_{MMX,SSE,SSE2}. 11001 or 0x19. +/// Keep the _dwDisabledISA test (2 more operations, could be eliminated). +#if ((defined(__GNUC__) && defined(__x86_64__)) \ + || defined(_M_X64)) \ + && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + return 0x19 & ~_dwDisabledISA; + +/// If building for a 32bit system and the user wants optimizations. +/// Keep the _dwDisabledISA test (2 more operations, could be eliminated). +#elif ((defined(__GNUC__) && defined(__i386__)) \ + || defined(_M_IX86)) \ + && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + + if (_dwDisabledISA == 0xffffffff) return 0; + + uint res = 0; + +#if defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + + // Check if no cpuid support. + if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions. + + if (edx & bit_MMX) res = res | SUPPORT_MMX; + if (edx & bit_SSE) res = res | SUPPORT_SSE; + if (edx & bit_SSE2) res = res | SUPPORT_SSE2; + +#else + // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required + // for __cpuid intrinsic support. + int reg[4] = {-1}; + + // Check if no cpuid support. + __cpuid(reg,0); + if ((unsigned int)reg[0] == 0) return 0; // always disable extensions. + + __cpuid(reg,1); + if ((unsigned int)reg[3] & bit_MMX) res = res | SUPPORT_MMX; + if ((unsigned int)reg[3] & bit_SSE) res = res | SUPPORT_SSE; + if ((unsigned int)reg[3] & bit_SSE2) res = res | SUPPORT_SSE2; + +#endif + + return res & ~_dwDisabledISA; + +#else + +/// One of these is true: +/// 1) We don't want optimizations. +/// 2) Using an unsupported compiler. +/// 3) Running on a non-x86 platform. + return 0; + +#endif +} diff --git a/Externals/soundtouch/mmx_optimized.cpp b/Externals/soundtouch/mmx_optimized.cpp new file mode 100644 index 0000000000..0952fd4f84 --- /dev/null +++ b/Externals/soundtouch/mmx_optimized.cpp @@ -0,0 +1,317 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// MMX optimized routines. All MMX optimized functions have been gathered into +/// this single source code file, regardless to their class or original source +/// code file, in order to ease porting the library to other compiler and +/// processor platforms. +/// +/// The MMX-optimizations are programmed using MMX compiler intrinsics that +/// are supported both by Microsoft Visual C++ and GCC compilers, so this file +/// should compile with both toolsets. +/// +/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ +/// 6.0 processor pack" update to support compiler intrinsic syntax. The update +/// is available for download at Microsoft Developers Network, see here: +/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: mmx_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "STTypes.h" + +#ifdef SOUNDTOUCH_ALLOW_MMX +// MMX routines available only with integer sample type + +using namespace soundtouch; + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of MMX optimized functions of class 'TDStretchMMX' +// +////////////////////////////////////////////////////////////////////////////// + +#include "TDStretch.h" +#include +#include +#include + + +// Calculates cross correlation of two buffers +double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const +{ + const __m64 *pVec1, *pVec2; + __m64 shifter; + __m64 accu, normaccu; + long corr, norm; + int i; + + pVec1 = (__m64*)pV1; + pVec2 = (__m64*)pV2; + + shifter = _m_from_int(overlapDividerBits); + normaccu = accu = _mm_setzero_si64(); + + // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples + // during each round for improved CPU-level parallellization. + for (i = 0; i < channels * overlapLength / 16; i ++) + { + __m64 temp, temp2; + + // dictionary of instructions: + // _m_pmaddwd : 4*16bit multiply-add, resulting two 32bits = [a0*b0+a1*b1 ; a2*b2+a3*b3] + // _mm_add_pi32 : 2*32bit add + // _m_psrad : 32bit right-shift + + temp = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]), + _mm_madd_pi16(pVec1[1], pVec2[1])); + temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]), + _mm_madd_pi16(pVec1[1], pVec1[1])); + accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter)); + normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter)); + + temp = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]), + _mm_madd_pi16(pVec1[3], pVec2[3])); + temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]), + _mm_madd_pi16(pVec1[3], pVec1[3])); + accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter)); + normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter)); + + pVec1 += 4; + pVec2 += 4; + } + + // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1 + // and finally store the result into the variable "corr" + + accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32)); + corr = _m_to_int(accu); + + normaccu = _mm_add_pi32(normaccu, _mm_srli_si64(normaccu, 32)); + norm = _m_to_int(normaccu); + + // Clear MMS state + _m_empty(); + + // Normalize result by dividing by sqrt(norm) - this step is easiest + // done using floating point operation + if (norm == 0) norm = 1; // to avoid div by zero + + return (double)corr / sqrt((double)norm); + // Note: Warning about the missing EMMS instruction is harmless + // as it'll be called elsewhere. +} + + + +void TDStretchMMX::clearCrossCorrState() +{ + // Clear MMS state + _m_empty(); + //_asm EMMS; +} + + + +// MMX-optimized version of the function overlapStereo +void TDStretchMMX::overlapStereo(short *output, const short *input) const +{ + const __m64 *pVinput, *pVMidBuf; + __m64 *pVdest; + __m64 mix1, mix2, adder, shifter; + int i; + + pVinput = (const __m64*)input; + pVMidBuf = (const __m64*)pMidBuffer; + pVdest = (__m64*)output; + + // mix1 = mixer values for 1st stereo sample + // mix1 = mixer values for 2nd stereo sample + // adder = adder for updating mixer values after each round + + mix1 = _mm_set_pi16(0, overlapLength, 0, overlapLength); + adder = _mm_set_pi16(1, -1, 1, -1); + mix2 = _mm_add_pi16(mix1, adder); + adder = _mm_add_pi16(adder, adder); + + // Overlaplength-division by shifter. "+1" is to account for "-1" deduced in + // overlapDividerBits calculation earlier. + shifter = _m_from_int(overlapDividerBits + 1); + + for (i = 0; i < overlapLength / 4; i ++) + { + __m64 temp1, temp2; + + // load & shuffle data so that input & mixbuffer data samples are paired + temp1 = _mm_unpacklo_pi16(pVMidBuf[0], pVinput[0]); // = i0l m0l i0r m0r + temp2 = _mm_unpackhi_pi16(pVMidBuf[0], pVinput[0]); // = i1l m1l i1r m1r + + // temp = (temp .* mix) >> shifter + temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter); + temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter); + pVdest[0] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit + + // update mix += adder + mix1 = _mm_add_pi16(mix1, adder); + mix2 = _mm_add_pi16(mix2, adder); + + // --- second round begins here --- + + // load & shuffle data so that input & mixbuffer data samples are paired + temp1 = _mm_unpacklo_pi16(pVMidBuf[1], pVinput[1]); // = i2l m2l i2r m2r + temp2 = _mm_unpackhi_pi16(pVMidBuf[1], pVinput[1]); // = i3l m3l i3r m3r + + // temp = (temp .* mix) >> shifter + temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter); + temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter); + pVdest[1] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit + + // update mix += adder + mix1 = _mm_add_pi16(mix1, adder); + mix2 = _mm_add_pi16(mix2, adder); + + pVinput += 2; + pVMidBuf += 2; + pVdest += 2; + } + + _m_empty(); // clear MMS state +} + + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of MMX optimized functions of class 'FIRFilter' +// +////////////////////////////////////////////////////////////////////////////// + +#include "FIRFilter.h" + + +FIRFilterMMX::FIRFilterMMX() : FIRFilter() +{ + filterCoeffsUnalign = NULL; +} + + +FIRFilterMMX::~FIRFilterMMX() +{ + delete[] filterCoeffsUnalign; +} + + +// (overloaded) Calculates filter coefficients for MMX routine +void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor) +{ + uint i; + FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor); + + // Ensure that filter coeffs array is aligned to 16-byte boundary + delete[] filterCoeffsUnalign; + filterCoeffsUnalign = new short[2 * newLength + 8]; + filterCoeffsAlign = (short *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign); + + // rearrange the filter coefficients for mmx routines + for (i = 0;i < length; i += 4) + { + filterCoeffsAlign[2 * i + 0] = coeffs[i + 0]; + filterCoeffsAlign[2 * i + 1] = coeffs[i + 2]; + filterCoeffsAlign[2 * i + 2] = coeffs[i + 0]; + filterCoeffsAlign[2 * i + 3] = coeffs[i + 2]; + + filterCoeffsAlign[2 * i + 4] = coeffs[i + 1]; + filterCoeffsAlign[2 * i + 5] = coeffs[i + 3]; + filterCoeffsAlign[2 * i + 6] = coeffs[i + 1]; + filterCoeffsAlign[2 * i + 7] = coeffs[i + 3]; + } +} + + + +// mmx-optimized version of the filter routine for stereo sound +uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const +{ + // Create stack copies of the needed member variables for asm routines : + uint i, j; + __m64 *pVdest = (__m64*)dest; + + if (length < 2) return 0; + + for (i = 0; i < (numSamples - length) / 2; i ++) + { + __m64 accu1; + __m64 accu2; + const __m64 *pVsrc = (const __m64*)src; + const __m64 *pVfilter = (const __m64*)filterCoeffsAlign; + + accu1 = accu2 = _mm_setzero_si64(); + for (j = 0; j < lengthDiv8 * 2; j ++) + { + __m64 temp1, temp2; + + temp1 = _mm_unpacklo_pi16(pVsrc[0], pVsrc[1]); // = l2 l0 r2 r0 + temp2 = _mm_unpackhi_pi16(pVsrc[0], pVsrc[1]); // = l3 l1 r3 r1 + + accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp1, pVfilter[0])); // += l2*f2+l0*f0 r2*f2+r0*f0 + accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp2, pVfilter[1])); // += l3*f3+l1*f1 r3*f3+r1*f1 + + temp1 = _mm_unpacklo_pi16(pVsrc[1], pVsrc[2]); // = l4 l2 r4 r2 + + accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp2, pVfilter[0])); // += l3*f2+l1*f0 r3*f2+r1*f0 + accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp1, pVfilter[1])); // += l4*f3+l2*f1 r4*f3+r2*f1 + + // accu1 += l2*f2+l0*f0 r2*f2+r0*f0 + // += l3*f3+l1*f1 r3*f3+r1*f1 + + // accu2 += l3*f2+l1*f0 r3*f2+r1*f0 + // l4*f3+l2*f1 r4*f3+r2*f1 + + pVfilter += 2; + pVsrc += 2; + } + // accu >>= resultDivFactor + accu1 = _mm_srai_pi32(accu1, resultDivFactor); + accu2 = _mm_srai_pi32(accu2, resultDivFactor); + + // pack 2*2*32bits => 4*16 bits + pVdest[0] = _mm_packs_pi32(accu1, accu2); + src += 4; + pVdest ++; + } + + _m_empty(); // clear emms state + + return (numSamples & 0xfffffffe) - length; +} + +#endif // SOUNDTOUCH_ALLOW_MMX diff --git a/Externals/soundtouch/sse_optimized.cpp b/Externals/soundtouch/sse_optimized.cpp new file mode 100644 index 0000000000..ffb6706288 --- /dev/null +++ b/Externals/soundtouch/sse_optimized.cpp @@ -0,0 +1,361 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// SSE optimized routines for Pentium-III, Athlon-XP and later CPUs. All SSE +/// optimized functions have been gathered into this single source +/// code file, regardless to their class or original source code file, in order +/// to ease porting the library to other compiler and processor platforms. +/// +/// The SSE-optimizations are programmed using SSE compiler intrinsics that +/// are supported both by Microsoft Visual C++ and GCC compilers, so this file +/// should compile with both toolsets. +/// +/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ +/// 6.0 processor pack" update to support SSE instruction set. The update is +/// available for download at Microsoft Developers Network, see here: +/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx +/// +/// If the above URL is expired or removed, go to "http://msdn.microsoft.com" and +/// perform a search with keywords "processor pack". +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: sse_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "cpu_detect.h" +#include "STTypes.h" + +using namespace soundtouch; + +#ifdef SOUNDTOUCH_ALLOW_SSE + +// SSE routines available only with float sample type + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of SSE optimized functions of class 'TDStretchSSE' +// +////////////////////////////////////////////////////////////////////////////// + +#include "TDStretch.h" +#include +#include + +// Calculates cross correlation of two buffers +double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const +{ + int i; + const float *pVec1; + const __m128 *pVec2; + __m128 vSum, vNorm; + + // Note. It means a major slow-down if the routine needs to tolerate + // unaligned __m128 memory accesses. It's way faster if we can skip + // unaligned slots and use _mm_load_ps instruction instead of _mm_loadu_ps. + // This can mean up to ~ 10-fold difference (incl. part of which is + // due to skipping every second round for stereo sound though). + // + // Compile-time define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION is provided + // for choosing if this little cheating is allowed. + +#ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION + // Little cheating allowed, return valid correlation only for + // aligned locations, meaning every second round for stereo sound. + + #define _MM_LOAD _mm_load_ps + + if (((ulongptr)pV1) & 15) return -1e50; // skip unaligned locations + +#else + // No cheating allowed, use unaligned load & take the resulting + // performance hit. + #define _MM_LOAD _mm_loadu_ps +#endif + + // ensure overlapLength is divisible by 8 + assert((overlapLength % 8) == 0); + + // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors + // Note: pV2 _must_ be aligned to 16-bit boundary, pV1 need not. + pVec1 = (const float*)pV1; + pVec2 = (const __m128*)pV2; + vSum = vNorm = _mm_setzero_ps(); + + // Unroll the loop by factor of 4 * 4 operations. Use same routine for + // stereo & mono, for mono it just means twice the amount of unrolling. + for (i = 0; i < channels * overlapLength / 16; i ++) + { + __m128 vTemp; + // vSum += pV1[0..3] * pV2[0..3] + vTemp = _MM_LOAD(pVec1); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp ,pVec2[0])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[4..7] * pV2[4..7] + vTemp = _MM_LOAD(pVec1 + 4); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[1])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[8..11] * pV2[8..11] + vTemp = _MM_LOAD(pVec1 + 8); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[2])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[12..15] * pV2[12..15] + vTemp = _MM_LOAD(pVec1 + 12); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[3])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + pVec1 += 16; + pVec2 += 4; + } + + // return value = vSum[0] + vSum[1] + vSum[2] + vSum[3] + float *pvNorm = (float*)&vNorm; + double norm = sqrt(pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]); + if (norm < 1e-9) norm = 1.0; // to avoid div by zero + + float *pvSum = (float*)&vSum; + return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / norm; + + /* This is approximately corresponding routine in C-language yet without normalization: + double corr, norm; + uint i; + + // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors + corr = norm = 0.0; + for (i = 0; i < channels * overlapLength / 16; i ++) + { + corr += pV1[0] * pV2[0] + + pV1[1] * pV2[1] + + pV1[2] * pV2[2] + + pV1[3] * pV2[3] + + pV1[4] * pV2[4] + + pV1[5] * pV2[5] + + pV1[6] * pV2[6] + + pV1[7] * pV2[7] + + pV1[8] * pV2[8] + + pV1[9] * pV2[9] + + pV1[10] * pV2[10] + + pV1[11] * pV2[11] + + pV1[12] * pV2[12] + + pV1[13] * pV2[13] + + pV1[14] * pV2[14] + + pV1[15] * pV2[15]; + + for (j = 0; j < 15; j ++) norm += pV1[j] * pV1[j]; + + pV1 += 16; + pV2 += 16; + } + return corr / sqrt(norm); + */ +} + + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of SSE optimized functions of class 'FIRFilter' +// +////////////////////////////////////////////////////////////////////////////// + +#include "FIRFilter.h" + +FIRFilterSSE::FIRFilterSSE() : FIRFilter() +{ + filterCoeffsAlign = NULL; + filterCoeffsUnalign = NULL; +} + + +FIRFilterSSE::~FIRFilterSSE() +{ + delete[] filterCoeffsUnalign; + filterCoeffsAlign = NULL; + filterCoeffsUnalign = NULL; +} + + +// (overloaded) Calculates filter coefficients for SSE routine +void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor) +{ + uint i; + float fDivider; + + FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor); + + // Scale the filter coefficients so that it won't be necessary to scale the filtering result + // also rearrange coefficients suitably for SSE + // Ensure that filter coeffs array is aligned to 16-byte boundary + delete[] filterCoeffsUnalign; + filterCoeffsUnalign = new float[2 * newLength + 4]; + filterCoeffsAlign = (float *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign); + + fDivider = (float)resultDivider; + + // rearrange the filter coefficients for mmx routines + for (i = 0; i < newLength; i ++) + { + filterCoeffsAlign[2 * i + 0] = + filterCoeffsAlign[2 * i + 1] = coeffs[i + 0] / fDivider; + } +} + + + +// SSE-optimized version of the filter routine for stereo sound +uint FIRFilterSSE::evaluateFilterStereo(float *dest, const float *source, uint numSamples) const +{ + int count = (int)((numSamples - length) & (uint)-2); + int j; + + assert(count % 2 == 0); + + if (count < 2) return 0; + + assert(source != NULL); + assert(dest != NULL); + assert((length % 8) == 0); + assert(filterCoeffsAlign != NULL); + assert(((ulongptr)filterCoeffsAlign) % 16 == 0); + + // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2' + for (j = 0; j < count; j += 2) + { + const float *pSrc; + const __m128 *pFil; + __m128 sum1, sum2; + uint i; + + pSrc = (const float*)source; // source audio data + pFil = (const __m128*)filterCoeffsAlign; // filter coefficients. NOTE: Assumes coefficients + // are aligned to 16-byte boundary + sum1 = sum2 = _mm_setzero_ps(); + + for (i = 0; i < length / 8; i ++) + { + // Unroll loop for efficiency & calculate filter for 2*2 stereo samples + // at each pass + + // sum1 is accu for 2*2 filtered stereo sound data at the primary sound data offset + // sum2 is accu for 2*2 filtered stereo sound data for the next sound sample offset. + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc) , pFil[0])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 2), pFil[0])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 4), pFil[1])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 6), pFil[1])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 8) , pFil[2])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 10), pFil[2])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 12), pFil[3])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 14), pFil[3])); + + pSrc += 16; + pFil += 4; + } + + // Now sum1 and sum2 both have a filtered 2-channel sample each, but we still need + // to sum the two hi- and lo-floats of these registers together. + + // post-shuffle & add the filtered values and store to dest. + _mm_storeu_ps(dest, _mm_add_ps( + _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(1,0,3,2)), // s2_1 s2_0 s1_3 s1_2 + _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(3,2,1,0)) // s2_3 s2_2 s1_1 s1_0 + )); + source += 4; + dest += 4; + } + + // Ideas for further improvement: + // 1. If it could be guaranteed that 'source' were always aligned to 16-byte + // boundary, a faster aligned '_mm_load_ps' instruction could be used. + // 2. If it could be guaranteed that 'dest' were always aligned to 16-byte + // boundary, a faster '_mm_store_ps' instruction could be used. + + return (uint)count; + + /* original routine in C-language. please notice the C-version has differently + organized coefficients though. + double suml1, suml2; + double sumr1, sumr2; + uint i, j; + + for (j = 0; j < count; j += 2) + { + const float *ptr; + const float *pFil; + + suml1 = sumr1 = 0.0; + suml2 = sumr2 = 0.0; + ptr = src; + pFil = filterCoeffs; + for (i = 0; i < lengthLocal; i ++) + { + // unroll loop for efficiency. + + suml1 += ptr[0] * pFil[0] + + ptr[2] * pFil[2] + + ptr[4] * pFil[4] + + ptr[6] * pFil[6]; + + sumr1 += ptr[1] * pFil[1] + + ptr[3] * pFil[3] + + ptr[5] * pFil[5] + + ptr[7] * pFil[7]; + + suml2 += ptr[8] * pFil[0] + + ptr[10] * pFil[2] + + ptr[12] * pFil[4] + + ptr[14] * pFil[6]; + + sumr2 += ptr[9] * pFil[1] + + ptr[11] * pFil[3] + + ptr[13] * pFil[5] + + ptr[15] * pFil[7]; + + ptr += 16; + pFil += 8; + } + dest[0] = (float)suml1; + dest[1] = (float)sumr1; + dest[2] = (float)suml2; + dest[3] = (float)sumr2; + + src += 4; + dest += 4; + } + */ +} + +#endif // SOUNDTOUCH_ALLOW_SSE diff --git a/Externals/wxWidgets3/wx/wxcocoa.h b/Externals/wxWidgets3/wx/wxcocoa.h index 406621565c..841d17e949 100644 --- a/Externals/wxWidgets3/wx/wxcocoa.h +++ b/Externals/wxWidgets3/wx/wxcocoa.h @@ -996,25 +996,25 @@ #define HAVE_USLEEP 1 /* Define if you have wcscasecmp() function */ -#define HAVE_WCSCASECMP 1 +/* #undef HAVE_WCSCASECMP 1 */ /* Define if you have wcsncasecmp() function */ -#define HAVE_WCSNCASECMP 1 +/* #undef HAVE_WCSNCASECMP 1 */ /* Define if you have wcslen function */ #define HAVE_WCSLEN 1 /* Define if you have wcsdup function */ -#define HAVE_WCSDUP 1 +/* #undef HAVE_WCSDUP 1 */ /* Define if you have wcsftime() function */ #define HAVE_WCSFTIME 1 /* Define if you have strnlen() function */ -#define HAVE_STRNLEN 1 +/* #undef HAVE_STRNLEN 1 */ /* Define if you have wcsnlen() function */ -#define HAVE_WCSNLEN 1 +/* #undef HAVE_WCSNLEN 1 */ /* Define if you have wcstoull() and wcstoll() */ /* #undef HAVE_WCSTOULL */ diff --git a/Languages/gettextize b/Languages/gettextize index 949c46f8df..d245544eda 100755 --- a/Languages/gettextize +++ b/Languages/gettextize @@ -7,7 +7,11 @@ CPP_FILE_LIST=$(find $SRCDIR \( -name '*.cpp' -o -name '*.h' -o -name '*.c' \) \ xgettext -d dolphin-emu -s --keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT \ --keyword=PanicAlertT --keyword=PanicYesNoT --keyword=AskYesNoT --keyword=_trans \ --keyword=CriticalAlertT --add-comments=i18n -p ./Languages/po -o dolphin-emu.pot \ - $CPP_FILE_LIST --package-name="Dolphin Emu" + $CPP_FILE_LIST --package-name="Dolphin Emulator" + +sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/" Languages/po/dolphin-emu.pot +sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2003-2013/" Languages/po/dolphin-emu.pot +sed -i "s/license as the PACKAGE package/license as the dolphin-emu package/" Languages/po/dolphin-emu.pot POTFILE=./Languages/po/dolphin-emu.pot PO_FILES=$(find ./Languages/po -name '*.po') diff --git a/Languages/po/ar.po b/Languages/po/ar.po index c073eceb10..b2f93ecf21 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,26 +7,26 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-12-27 08:27-0600\n" -"Last-Translator: mansoor\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-22 15:32-0600\n" +"Last-Translator: \n" "Language-Team: \n" -"Language: \n" +"Language: Arabic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(كثير جدا العرض)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " لعبة : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! لا" @@ -44,24 +44,17 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d هرتز" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i متصل" @@ -146,158 +139,158 @@ msgstr "%sتصدير GCI%s" msgid "%sImport GCI%s" msgstr "%sاستيراد GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&حول البرنامج " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&التشغيل من محرك الاقراص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&نقاط التوقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&استعراض الايزو " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&مدير الاسرار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&محاكاة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&ملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&الاطار المسبق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ملء الشاشة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&مساعدة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&تحميل الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&بطاقه الذكره جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ùتح" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&خيارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&وقÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&وضع للقراءة Ùقط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&تحديث القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&تسجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&إعادة اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&الصوت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&أدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Ùديو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&معلومات عن اللعبة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -311,27 +304,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(معروÙ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ايقاÙ)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" -msgstr "" +msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 بت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 بت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "الرؤية ثلاثية الأبعاد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 بت" @@ -339,46 +332,47 @@ msgstr "8 بت" msgid "" msgstr "<أدخل اسم هنا>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<لا شيء>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<النظام>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" -msgstr "" +msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ناÙذة اللعب عبر النت Ù…Ùتوح بالÙعل!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "اللعبة ليست قيد التشغيل حاليا." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "لم يتم العثور على جهاز بلوتوث!\n" "(Ùقط بلوتوث مايكروسوÙت معتمد.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -410,33 +404,33 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منÙØ° الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "اسرار" #: Source/Core/DolphinWX/Src/AboutDolphin.h:33 msgid "About Dolphin" -msgstr "ترجمة البرنامج بواسطة الررائع" +msgstr "ترجمة البرنامج بواسطة منصور العسيري" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "ضبط:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -449,8 +443,8 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "العمل" @@ -464,42 +458,43 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -507,27 +502,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "كرت الشاشه :" @@ -536,11 +531,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "أض٠باتش" @@ -548,13 +543,13 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "العنوان :" @@ -580,74 +575,76 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "إعدادات متقدمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" +msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"يسمح تبديل خيارات معينة عبر Ù…Ùاتيح الاختصار 3ØŒ 4ØŒ 5ØŒ 6 Ùˆ 7 ضمن ناÙذة " -"المضاهاة.\n" +"يسمح تبديل خيارات معينة عبر Ù…Ùاتيح الاختصار 3ØŒ 4ØŒ 5ØŒ 6 ضمن ناÙذة المضاهاة.\n" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" +msgstr "تحليل" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "تصÙية متباينة الخواص :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "تنعيم الحواÙ:" @@ -659,15 +656,15 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "تطبيق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -677,27 +674,27 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" -msgstr "Arabic" +msgstr "العربية" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -705,12 +702,12 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "صوت الخلÙية :" @@ -718,24 +715,24 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "تلقائي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "تلقائي (Multiple of 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "تلقائي حجم الناÙذة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "ضبط حجم الناÙذة تلقائي " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -745,41 +742,28 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"إذا لم تكن متأكدا اترك هذا التحقق." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" -msgstr "" +msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "&تسجل" +msgstr "BP تسجل" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "إعدادات الخلÙية" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "الخلÙية:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "خلÙية الإدخال" @@ -792,16 +776,16 @@ msgstr "الى الوراء" msgid "Bad File Header" msgstr "سيء بداية المل٠" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "تÙاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "بنر:" @@ -809,11 +793,11 @@ msgstr "بنر:" msgid "Bar" msgstr "شريط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -825,7 +809,7 @@ msgstr "صوت عميق" msgid "Block Allocation Table checksum failed" msgstr "كتلة الاختباري جدول تخصيص Ùشل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "كتل" @@ -841,50 +825,56 @@ msgstr "اليسار أزرق" msgid "Blue Right" msgstr "اليمين أزرق" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "معطلة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "أستعرض" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "لتصÙØ­ دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "العازلة :" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "أزرار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 -msgid "C" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." msgstr "" +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +msgid "C" +msgstr "C" + #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" msgstr "العصا الأيمن " @@ -893,35 +883,19 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" -msgstr "" +msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"احتساب القيم من عمق ثلاثي الأبعاد الرسومات لكل بكسل بدلا من قمة الرأس " -"الواحدة.\n" -"وعلى النقيض من بكسل الإضاءة التي هي مجرد تعزيز، لكل بكسل عمق العمليات " -"الحسابية اللازمة لمضاهاة صحيح عدد قليل من الألعاب.\n" -"\n" -"إذا لم تكن متأكدا اترك هذا التحقق." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -935,7 +909,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "إلغاء" @@ -951,7 +925,7 @@ msgstr "لا يمكن Ùتح %s" msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -962,7 +936,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -970,18 +944,18 @@ msgstr "" "لا يمكن استخدام هذا المل٠كبطاقة الذاكرة.\n" "هل تحاول استخدام Ù†Ùس المل٠ÙÙŠ كل من Ùتحات?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -989,28 +963,28 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" -msgstr "Catalan" +msgstr "الكاتالونية" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "مركز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "تغيير" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "تغيير &القرص" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "تغيير القرص" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "تغيير اللعبة" @@ -1031,11 +1005,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (بعد التصحيح)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "شات" @@ -1043,47 +1016,47 @@ msgstr "شات" msgid "Cheat Code" msgstr "اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "بحث عن اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "تحقق سلامة التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "التحقق من سلامة ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" -msgstr "Chinese (Simplified)" +msgstr "الصينية المبسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" -msgstr "Chinese (Traditional)" +msgstr "الصينية التقليدية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1091,15 +1064,15 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1113,8 +1086,8 @@ msgstr "الكلاسيكية" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "أزال" @@ -1126,22 +1099,22 @@ msgstr "" "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك " "يدويا إيقا٠اللعبة." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "إغلاق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "رمز المعلومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "رمز: " @@ -1149,95 +1122,95 @@ msgstr "رمز: " msgid "Command" msgstr "الأمر" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "إعدادات التحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "تكوين منصات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr " توصيل ويموت%i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "توصيل ويموت 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "توصيل ويموت 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "توصيل ويموت 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "توصيل" @@ -1253,16 +1226,16 @@ msgstr "عصا تحكم" msgid "Convert to GCI" msgstr "GCIتحويل إلى " -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Ùشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "الأساسية" @@ -1271,7 +1244,7 @@ msgstr "الأساسية" msgid "Could not create %s" msgstr "لا يمكن إنشاء %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "لا يمكن تهيئة الخلÙية %s." @@ -1292,12 +1265,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعر٠مل٠ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "لا يمكن Ø­Ùظ %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1305,7 +1278,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1318,11 +1291,11 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1330,17 +1303,17 @@ msgstr "" "لا يمكن التهيئة الأساسية.\n" "تحقق التكوين الخاص بك." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "البلد:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "إنشاء رموز اسرار" @@ -1349,28 +1322,7 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by KDE-Look.org" -msgstr " KDE-Look.org تم بواسطة" - -#: 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:496 -msgid "Created by VistaIcons.com" -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 and published on ForumW.org > Web DevelopmentsCreated by " -"black_rider and published on ForumW.org > Web Developments black_rider and " -"published on ForumW.org > Web Developments تم بواسطة" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "المنشئ :" @@ -1378,11 +1330,11 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "محصول" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1396,12 +1348,12 @@ msgstr "" msgid "Crossfade" msgstr "الإبهات المتداخل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1409,52 +1361,52 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" -msgstr "Czech" +msgstr "التشيكية" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "الاسهم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Root:" @@ -1466,16 +1418,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "التاريخ :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1487,11 +1439,11 @@ msgstr "" msgid "Dead Zone" msgstr "المنطقة الميتة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "التصحيح" @@ -1499,24 +1451,24 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" @@ -1525,11 +1477,11 @@ msgid "Default font" msgstr "الخط الاÙتراضي" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "حذ٠الحÙظ" @@ -1538,11 +1490,11 @@ msgstr "حذ٠الحÙظ" msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "الوصÙ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "كشÙ" @@ -1553,13 +1505,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1583,28 +1535,16 @@ msgstr "" "Ùشل الدليل الاختباري\n" " Ùˆ Ùشل دليل الاختباري الاحتياطية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "تعطيل إضاءة" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "تعطيل العمق لكل بكسل" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Texturesتعطيل " - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1618,7 +1558,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1634,17 +1574,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"texturing تعطل .\n" -"\n" -"إذا لم تكن متأكدا اترك هذا غير محددة." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "القرص" @@ -1653,11 +1583,11 @@ msgstr "القرص" msgid "Disc Read Error" msgstr "خطأ قراءة القرص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "العرض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1671,20 +1601,24 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "موقع دولÙين" @@ -1692,55 +1626,60 @@ msgstr "موقع دولÙين" msgid "Dolphin Configuration" msgstr "إعدادات دولÙين" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "دولÙين على مدونة قوقل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملÙات " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "تم تعيين دولÙين حاليا إخÙاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "تحميل اسرار للعبة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu وأضا٠%lu تم تحميل الاسرار " @@ -1749,27 +1688,27 @@ msgstr "%lu وأضا٠%lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump Textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1779,7 +1718,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1789,7 +1728,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1799,24 +1738,24 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" -msgstr "Dutch" +msgstr "الهولندية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "خروج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1826,11 +1765,11 @@ msgstr "" msgid "EUROPE" msgstr "أوروبا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "بداية تحديث الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "تحرير" @@ -1838,7 +1777,7 @@ msgstr "تحرير" msgid "Edit ActionReplay Code" msgstr "تعديل رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "تعديل الاعدادات" @@ -1846,12 +1785,12 @@ msgstr "تعديل الاعدادات" msgid "Edit Patch" msgstr "تعديل الباتش" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "تحرير" @@ -1859,15 +1798,15 @@ msgstr "تحرير" msgid "Effect" msgstr "تأثير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالÙعل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1876,7 +1815,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1892,19 +1831,19 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "حالة المحاكاه: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "تمكين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1921,72 +1860,67 @@ msgstr "" "يتطلب ملء الشاشة للعمل.\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "BAT تمكين" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2000,7 +1934,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2008,11 +1942,11 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "تمكين صÙحات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2024,7 +1958,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2036,24 +1970,34 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشÙÙ‚ الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2065,13 +2009,13 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2085,14 +2029,14 @@ msgstr "" msgid "End" msgstr "نهاية" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" -msgstr "English" +msgstr "الإنجليزية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "تحسينات" @@ -2110,17 +2054,17 @@ msgstr "دخول %d/%d" msgid "Entry 1/%d" msgstr "دخول 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "المساواة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "خطأ" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2157,36 +2101,32 @@ msgstr "" msgid "Execute" msgstr "تنÙيذ" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "للخروج مع المحاكي" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "تصدير جميع الحÙظ" @@ -2194,15 +2134,15 @@ msgstr "تصدير جميع الحÙظ" msgid "Export failed, try again?" msgstr "Ùشل تصدير، حاول مرة أخرى؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "تصدير Ø­Ùظ باسم" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2214,52 +2154,52 @@ msgstr "معلمة إضاÙية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "استخراج الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "استخراج" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "بايت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "لاعبين" @@ -2267,7 +2207,7 @@ msgstr "لاعبين" msgid "FRANCE" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "الحجم :" @@ -2275,15 +2215,15 @@ msgstr "الحجم :" msgid "Failed to Connect!" msgstr "خطأ الاتصال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "لم اسمع!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2311,20 +2251,25 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "Ùشل تحميل hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Ùشل ÙÙŠ قراءة عنوان" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Ùشل ÙÙŠ قراءة banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"Ùشل ÙÙŠ قراءة بيانات الحÙظ\n" -"(0xA000-)\n" -"قد يتم اقتطاع بطاقة ذاكرة" +"Failed to read block %d of the save data\n" +"Memcard may be truncated\n" +"FilePosition:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2383,45 +2328,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" -msgstr "" +msgstr "الÙارسية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps سريع" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "مل٠المعلومات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "المل٠لا يتضمن اسرار." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "تحويل مل٠إلى .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2438,7 +2379,7 @@ msgstr "" "مل٠يحتوي على ملحق \"%s\"\n" "ملحقات الصالحة (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "لم يتم التعر٠على المل٠كمل٠بطاقة ذاكرة" @@ -2451,47 +2392,47 @@ msgstr "مل٠غير مضغوط " msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "بحث عن التالي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "البحث السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "العرض 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2503,7 +2444,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2515,7 +2456,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2535,78 +2476,77 @@ msgstr "" msgid "Forward" msgstr "إلى الأمام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "الإطار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "الإطار" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" -msgstr "الإطار" +msgstr "معلومات الإطار " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "مجموعة الإطار " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "حد الإطار:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" -msgstr "French" +msgstr "الÙرنسية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38 msgid "Frets" msgstr "الحنق" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "من" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "شاشه كامله" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "دقة العرض :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI File(*.gci)" @@ -2614,62 +2554,66 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "معر٠اللعبة:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "لعبة تستخدم بالÙعل!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "اللعبة ليست على التوالي!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "ملÙات Ø­Ùظ لعبة جيم كيوب(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "تحميل اسرار" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2679,41 +2623,41 @@ msgstr "" "GeckoCode Ùشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "عام" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" -msgstr "German" +msgstr "الألمانية" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "أكبر من" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2729,9 +2673,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" -msgstr "Greek" +msgstr "اليونانية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Green" @@ -2749,11 +2693,11 @@ msgstr "اليمين أخضر" msgid "Guitar" msgstr "غيتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "هاك" @@ -2761,11 +2705,11 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" -msgstr "Hebrew" +msgstr "العبرية" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "ارتÙاع" @@ -2773,7 +2717,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "مساعدة" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2790,15 +2734,15 @@ msgstr "" "\n" "الوداع!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "إخÙاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "إخÙاء مؤشر الماوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2812,8 +2756,8 @@ msgstr "" msgid "Home" msgstr "الصÙحة الرئيسية" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "هوست" @@ -2821,26 +2765,26 @@ msgstr "هوست" msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" -msgstr "Hungarian" +msgstr "الهنغارية" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2849,31 +2793,31 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL إعدادات" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR المؤشر" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2881,11 +2825,11 @@ msgstr "مجلد الايزو" msgid "ITALY" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2893,13 +2837,12 @@ msgstr "" "إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " "ماريو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2908,11 +2851,11 @@ msgstr "" "لجعلها Ùعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "تجاهل تنسيق التغييرات " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2926,7 +2869,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2940,7 +2883,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Ø­Ùظ استيراد" @@ -2948,23 +2891,23 @@ msgstr "Ø­Ùظ استيراد" msgid "Import failed, try again?" msgstr "Ùشل الاستيراد، حاول مرة أخرى؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "المل٠يحتوي على طول المستوردة غير صالحة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2976,26 +2919,16 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"يحسن الأداء لكن يؤدي الى اختÙاء الإضاءة ÙÙŠ معظم الألعاب.\n" -"\n" -"إذا لم تكن متأكدا ترك هذا غير محددة." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "تتعطل ÙÙŠ اللعبة" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "ÙÙŠ اللعبة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "معلومات" @@ -3003,7 +2936,7 @@ msgstr "معلومات" msgid "Information" msgstr "المعلومات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "معلومات" @@ -3015,7 +2948,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3023,11 +2956,11 @@ msgstr "SD Card ادرج " msgid "Insert name here.." msgstr "أدخل اسم هنا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -3036,42 +2969,42 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "تحقق من سلامة الخطأ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "التحقق من سلامة الانتهاء" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "انتهاء التدقيق من سلامة لم يتم العثور على أخطاء" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "واجهة الإعدادات" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3080,19 +3013,19 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "حاول تحميل الحالة مرة أخرى" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "تتعطل ÙÙŠ المقدمة" @@ -3101,11 +3034,11 @@ msgstr "تتعطل ÙÙŠ المقدمة" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "قيمة غير صالحة!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -3114,7 +3047,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "مل٠غير صالح" @@ -3126,77 +3059,76 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "غير صالح حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" -msgstr "Italian" +msgstr "الإيطالية" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:188 msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" -msgstr "Japanese" +msgstr "اليابانية" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:193 msgid "KOREA" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"إخÙاء مؤشر الماوس اذا كان على أعلى ناÙذة المحاكاة.\n" +"الحÙاظ على إطار اللعبة على أعلى من غيرها من جميع النواÙØ°.\n" "\n" "إذا لم تكن متأكدا ترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "إبقاء الناÙذة على أعلى" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" -msgstr "Korean" +msgstr "الكورية" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 @@ -3212,19 +3144,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "الكتابة Ùوق آخر حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "آخر حالة محÙوظة" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3234,8 +3170,8 @@ msgstr "اليسار" msgid "Left Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3243,89 +3179,89 @@ msgstr "" "انقر الأيسر لاكتشا٠مÙاتيح الاختصار.\n" "أدخل لمسح المساحة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "1 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "2 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "3 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "4 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "5 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "6 تحميل حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "7 تحميل حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "8 تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3339,36 +3275,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوÙرة." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Lock Threads to Cores" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "سجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "سجل الإعدادات" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "تسجيل عدد الاطارات ÙÙŠ ملÙ" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "نوع السجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"استخدام هذه الميزة عندما تريد قياس أداء المحاكي User/Logs/fps.txt تسجيل عدد " +"من الإطارات ÙÙŠ الثانية المقدمة إلى.\n" +"\n" +"إذا لم تكن متأكدا اترك هذا غير محددة." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "مختلÙان النواتج" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "تسجيل" @@ -3376,10 +3320,6 @@ msgstr "تسجيل" msgid "Lost connection to server!" msgstr "إنقطع الإتصال الملقم!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3391,12 +3331,12 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3405,33 +3345,33 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "معر٠المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "المنتج :" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "عالي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "بطاقة الذاكرة لديه بالÙعل باستثناء هذا العنوان" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "بطاقة الذاكرة Ùتحت بالÙعل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3441,7 +3381,7 @@ msgid "" "could mangle stuff!" msgstr "إدارة بطاقة الذاكرة تنبية قم بعمل نسخة احتياطية قبل الاستخدام" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3466,20 +3406,20 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "الميكروÙون" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3488,7 +3428,7 @@ msgstr "إعدادات منوعة" msgid "Modifier" msgstr "معدل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3504,16 +3444,16 @@ msgstr "" msgid "Monospaced font" msgstr "الخط أحادي المساÙØ©" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "موشن بلس" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3535,7 +3475,7 @@ msgstr "" msgid "Multiply" msgstr "تضاعÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3543,13 +3483,13 @@ msgstr "" "كتم صوت الويموت بإصلاح الانقطاع العشوائي على الويموت الحقيقي. أي تأثير على " "الويموت يحتذى به." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" -msgstr "" +msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "ملاحظة: حجم التدÙÙ‚ لا يطابق مدة البيانات الÙعلية\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3635,38 +3575,38 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "الاسم :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "الاسم :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI files(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "الصÙحة التالية" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "البحث التالي" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "اسمك :" @@ -3674,7 +3614,7 @@ msgstr "اسمك :" msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "لم يتم العثور على الايزو " @@ -3683,24 +3623,24 @@ msgstr "لم يتم العثور على الايزو " msgid "No banner file found for title %s" msgstr "لم يتم العثور على مل٠البنر %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" -msgstr "" +msgstr "لا يوجد وص٠متاح" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" msgstr "لا الالتحام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "لا يوجد مل٠تحميل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "لا مل٠مسجل" @@ -3709,33 +3649,33 @@ msgstr "لا مل٠مسجل" msgid "No save folder found for title %s" msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" -msgstr "Norwegian Bokmaal" +msgstr "النرويجية" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "غير متصل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ملاحظات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "ملاحظات :" @@ -3744,7 +3684,7 @@ msgstr "ملاحظات :" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "إشعار" @@ -3752,28 +3692,28 @@ msgstr "إشعار" msgid "Num Lock" msgstr "ارقام القÙÙ„" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "عدد من رموز :" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "ننشوك" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "تسريع ننشوك" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "الهدÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "إيقاÙ" @@ -3781,60 +3721,56 @@ msgstr "إيقاÙ" msgid "Offset:" msgstr "تعويض :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "عرض الرسائل التي تظهر على الشاشة" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ùتح الملÙ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL : لا يمكن إنشاء سياق الجهاز %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "خيارات" @@ -3843,7 +3779,7 @@ msgstr "خيارات" msgid "Orange" msgstr "البرتقالي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3853,8 +3789,8 @@ msgstr "" "انقر بالزر الأيمن للتصدير كاÙØ© Ø­Ùظ,\n" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "أخرى" @@ -3866,19 +3802,19 @@ msgstr "" "العميل قطع أخرى ÙÙŠ حين يتم تشغيل اللعبة! تم تعطيل تشغيل نت. كنت يدويا إيقا٠" "اللعبة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "الإخراج" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "تشغيل التسجيل" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "تحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "تحكم" @@ -3894,7 +3830,7 @@ msgstr "صÙحة لأسÙÙ„" msgid "Page Up" msgstr "أعلى الصÙحة" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "اقتران" @@ -3906,30 +3842,34 @@ msgstr "الÙقرة" msgid "Parameters" msgstr "معلمات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "وقÙØ©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "توق٠ÙÙŠ نهاية الÙيلم" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "مثالية" @@ -3938,36 +3878,36 @@ msgstr "مثالية" msgid "Perspective %d" msgstr "مشهد %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "بدأ اللعبه" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "تشغيل التسجيل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "بدأ/ايقاÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "قابلة للتشغيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "خيارات التشغيل" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3979,54 +3919,54 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" -msgstr "Polish" +msgstr "البولندية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "تحكم 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" -msgstr "Portuguese" +msgstr "البرتغالية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" -msgstr "Portuguese (Brazilian)" +msgstr "البرتغالية البرازيلية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4039,11 +3979,11 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "القيمة السابقة" @@ -4051,7 +3991,7 @@ msgstr "القيمة السابقة" msgid "Print" msgstr "طباعة" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "المل٠الشخصي" @@ -4059,7 +3999,7 @@ msgstr "المل٠الشخصي" msgid "Properties" msgstr "خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "إزالة التخزين المؤقت" @@ -4067,8 +4007,8 @@ msgstr "إزالة التخزين المؤقت" msgid "Question" msgstr "السؤال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "خروج" @@ -4086,7 +4026,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4094,46 +4034,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "روسيا" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "قوه" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "حقيقي" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "ويموت حقيقي " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "ويموت حقيقي " -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "إعادة توصيل تأكيد ويموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "إعادة تحميل حالة ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "تسجيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "تسجيل معلومات" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "تسجيل الخيارات" @@ -4149,7 +4089,7 @@ msgstr "اليسار أحمر" msgid "Red Right" msgstr "اليمين أحمر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4163,29 +4103,29 @@ 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "تحديث" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "تحديث قائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "تحديث القائمة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "إزالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4195,17 +4135,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "إعادة ضبط" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "النتائج" @@ -4222,7 +4162,7 @@ msgstr "اليمين" msgid "Right Stick" msgstr "العصا الايمن" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "هزاز" @@ -4231,116 +4171,112 @@ msgstr "هزاز" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" -msgstr "Russian" +msgstr "الروسية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "آمنة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "معدل العينة :" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI Ø­Ùظ باسم " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "1 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "2 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "3 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "4 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "5 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "6 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "7 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "8 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ùحص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "التقاط صوره" @@ -4348,27 +4284,25 @@ msgstr "التقاط صوره" msgid "Scroll Lock" msgstr "انتقل تأمين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" -msgstr "بحث عن اسرار" +msgstr "بحث" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" -msgstr "Ø­Ùظ المنظور الحالي" +msgstr "البحث عن الكائن الحالي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "البحث عن قيمة هيكس:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4377,20 +4311,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "حدد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4408,23 +4342,23 @@ msgstr "اختر Ø­Ùظ مل٠للاستيراد" msgid "Select floating windows" msgstr "اختر النواÙØ° العائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4442,11 +4376,15 @@ msgstr "" "\n" "إذاغير متأكد حدد التلقائي." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "اختيار المل٠التحكم الشخصي غير موجود " + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "تحديد الخط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4462,7 +4400,7 @@ msgstr "" "إذا لم تكن متأكدا، استخدم دقة سطح المكتب.\n" "إذا لم تكن متأكدا من ذلك ØŒ استخدم أعلى دقة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4478,11 +4416,11 @@ msgstr "" "\n" "Direct3D إذا لم تكن متأكدا استخدام ." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "إرسال" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "موضع الاستشعار:" @@ -4490,46 +4428,52 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" -msgstr "Serbian" +msgstr "الصربية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "إعدادات" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4537,133 +4481,144 @@ msgstr "الاسم المختصر :" msgid "Shoulder Buttons" msgstr "أزرار الكتÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "اظهار &لوحة المراقبة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "اظهار السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "عرض شريط الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "أظهر شريط الأدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "أظهر عدد الاطارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "أظهر اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "عرض سجل الاعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "اوروبا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "عرض الاجهزه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "إظهار الإحصاءات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "امريكا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad اظهار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وق٠اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"تظهر رسالة خطأ حين خطر قد يحدث.\n" +"إظهار رسالة خطأ عند حدث خطاء محتمل .\n" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "إظهار عداد التأخر" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "إظهار كتل Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "إظهار أيقونة الحÙظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "إظهارعنوان الحÙظ " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4674,15 +4629,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "إظهار رسالة المساعدة" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4692,31 +4643,35 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" -msgstr "Simplified Chinese" +msgstr "الصينية المبسطة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4727,7 +4682,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4743,17 +4698,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "B خانة " @@ -4761,7 +4716,7 @@ msgstr "B خانة " msgid "Snapshot" msgstr "لقطة" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software Renderer" @@ -4776,11 +4731,11 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "إعدادات الصوت" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "غير صالحة %s خلÙية الصوت." @@ -4794,17 +4749,17 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" -msgstr "Spanish" +msgstr "الأسبانية" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "مكبر الصوت:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4824,11 +4779,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد 528*640 ." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "حدد الخلÙية مل٠Ùيديو" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -4836,51 +4787,55 @@ msgstr "تسريع معدل نقل القرص" msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "بدء &اللعب عبر الشبكة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "الحالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ø­Ùظ الحالة" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "عجلة القيادة" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "عصا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4894,7 +4849,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "امتداد لناÙذة" @@ -4915,12 +4870,12 @@ msgstr "بنجاح تصدير المل٠إلى %s" msgid "Successfully imported save files" msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" -msgstr "" +msgstr "هز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "نظام اللغة :" @@ -4928,7 +4883,7 @@ msgstr "نظام اللغة :" msgid "TAIWAN" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "الإدخال" @@ -4949,30 +4904,30 @@ msgstr "الجدول الأيسر" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "اختبار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4988,13 +4943,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5016,7 +4971,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "المل٠%s بالÙعل Ù…Ùتوح، لن المل٠غير عنوان مكتوب." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) المل٠الذي حددته" @@ -5033,8 +4988,7 @@ msgstr "يمكن أن يكون اسم لا تحتوي على الأحر٠'ØŒ'" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5046,11 +5000,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Ø­Ùظ تحاول نسخة له حجم مل٠غير صالح" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5082,40 +5036,38 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "ثيم" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "تجاوز هذه الإعدادات إعدادات دولÙين الأساسية ." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5131,7 +5083,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5139,7 +5091,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤل٠مل٠التكوين" @@ -5148,40 +5100,40 @@ msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها msgid "Threshold" msgstr "بداية" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "إمالة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "العنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "إلى" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" -msgstr "Traditional Chinese" +msgstr "الصينية التقليدية" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." @@ -5199,9 +5151,9 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" -msgstr "Turkish" +msgstr "التركية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29 msgid "Turntable" @@ -5211,12 +5163,12 @@ msgstr "القرص الدوار" msgid "Type" msgstr "نوع" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP منÙØ° :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5224,10 +5176,10 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#, c-format msgid "UNKNOWN_%02X" -msgstr "غير معروÙ" +msgstr "غير معروÙ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5252,24 +5204,24 @@ msgstr "" "decrypted code. Make sure you typed it correctly.\n" "هل ترغب ÙÙŠ تجاهل هذا الخط ØŒ ومواصلة تحليل?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "غير محدود %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "التراجع عن تحميل الحالة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "غير معروÙ" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -5294,32 +5246,32 @@ msgstr "" msgid "Up" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "التحديث" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "استخدام شاشة كاملة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5332,7 +5284,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5346,15 +5298,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Ùائدة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "القيمة" @@ -5362,23 +5314,23 @@ msgstr "القيمة" msgid "Value:" msgstr "القيمة:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "القيمة:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "الصوت" @@ -5389,11 +5341,10 @@ 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:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5406,16 +5357,16 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5434,7 +5385,7 @@ msgstr "" "%s\n" "هل ترغب ÙÙŠ الاستمرار?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5447,7 +5398,7 @@ msgstr "" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5455,7 +5406,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5463,7 +5414,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5483,39 +5434,39 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" -msgstr "" +msgstr "الضربة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5523,17 +5474,17 @@ msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: لا يمكن القراءة من الملÙ" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "تحكم الوي" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "ويموت %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5546,19 +5497,19 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "ويموت متصل" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "محرك ويموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "إعدادات ويموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "تحكم الوي" @@ -5578,27 +5529,26 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "العمل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 -#, fuzzy +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" -msgstr "الكتابة على الملÙ" +msgstr "كتابة إلى مصحح الأخطاء" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "الكتابة على الملÙ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "الكتابة إلى ناÙذة" @@ -5617,9 +5567,9 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5635,23 +5585,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "لا يمكنك إغلاق أجزاء الصÙحات التي Ùيها." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "عليك اختيار لعبة!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "يجب إدخال اسم!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "يجب إدخال صالح العشري، أو الست عشرية قيمة ثماني." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -5672,25 +5622,25 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP هاك" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[انتظار]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5706,7 +5656,7 @@ msgstr "" msgid "[Custom]" msgstr "[مخصص]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5724,7 +5674,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5738,11 +5688,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5759,7 +5709,7 @@ msgstr "Ùشل ÙÙŠ قراءة البيانات من ملÙ: %s" msgid "failed to read header" msgstr "Ùشل ÙÙŠ قراءة عنوان" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التقرير." @@ -5769,7 +5719,7 @@ msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التق msgid "not a wii save or read failure for file header size %x" msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان المل٠%x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5778,7 +5728,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5790,7 +5740,7 @@ msgstr "zFar تصحيح: " msgid "zNear Correction: " msgstr "zNear تصحيح: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "أو" @@ -5798,6 +5748,9 @@ msgstr "أو" #~ msgid "%d %%" #~ msgstr "%d هرتز" +#~ msgid "%d Hz" +#~ msgstr "%d هرتز" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "تخطي الإطار " @@ -5862,12 +5815,38 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا التحقق." + #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "احتساب القيم من عمق ثلاثي الأبعاد الرسومات لكل بكسل بدلا من قمة الرأس " +#~ "الواحدة.\n" +#~ "وعلى النقيض من بكسل الإضاءة التي هي مجرد تعزيز، لكل بكسل عمق العمليات " +#~ "الحسابية اللازمة لمضاهاة صحيح عدد قليل من الألعاب.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا التحقق." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -5922,6 +5901,24 @@ msgstr "أو" #~ msgid "Could not get info about plugin %s" #~ msgstr "لا يمكن إنشاء %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr " KDE-Look.org تم بواسطة" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ " Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr " VistaIcons.com تم بواسطة" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ " black_rider and published on ForumW.org > Web DevelopmentsCreated by " +#~ "black_rider and published on ForumW.org > Web Developments black_rider " +#~ "and published on ForumW.org > Web Developments تم بواسطة" + #~ msgid "DList Cache" #~ msgstr "Caché DList" @@ -5932,9 +5929,27 @@ msgstr "أو" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "تعطيل إضاءة" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "تعطيل العمق لكل بكسل" + +#~ msgid "Disable Textures" +#~ msgstr "Texturesتعطيل " + #~ msgid "Disable Wiimote Speaker" #~ msgstr "تعطيل سماعات ويموت" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "texturing تعطل .\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا غير محددة." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5999,6 +6014,9 @@ msgstr "أو" #~ msgid "Enable Audio Throttle" #~ msgstr "Enable Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "BAT تمكين" + #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" @@ -6073,6 +6091,9 @@ msgstr "أو" #~ msgid "Error opening file %s for recording" #~ msgstr "Error al abrir el archivo %s para grabación." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "للخروج مع المحاكي" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6086,6 +6107,9 @@ msgstr "أو" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps سريع" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6133,6 +6157,15 @@ msgstr "أو" #~ "Si un juego se tilda, y anda sólamente en el Intérprete, o Dolphin tiene " #~ "errores, esta opción puede arreglar el juego." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "يحسن الأداء لكن يؤدي الى اختÙاء الإضاءة ÙÙŠ معظم الألعاب.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا ترك هذا غير محددة." + #~ msgid "Input Source" #~ msgstr "مدخلات المصدر" @@ -6177,6 +6210,12 @@ msgstr "أو" #~ "Cargar los mipmaps nativos es la emulación mas precisa, pero puede " #~ "empeorar el rendimiento(los resultados pueden variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Lock Threads to Cores" + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "الكتابة إلى وحدة التحكم" @@ -6213,6 +6252,12 @@ msgstr "أو" #~ msgid "OpenGL" #~ msgstr "Ùتح" +#~ msgid "Opens the debugger" +#~ msgstr "ÙŠÙتح المصحح" + +#~ msgid "Opens the logger" +#~ msgstr "ÙŠÙتح المسجل" + #, fuzzy #~ msgid "Plugins" #~ msgstr "Polish" @@ -6248,6 +6293,9 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "معدل العينة :" + #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6298,6 +6346,9 @@ msgstr "أو" #~ msgid "Show the number of frames rendered per second." #~ msgstr "إظهار عدد الإطارات المقدمة ÙÙŠ الثانية الواحدة" +#~ msgid "Show this help message" +#~ msgstr "إظهار رسالة المساعدة" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6340,6 +6391,9 @@ msgstr "أو" #~ "Las otras opciones son resoluciones fijas para elegir una calidad visual " #~ "independiente del tamaño del Display." +#~ msgid "Specify a video backend" +#~ msgstr "حدد الخلÙية مل٠Ùيديو" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" @@ -6353,6 +6407,9 @@ msgstr "أو" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "Theme selection went wrong" +#~ msgstr "اختيار ثيم خاظئ" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 341b91946e..decddde50c 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-08-19 08:36-0500\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" "Language: Catalan\n" @@ -22,17 +22,17 @@ msgstr "" "X-Language: ca_ES\n" "X-Source-Language: C\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(masses per ensenyar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Joc:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NO" @@ -50,7 +50,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -60,14 +60,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i connectat" @@ -159,156 +152,156 @@ msgstr "%sExportar com a GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Arrencar des de la unitat de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Punts d'interrupció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Cerca ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestor de &Trucs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Arxiu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Abança imatge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Configuració de &gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Configuració de &tecles d'accés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Càrrega estat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Administrador de targeta de memòria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Obrir ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcions" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Modalitat de només &lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&So" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Aturar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Visualitza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -324,27 +317,27 @@ msgstr "(-) + ZAprop" msgid "(UNKNOWN)" msgstr "(DESCONEGUT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(Deshabilitat)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bits" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bits" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bits" @@ -352,46 +345,48 @@ msgstr "8 bits" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Una finestra de «NetPlay» ja és oberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "No s'està executant cap joc actualment." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "No s'ha trobat cap dispositiu bluetooth compatible! \n" "(Només la pila Bluetooth de Microsoft és compatible.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -426,13 +421,13 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-placa base" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codis AR " @@ -440,19 +435,19 @@ msgstr "Codis AR " msgid "About Dolphin" msgstr "Sobre Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisió:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -467,8 +462,8 @@ msgstr "" "\n" "Si no n'esteu segur, activeu l'EFB a mode textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acció" @@ -487,7 +482,7 @@ msgstr "" "Codi culpable: \n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -495,7 +490,7 @@ msgstr "" "Error d' «Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a codi afegit " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -503,7 +498,7 @@ msgid "" msgstr "" "Error d'«Action Replay»: Mida no vàlida (%08x: Adreça = %08X) a emplenar (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -512,7 +507,7 @@ msgstr "" "Error d' «Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a escriure i " "farciment de RAM (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -521,16 +516,17 @@ msgstr "" "Error d'«Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a l'escriure " "al punter (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error d'«Action Replay»: Valor no vàlid (%08x) en la copia de memòria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Error d'«Action Replay»r: Codi Mestre i escriure a CCXXXXXX no està " "implementat (% s)" @@ -540,27 +536,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error d'«Action Replay»: línia de codi AR no vàlida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "«Action Replay»: Codi condicional: Mida no vàlida %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipus de codi Normal no vàlid %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Codi Normal %i: %08x subtipus invàlid (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Codi Normal 0: Subtipus no vàlid %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -569,11 +565,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -581,13 +577,13 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Afegir ..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adreça IP/Nom màquina:" @@ -627,53 +623,54 @@ msgstr "" "\n" "NOTA: Comproveu la finestra de Log o consola dels valors adquirits." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar la pressió de control analògic per activar els botons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configuració avançada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -682,20 +679,24 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrat anisotròpic:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -707,15 +708,15 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -725,16 +726,16 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Àrab" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,13 +743,13 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -756,12 +757,12 @@ msgstr "Relació d'aspecte:" msgid "At least one pane must remain open." msgstr "Almenys un panell ha de romandre obert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -769,24 +770,24 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Mida de la finestra)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajust automàtic de la mida de la finestra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -796,24 +797,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Generar automàticament mipmaps en contes de descodificar-lo des de la " -"memòria.\n" -"Incrementa el rendiment una mica, però pot causar defectes de textura.\n" -"\n" -"Si no n'esteu segur, deixeu-ho desmarcat." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registres" @@ -822,16 +810,16 @@ msgstr "&Registres" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configuració del Suport" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Suport:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Suport d'entrada" @@ -844,16 +832,16 @@ msgstr "Suport" msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Imatge:" @@ -861,11 +849,11 @@ msgstr "Imatge:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -877,7 +865,7 @@ msgstr "Baix" msgid "Block Allocation Table checksum failed" msgstr "La comprovació de la «checksum» de la taula de blocs ha fallat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocs" @@ -893,47 +881,53 @@ msgstr "Blau esquerra" msgid "Blue Right" msgstr "Blau dret" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Abaix" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Trencat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Examinar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -945,41 +939,19 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula la profunditat dels gràfics 3D per-píxel en contes de per vèrtex.\n" -"En contra de d'il·luminació per píxel (que quasi no millora), els càlculs de " -"profunditat per píxel són necessaris per emular bé un conjunt petit de " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desmarcat.Calcula la profunditat dels " -"gràfics 3D per-pixel en contes de per vèrtex.\n" -"En contra de l'il·luminació per píxel (que quasi no millora), els càlculs de " -"profunditat per píxel són necessaris per emular bé un conjunt petit de " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desmarcat." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -1000,7 +972,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancel·lar" @@ -1016,7 +988,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +999,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1035,18 +1007,18 @@ msgstr "" "No es pot usar aquest arxiu com una targeta de memòria. \n" "Està tractant d'usar el mateix arxiu en les dues ranures?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" @@ -1054,28 +1026,28 @@ msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Català" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Canviar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Canviar &Disc ..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Canviar Disc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Canvi de joc" @@ -1096,11 +1068,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Canvia el signe del paràmetre zAprop (després de correcció)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Truc" @@ -1108,47 +1079,47 @@ msgstr "Truc" msgid "Cheat Code" msgstr "Codi de trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cerca trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1156,7 +1127,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,8 +1135,8 @@ msgstr "" "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a " "partir de només els directoris)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1179,8 +1150,8 @@ msgstr "Clàssic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Esborrar" @@ -1192,22 +1163,22 @@ msgstr "" "Client desconnectat mentre el joc s'estava executant! NetPlay s'ha " "desactivat. Haurà d'aturar manualment el joc." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Tancar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Configurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Codi d'Informació" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Codi:" @@ -1215,95 +1186,95 @@ msgstr "Codi:" msgid "Command" msgstr "Comanda" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimeix ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configuració" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configuració" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Connectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Connectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Connectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Connectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connectant ..." @@ -1319,16 +1290,16 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Nucli" @@ -1337,7 +1308,7 @@ msgstr "Nucli" msgid "Could not create %s" msgstr "No s'ha pogut crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "No s'ha pogut inicialitzar el suport %s." @@ -1358,12 +1329,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1372,7 +1343,7 @@ msgstr "" "executant actualment! \n" "(Configurar els controls mentre el joc s'executa no està actualment suportat)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1385,11 +1356,11 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1397,17 +1368,17 @@ msgstr "" "No s'ha pogut inicialitzar el nucli. \n" "Verifiqueu la configuració." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crear Codi AR" @@ -1416,25 +1387,7 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Creat per VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creador:" @@ -1442,11 +1395,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Retallar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1460,12 +1413,12 @@ msgstr "" msgid "Crossfade" msgstr "Atenuar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directori actual ha canviat de %s a %s després de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1473,15 +1426,15 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Txec" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1489,36 +1442,36 @@ msgstr "" msgid "D-Pad" msgstr "Direcció digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1530,16 +1483,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Arxius Datel MaxDrive/Pro (*. sav)" @@ -1551,11 +1504,11 @@ msgstr "Arxius Datel MaxDrive/Pro (*. sav)" msgid "Dead Zone" msgstr "Zona morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Depuració" @@ -1563,24 +1516,24 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimint ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1589,11 +1542,11 @@ msgid "Default font" msgstr "Font per defecte" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1602,11 +1555,11 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descripció" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1618,13 +1571,13 @@ msgid "" msgstr "" "Detectat intent de llegir més dades des del DVD que caben dins de la memòria." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1648,28 +1601,16 @@ msgstr "" "Ha fallat la suma de comprovació\n" "i també ha fallat la comprovació de la suma de la copia del directory" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deshabilitar l'il·luminació" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Deshabilitar la profunditat per-pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deshabilitar Textures" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1684,7 +1625,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1700,17 +1641,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar textures.\n" -"\n" -"Si no n'esteu segur, deixeu-ho desmarcat." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disc" @@ -1719,11 +1650,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Error de lectura de disc" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1737,20 +1668,24 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuració de gràfics de Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Lloc &Web Dolphin" @@ -1758,32 +1693,32 @@ msgstr "Lloc &Web Dolphin" msgid "Dolphin Configuration" msgstr "Configuració de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuració de Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuració Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1791,7 +1726,7 @@ msgstr "" "Dolphin no ha pogut trobar cap ISO GC/Wii. Feu doble clic aquí per buscar-" "les ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1799,16 +1734,21 @@ msgstr "" "Dolphin està actualment configurat per ocultar tots els jocs. Feu doble clic " "aquí per mostrar tots-los ..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Avall" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Descarregar Codis (base de dades WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregat %lu codis. (Afegits %lu)" @@ -1817,27 +1757,27 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Bolcat de textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1848,7 +1788,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1858,7 +1798,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1868,24 +1808,24 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandès" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Sortir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Còpies EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1899,11 +1839,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualitzacions recents de memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Edita" @@ -1911,7 +1851,7 @@ msgstr "Edita" msgid "Edit ActionReplay Code" msgstr "Modificar codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modificar configuració" @@ -1919,12 +1859,12 @@ msgstr "Modificar configuració" msgid "Edit Patch" msgstr "Modificar el pagat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Modificació ..." @@ -1932,15 +1872,15 @@ msgstr "Modificació ..." msgid "Effect" msgstr "Efecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "El fil de l'emulador ja s'està executant" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1954,7 +1894,7 @@ msgstr "" "\n" "Si no n'esteu segur, activeu l'emulació virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1970,19 +1910,19 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estat d'emulació:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1999,72 +1939,67 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Habilitar les millors tècniques disponibles" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Habilitar memòria cau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Habilitar malla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2076,7 +2011,7 @@ msgstr "" "Millora la qualitat visual de les textures que es troben en un angle de " "visió obliqua." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2084,11 +2019,11 @@ msgstr "" "Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " "ràpid, Desactivat = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Habilitar pàgines" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2100,7 +2035,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2112,7 +2047,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2120,21 +2055,28 @@ msgstr "" "Activi aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Permet la traducció d'adreces de bloc (BAT), en funció de la Unitat de " -"Gestió de memòria. Precisa en el maquinari, però lent per emular. " -"(Activat=compatible, Desactivat = ràpid)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2146,7 +2088,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2154,7 +2096,7 @@ msgstr "" "Activa la memòria de la Unitat de Gestió, necessari per a alguns jocs. " "(Activat = compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2168,14 +2110,14 @@ msgstr "" msgid "End" msgstr "Fi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Anglès" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Millores" @@ -2193,17 +2135,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " @@ -2243,36 +2185,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sortir de Dolphin amb emulador" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar fitxer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2280,15 +2218,15 @@ msgstr "Exportar totes les partides desades" msgid "Export failed, try again?" msgstr "Exportació fallada, intenteu de nou?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Desar exportació com a..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2300,52 +2238,52 @@ msgstr "Paràmetre addicional" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paràmetre addicional útil només a ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraient ..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2353,7 +2291,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Mida FST:" @@ -2361,15 +2299,15 @@ msgstr "Mida FST:" msgid "Failed to Connect!" msgstr "Error al connectar!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Error a l'escoltar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2405,6 +2343,11 @@ msgstr "No s'ha pogut carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "No s'ha pogut carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "No s'ha pogut escriure la capçalera per %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "No s'ha pogut llegir Imatge.bin" @@ -2487,45 +2430,41 @@ msgstr "No s'ha pogut escriure la capçalera per %s" msgid "Failed to write header for file %d" msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps ràpids" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Jugador fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "informació del fitxer" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "L'arxiu no conté codis." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Arxiu convertit a. GCI" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2542,7 +2481,7 @@ msgstr "" "L'arxiu té la extensió \"%s\n" "les extensions vàlides són (.raw /.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "L'arxiu no es pot reconèixer com una targeta de memòria" @@ -2555,47 +2494,47 @@ msgstr "Arxiu no comprimit" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtrat de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2608,7 +2547,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2620,7 +2559,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2642,57 +2581,57 @@ msgstr "" msgid "Forward" msgstr "Endavant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Imatge" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Rang d'imatges" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limit d'imatges/s:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Visió lliure" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francès" @@ -2700,20 +2639,20 @@ msgstr "Francès" msgid "Frets" msgstr "Trasts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "de" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Pantalla completa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolució de pantalla a pantalla completa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Arxiu de GCI (*.gci)" @@ -2722,57 +2661,61 @@ msgstr "Arxiu de GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID del Joc:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "El joc encara està en marxa!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "El joc no està funcionant!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codis Gecko" @@ -2787,43 +2730,43 @@ msgstr "" "Codi Gecko ha fallat a executar (CT%i CST%i) (%s) \n" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "General" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Configuració General" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemany" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "Aconseguir codi AR: l'índex és major que la grandària de la llista de codis " "%lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Més gran que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2841,7 +2784,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grec" @@ -2861,11 +2804,11 @@ msgstr "Verd dret" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "S'ha cridat HCI_CMD_INQUIRY , si us plau informeu!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Modificacions" @@ -2873,11 +2816,11 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Alçada" @@ -2885,7 +2828,7 @@ msgstr "Alçada" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2902,15 +2845,15 @@ msgstr "" "\n" "Sayonara! \n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Oculta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Ocultar el cursor del ratolí" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2924,8 +2867,8 @@ msgstr "" msgid "Home" msgstr "Inici" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Amfitrió" @@ -2933,28 +2876,28 @@ msgstr "Amfitrió" msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongarès" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Ha Tractat d'obtenir dades d'un bitllet desconegut:%08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2967,31 +2910,31 @@ msgstr "" "TitleID %016llx. \n" "Probablement Dolphin es penjarà ara." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Configuració de IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Punter IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -2999,24 +2942,24 @@ msgstr "Directoris ISO:" msgid "ITALY" msgstr "ITÀLIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = compatible, " "Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3027,11 +2970,11 @@ msgstr "" "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " "so DSP per a fer-ho efectiu." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignora els canvis de format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3045,7 +2988,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3059,7 +3002,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Desar importació" @@ -3067,7 +3010,7 @@ msgstr "Desar importació" msgid "Import failed, try again?" msgstr "Fallada a l'importació, tornar a provar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3075,11 +3018,11 @@ msgstr "" "L'arxiu importat té extensió sgc \n" "però té una capçalera incorrecte." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "l'Arxiu importat té una longitud no vàlida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3087,7 +3030,7 @@ msgstr "" "L'Arxiu importat té extensio sav \n" "però la capçalera és incorrecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3099,27 +3042,16 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Millora el rendiment, però causa la desaparició de l'il·luminació en alguns " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desactivat." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "En Joc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "En-joc" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3127,7 +3059,7 @@ msgstr "Info" msgid "Information" msgstr "Informació" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3139,7 +3071,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3147,11 +3079,11 @@ msgstr "Inserir la targeta SD" msgid "Insert name here.." msgstr "Introduïu un nom aquí .." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3162,42 +3094,42 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Configuració d'interfície" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Error intern LZO - la compressió ha fallat" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3206,19 +3138,19 @@ msgstr "" "Error intern LZO - descompressió fallada (% d) (%li, %li) \n" "Intenteu carregar l'estat de nou" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error intern LZO - lzo_init () ha fallat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Introducció" @@ -3227,11 +3159,11 @@ msgstr "Introducció" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Mida no vàlida (%x) o paraula màgica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor invàlid!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" @@ -3240,7 +3172,7 @@ msgstr "Invàlid bat.map o entrada al directori" msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Arxiu invàlid" @@ -3255,29 +3187,29 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estat invàlid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italià" @@ -3285,16 +3217,16 @@ msgstr "Italià" msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonès" @@ -3302,7 +3234,7 @@ msgstr "Japonès" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3313,17 +3245,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Corea" @@ -3341,19 +3273,23 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Últim estat sobreescrit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Últim estat desat" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3363,8 +3299,8 @@ msgstr "Esquerra" msgid "Left Stick" msgstr "Palanca esquerra" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3372,7 +3308,7 @@ msgstr "" "Clic esquerre per detectar tecles d'accés. \n" "Entrar a l'espai per esborrar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3382,7 +3318,7 @@ msgstr "" "Clic mig per desactivar. \n" "Clic det per més opcions." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3390,76 +3326,76 @@ msgstr "" "Clic Esquerra/Dreta per més opcions. \n" "Clic Mig per deshabilitar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar per FPS " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar ranura d'estat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar ranura d'estat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar ranura d'estat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar ranura d'estat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar ranura d'estat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar ranura d'estat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar ranura d'estat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar ranura d'estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3473,36 +3409,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carrega els valors preestablerts dels patrons disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Bloca els fils d'execució als nuclis" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuració del registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipus de registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostrar el nombre d'imatges rendaritzades per segon FPS com a mesura de la " +"velocitat d'emulació.\n" +"\n" +"Si no n'esteu segurs, deixeu-ho desmarcat." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Sortides del registrador Log" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Inici de sessió" @@ -3510,10 +3455,6 @@ msgstr "Inici de sessió" msgid "Lost connection to server!" msgstr "Perdut la connexió amb el servidor!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Baix nivell (LLE) o alt nivell (HLE) d'àudio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botó M" @@ -3527,12 +3468,12 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" @@ -3541,33 +3482,33 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricant:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Màxim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La targeta de memòria ja té una entrada amb aquest títol." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Targeta de memòria ja oberta." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Targeta de memòria" @@ -3579,7 +3520,7 @@ msgstr "" "Targeta de memòria Administrador ADVERTÈNCIA-Feu còpies de seguretat abans " "d'usar, hauria d'estar arreglat, però pots perdre dades!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3605,20 +3546,20 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Micròfon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3627,7 +3568,7 @@ msgstr "Altres Configuracions" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3643,16 +3584,16 @@ msgstr "" msgid "Monospaced font" msgstr "Fonts d'espiat simple" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus®" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3675,7 +3616,7 @@ msgstr "" msgid "Multiply" msgstr "Múltiple" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3683,11 +3624,11 @@ msgstr "" "Silencia l'altaveu del «Wiimote». Arregla desconnexions aleatòries en " "«wiimotes» reals. No afecta els «wiimotes» emulats." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3775,38 +3716,38 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nom:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nom:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Arxius natius GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Pàgina següent" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Següent escaneig" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Sobrenom:" @@ -3814,7 +3755,7 @@ msgstr "Sobrenom:" msgid "No Country (SDK)" msgstr "No país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "No s'han trobat ISOs o WADs" @@ -3823,8 +3764,8 @@ msgstr "No s'han trobat ISOs o WADs" msgid "No banner file found for title %s" msgstr "No s'ha trobat l'arxiu «banner» per el joc %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3832,15 +3773,15 @@ msgstr "" msgid "No docking" msgstr "No acoblament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "No s'ha carregat cap fitxer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "No hi ha entrades lliures a l'índex de directoris" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Arxiu no enregistrat" @@ -3849,33 +3790,33 @@ msgstr "Arxiu no enregistrat" msgid "No save folder found for title %s" msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "No està connectat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notes:" @@ -3884,7 +3825,7 @@ msgstr "Notes:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Avís" @@ -3892,28 +3833,28 @@ msgstr "Avís" msgid "Num Lock" msgstr "Bloq Numèric" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Nombre de codis:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchukâ„¢" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Acceleració del Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objecte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Apagar" @@ -3921,60 +3862,56 @@ msgstr "Apagar" msgid "Offset:" msgstr "Desplaçament:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Només queden %d blocs disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Obre fitxer ..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: no es pot crear el context pel dispositiu %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: no es poden trobar dispositius de so" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: no es pot obrir el dispositiu %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Obre el depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Obre el registrador Log" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcions" @@ -3983,7 +3920,7 @@ msgstr "Opcions" msgid "Orange" msgstr "Taronja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3993,8 +3930,8 @@ msgstr "" "Feu clic dret i exporteu totes les partides desades,\n" "i importeu les partides desades una targeta de memòria nova\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Altres" @@ -4006,19 +3943,19 @@ msgstr "" "Un altre client s'ha desconnectat mentre joc s'estava executant! NetPlay " "s'ha desactivat. Aturar manualment el joc." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Sortida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Reproduir gravació..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Control" @@ -4034,7 +3971,7 @@ msgstr "Avançar pàgina" msgid "Page Up" msgstr "Retrocedir Pàgina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Aparellar" @@ -4046,30 +3983,34 @@ msgstr "Paràgraf" msgid "Parameters" msgstr "Paràmetres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfecte" @@ -4078,36 +4019,36 @@ msgstr "Perfecte" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Executar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproduir enregistrament" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opcions de reproducció" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4119,54 +4060,54 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4179,11 +4120,11 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4191,7 +4132,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4199,7 +4140,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Netejar memòria cau" @@ -4207,8 +4148,8 @@ msgstr "Netejar memòria cau" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sortir" @@ -4226,7 +4167,7 @@ msgstr "Botó R" msgid "R-Analog" msgstr "R-Analògic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4234,46 +4175,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RÚSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rang" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar tornar a connectar el Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Tornar a connectar el Wiimote al carregar l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Enregistrar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informació d'enregistrament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Enregistrant Opcions" @@ -4289,7 +4230,7 @@ msgstr "Vermell Esquerra" msgid "Red Right" msgstr "Vermell Dret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4304,29 +4245,29 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Cap" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualitzar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Treure" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4336,17 +4277,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultats" @@ -4363,7 +4304,7 @@ msgstr "Dreta" msgid "Right Stick" msgstr "Palanca dreta" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibració" @@ -4372,116 +4313,112 @@ msgstr "Vibració" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar DSP LLE en un fil d'execució dedicat (no recomanat)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rússia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Segur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Freqüència de mostreig:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Anomena i desa GCI..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Desar ranura estat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Desar ranura estat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Desar ranura estat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Desar ranura estat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Desar ranura estat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Desar ranura estat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Desar ranura estat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Desar ranura estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Cercant ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Capturar" @@ -4489,25 +4426,25 @@ msgstr "Capturar" msgid "Scroll Lock" msgstr "Bloc desplaçament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Cerca trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4518,20 +4455,20 @@ msgid "Section %s not found in SYSCONF" msgstr "La secció %s no trobada a SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4548,23 +4485,23 @@ msgstr "Seleccioneu un arxiu de salvar la importació" msgid "Select floating windows" msgstr "Seleccioneu finestres flotants" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4582,11 +4519,16 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Automàtic" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "L'arxiu especificat \"%s\" no existeix" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Font seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4602,7 +4544,7 @@ msgstr "" "Si no n'esteu segurs, utilitzeu la resolució de l'escriptori.\n" "Si encara no n'esteu segurs, utilitzeu la resolució més alta que us funciona." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4618,11 +4560,11 @@ msgstr "" "\n" "Si no n'esteu segurs, utilitzeu Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Barra de sensors de posició" @@ -4630,50 +4572,56 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port sèrie 1 - Aquest és el port que utilitzen els dispositius com ara " "d'adaptador de xarxa" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configuració ..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No es troba el fitxer de configuració" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nom curt:" @@ -4681,105 +4629,105 @@ msgstr "Nom curt:" msgid "Shoulder Buttons" msgstr "Botons LR" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar Barra d'e&stat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar Barra d'&eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostra FPS (imatges/s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itàlia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar Japó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar la &Configuració del registre de log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar estadístiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar un missatge de confirmació abans d'aturar el joc." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4787,27 +4735,39 @@ msgstr "" "Deshabilitar d'això pot evitar els missatges molestos i no crítics, però " "també pot significar que Dolphin de sobte es pengi sense cap explicació." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostra desar un comentari" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostra títol desat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4819,15 +4779,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra aquest missatge d'ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconeguda" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4837,31 +4793,35 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Xinès simplificat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Salta l'accés d'EFB des de la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4873,7 +4833,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4890,17 +4850,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ranura B" @@ -4908,7 +4868,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Captura" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderitzat per programari" @@ -4925,11 +4885,11 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configuració de so" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Suport de so %s invàlid." @@ -4943,17 +4903,17 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanyol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volum de l'altaveu:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4974,11 +4934,7 @@ msgstr "" "\n" "Si no n'esteu segur, seleccioneu 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifiqueu un suport de vídeo." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -4986,51 +4942,55 @@ msgstr "Accelerar la tassa de transferència de Disc" msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Control estàndard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Iniciar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Iniciar grava&ció" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Iniciar gravació" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estats desats" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Palanca" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Aturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5044,7 +5004,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ajustar a la finestra" @@ -5065,12 +5025,12 @@ msgstr "Arxiu exportat amb èxit a %s" msgid "Successfully imported save files" msgstr "Arxius de partides desades importats correctament" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5078,7 +5038,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5099,30 +5059,30 @@ msgstr "Taula esquerra" msgid "Table Right" msgstr "Taula dreta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5138,13 +5098,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5167,7 +5127,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "El fitxer %s ja estava oberta, la capçalera de l'arxiu no s'escriurà." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -5184,7 +5144,7 @@ msgstr "El nom no pot contenir el caràcter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El resultat del desxifratge el codi AR no conté cap línia." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5197,12 +5157,12 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho al segon valor més ràpid de la dreta." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "El fitxer de partida guardada que està intentant copiar té la mida invàlida" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5235,15 +5195,12 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Tema visual" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Hi ha hagut un error a la selecció del tema visual." - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5251,7 +5208,7 @@ msgstr "" "Hi ha d'haver una entrada per 00000001/00000002. El seu bolcat de la NAND " "probablement és incompleta." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5259,7 +5216,7 @@ msgstr "" "Aquesta configuració sobreescriu la configuració de Dolphin.\n" "Indeterminat vol dir que el joc utilitza el valor de Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5267,14 +5224,16 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5289,7 +5248,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5301,7 +5260,7 @@ msgstr "" "Causa millores importants de velocitat en ordinadors amb més d'un nucli, " "però també poden causar interferències/fallades." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Li permetrà editar manualment el fitxer de configuració INI" @@ -5310,40 +5269,40 @@ msgstr "Li permetrà editar manualment el fitxer de configuració INI" msgid "Threshold" msgstr "Llindar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinació" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Títol" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5363,7 +5322,7 @@ msgstr "" "Intentant de llegir des d'un SYSCONF invàlid \n" "identificadors de Wiimote bt no estan disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turc" @@ -5375,12 +5334,12 @@ msgstr "Taula DJ" msgid "Type" msgstr "Tipus" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5388,7 +5347,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONEGUT" @@ -5416,24 +5375,24 @@ msgstr "" "desenciptat vàlid. Assegureu-vos que l'heu escrit correctament.\n" "Voleu ignorar aquesta línia i continuar analitzant?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i Indefinit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Desfer la càrrega de l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconegut" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comanda de DVD desconeguda %08x - error crític" @@ -5459,32 +5418,32 @@ msgstr "" msgid "Up" msgstr "Amunt" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualitzar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Utilitzar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5497,7 +5456,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5512,15 +5471,15 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Sincronització Vertical" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5528,23 +5487,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volum" @@ -5559,7 +5518,7 @@ msgstr "instal·lació del WAD ha fallat: Error en crear %s" msgid "WAD installation failed: error creating ticket" msgstr "instal·lació del WAD ha fallat: Error en crear %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5572,16 +5531,16 @@ msgstr "" "Si no n'esteu segurs, deixeu-ho desmarcat." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertència - Inicialitzant DOL en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" @@ -5601,7 +5560,7 @@ msgstr "" "%s \n" "Voleu continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5615,7 +5574,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5623,7 +5582,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5631,7 +5590,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5651,7 +5610,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Fitxer no obert." @@ -5659,31 +5618,31 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5691,17 +5650,17 @@ msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No s'ha pogut llegir des de l'arxiu" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5714,19 +5673,19 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote connectat" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configuració de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5746,27 +5705,27 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Treballant ..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escriu a consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Escriu en un Fitxer" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escriu en un Fitxer" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escriu a una Finestra" @@ -5785,7 +5744,7 @@ msgstr "XAudio2 init ha fallat:%#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "La creació de la veu principal XAudio2 ha fallat:%#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5805,23 +5764,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No pots tancar panells que tenen pàgines." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Heu de triar un joc!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Heu d'introduir un nom!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5844,25 +5803,25 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Modificador ZTP" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Codi Zero 3 no està suportat" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Codi Zero desconegut per Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Esperant ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5878,7 +5837,7 @@ msgstr "" msgid "[Custom]" msgstr "[ Personalitzar ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5897,7 +5856,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5912,11 +5871,11 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5933,7 +5892,7 @@ msgstr "Error al llegir les dades del fitxer: %s" msgid "failed to read header" msgstr "Error al llegir la capçalera" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu." @@ -5945,7 +5904,7 @@ msgstr "" "No és una partida guardada Wii o hi ha hagut un error de lectura de la mida " "de la capçalera del fitxer %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5954,7 +5913,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -5966,10 +5925,13 @@ msgstr "Correcció zLluny:" msgid "zNear Correction: " msgstr "Correcció ZAprop" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| O" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Per defecte)" @@ -6011,6 +5973,40 @@ 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 "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula la profunditat dels gràfics 3D per-píxel en contes de per " +#~ "vèrtex.\n" +#~ "En contra de d'il·luminació per píxel (que quasi no millora), els càlculs " +#~ "de profunditat per píxel són necessaris per emular bé un conjunt petit de " +#~ "jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desmarcat.Calcula la profunditat dels " +#~ "gràfics 3D per-pixel en contes de per vèrtex.\n" +#~ "En contra de l'il·luminació per píxel (que quasi no millora), els càlculs " +#~ "de profunditat per píxel són necessaris per emular bé un conjunt petit de " +#~ "jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desmarcat." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6041,15 +6037,48 @@ msgstr "| O" #~ msgid "Could not copy %s to %s" #~ msgstr "No s'ha pogut copiar de %s a %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creat per KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creat per VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" + #~ msgid "Danish" #~ msgstr "Danès" #~ msgid "Debug Only" #~ msgstr "Només per depuració" +#~ msgid "Disable Lighting" +#~ msgstr "Deshabilitar l'il·luminació" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Deshabilitar la profunditat per-pixel" + +#~ msgid "Disable Textures" +#~ msgstr "Deshabilitar Textures" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar l'altaveu del «Wiimote»" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar textures.\n" +#~ "\n" +#~ "Si no n'esteu segur, deixeu-ho desmarcat." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6104,6 +6133,9 @@ msgstr "| O" #~ msgid "Enable Audio Throttle" #~ msgstr "Habilitar la regulació de so" +#~ msgid "Enable BAT" +#~ msgstr "Habilitar les millors tècniques disponibles" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" @@ -6116,6 +6148,15 @@ msgstr "| O" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activar el protector de pantalla (reducció de desgast)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Permet la traducció d'adreces de bloc (BAT), en funció de la Unitat de " +#~ "Gestió de memòria. Precisa en el maquinari, però lent per emular. " +#~ "(Activat=compatible, Desactivat = ràpid)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" @@ -6145,6 +6186,9 @@ msgstr "| O" #~ msgid "Error opening file %s for recording" #~ msgstr "Error a obrir el fitxer %s per a l'enregistrament" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sortir de Dolphin amb emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6154,6 +6198,9 @@ msgstr "| O" #~ "%s\n" #~ "Aquest fitxer és necessari per a utilitzar DSP LLE" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps ràpids" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6191,6 +6238,16 @@ msgstr "| O" #~ "Oculta el cursor quan està sobre la finestra de renderitzat i la finestra " #~ "de representació té el focus." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Millora el rendiment, però causa la desaparició de l'il·luminació en " +#~ "alguns jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desactivat." + #~ msgid "Input Source" #~ msgstr "Font d'entrada" @@ -6223,6 +6280,15 @@ msgstr "| O" #~ "Carregant mipmaps natius és un comportament més precís, però també podria " #~ "disminuir el rendiment." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Bloca els fils d'execució als nuclis" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Baix nivell (LLE) o alt nivell (HLE) d'àudio" + #~ msgid "" #~ "Modify textures to show the format they're using.\n" #~ "This is only useful for debugging purposes." @@ -6236,6 +6302,12 @@ msgstr "| O" #~ msgid "OK" #~ msgstr "Acceptar" +#~ msgid "Opens the debugger" +#~ msgstr "Obre el depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Obre el registrador Log" + #~ msgid "Overlay Information" #~ msgstr "Informació superposada" @@ -6265,6 +6337,9 @@ msgstr "| O" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Requerit per a l'ús de la font japonesa." +#~ msgid "Sample Rate:" +#~ msgstr "Freqüència de mostreig:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6301,6 +6376,9 @@ msgstr "| O" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra el nombre de d'imatges renderitzades per segon." +#~ msgid "Show this help message" +#~ msgstr "Mostra aquest missatge d'ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6333,12 +6411,18 @@ msgstr "| O" #~ "Les altres opcions són resolucions fixes per escollir la qualitat visual " #~ "independentment de la mida de la pantalla." +#~ msgid "Specify a video backend" +#~ msgstr "Especifiqueu un suport de vídeo." + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Començar renderitzat a pantalla completa" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +#~ msgid "Theme selection went wrong" +#~ msgstr "Hi ha hagut un error a la selecció del tema visual." + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 22c1d35917..d4f0d79f87 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -1,32 +1,34 @@ # Translation of dolphin-emu.pot to Czech -# Copyright (C) 2003-2011 +# Copyright (C) 2003-2012 # This file is distributed under the same license as the dolphin-emu package. -# ZbynÄ›k Schwarz , 2011. +# ZbynÄ›k Schwarz , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-12-19 07:39+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" +"X-Poedit-Basepath: D:\\cygwin\\home\\Administrátor\\dolphin-emu\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(příliÅ¡ mnoho pro zobrazení)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Hra : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NE" @@ -44,24 +46,17 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "PÅ™ipojeno %i" @@ -151,158 +146,158 @@ msgstr "%sExportovat GCI%s" msgid "%sImport GCI%s" msgstr "%sImportovat GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& A" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." -msgstr "O Progr&amu..." +msgstr "O progr&amu..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Zavést z DVD Mechaniky..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Body pÅ™eruÅ¡ení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procházet pro ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Správce &Cheatů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulace" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Soubor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" -msgstr "&Postup Snímkem" +msgstr "&Postup snímkem" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" -msgstr "&Celá Obrazovka" +msgstr "&Celá obrazovka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" -msgstr "&Grafická Nastavení" +msgstr "&Grafická nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&NápovÄ›da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" -msgstr "Nastavení &Klávesových Zkratek" +msgstr "Nastavení &klávesových zkratek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Nahrát Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Správce Pa&měťových karet (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Pa&měť" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otevřít..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "V&olby" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Resetovat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Za&stavit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Nás&troje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Zobrazit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -316,27 +311,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" -msgstr "" +msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -344,46 +339,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" -msgstr "" +msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay je už otevÅ™ené!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Hra v souÄasnosti neběží!" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Podporované zařízení bluetooth nebylo nalezeno!\n" "(Pouze zásobník Microsoft bluetooth je podporován)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -417,13 +414,13 @@ msgstr "" "\n" "Musíte pÅ™esmÄ›rovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM Základní Deska" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kódy AR" @@ -431,19 +428,19 @@ msgstr "Kódy AR" msgid "About Dolphin" msgstr "O Dolphinu" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "PÅ™esnost:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -456,8 +453,8 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te radÄ›jí EFB do Textury." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ÄŒinnost" @@ -476,7 +473,7 @@ msgstr "" "Viníkem je Kód:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -484,7 +481,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -493,7 +490,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " "Sesunout (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -502,7 +499,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " "NaplnÄ›ní (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -511,15 +508,16 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " "Ukazatele (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" @@ -528,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Chyba Action Replay: neplatný řádek kódu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Podmínkový kód: Neplatná Velikost %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Neplatný Normální Kód Typu %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptér:" @@ -557,11 +555,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -569,13 +567,13 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "PÅ™idat..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresa :" @@ -615,74 +613,77 @@ msgstr "" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" +msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " +"Umožní pÅ™epínání jistých možností pomocí klávesových zkratek 3, 4, 5 a 6 " "uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" +msgstr "Analyzovat" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -694,15 +695,15 @@ msgstr "ZavadÄ›Ä aplikace má Å¡patnou velikost... je to vážnÄ› zavadÄ›Ä?" msgid "Apploader unable to load from file" msgstr "ZavadÄ›Ä aplikace nemohl naÄíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -712,16 +713,16 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ArabÅ¡tina" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,12 +730,12 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -742,37 +743,37 @@ msgstr "PomÄ›r Stran:" msgid "At least one pane must remain open." msgstr "Alespoň jeden panel musí být otevÅ™en." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" -msgstr "Backend Zvuku:" +msgstr "Podpůrná vrstva zvuku:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -782,41 +783,28 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" -"Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" -msgstr "" +msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "&Registry" +msgstr "Registr BP" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" -msgstr "Nastavení Backendu" +msgstr "Nastavení podpůrné vrstvy" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" -msgstr "Backend:" +msgstr "Podpůrná vrstva:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Zadní Vstup" @@ -829,16 +817,16 @@ msgstr "Dozadu" msgid "Bad File Header" msgstr "Å patná hlaviÄka souboru" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Plakát:" @@ -846,11 +834,11 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Základní nastavení" @@ -862,7 +850,7 @@ msgstr "Basy" msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloky" @@ -878,50 +866,56 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Dole" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Spojené ovladaÄe: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Rozbité" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procházet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procházet pro pÅ™idání adresáře" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Vyrovnávací paměť:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "TlaÄítka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 -msgid "C" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." msgstr "" +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +msgid "C" +msgstr "C" + #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" msgstr "Kr Stick" @@ -930,34 +924,19 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" -msgstr "" +msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle " -"pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -972,7 +951,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -988,7 +967,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou oÄekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -999,7 +978,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1007,18 +986,18 @@ msgstr "" "Nelze použít tento soubor jako paměťovou kartu.\n" "Snažíte se použít stejný soubor v obou slotech?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1026,28 +1005,28 @@ msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "KatalánÅ¡tina" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "StÅ™ed" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "ZmÄ›nit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "VymÄ›nit &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "VymÄ›nit Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ZmÄ›nit hru" @@ -1068,11 +1047,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "ZmÄ›ní znaménko na Parametr zNear (po korekci)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "ZmÄ›na tohoto se neprojeví, pokud emulátor běží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1080,47 +1058,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Hledání Cheatů" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "Zkontrolovat celistvost oddílu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "Kontrolování celistvosti..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1128,7 +1106,7 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,8 +1114,8 @@ msgstr "" "Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro " "disky sestavené z adresářů)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístÄ›ní extrakce" @@ -1151,8 +1129,8 @@ msgstr "Klasické" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "VyÄistit" @@ -1163,22 +1141,22 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zavřít" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Nastavit..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informace o kódu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kód:" @@ -1186,95 +1164,95 @@ msgstr "Kód:" msgid "Command" msgstr "Příkaz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimuji ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Nastavit Ovládání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Nastavit Pady" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "PÅ™ipojit Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "PÅ™ipojit Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "PÅ™ipojit Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "PÅ™ipojit Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1290,16 +1268,16 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "PÅ™evést na GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Jádro" @@ -1308,10 +1286,10 @@ msgstr "Jádro" msgid "Could not create %s" msgstr "Nelze vytvoÅ™it %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." -msgstr "Nezle spustit backend %s." +msgstr "Nelze spustit podpůrnou vrstvu %s." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1329,12 +1307,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1342,7 +1320,7 @@ msgstr "" "Nelze nastavit pady. HrÃ¡Ä odeÅ¡el, nebo hra v souÄasnosti běží!.\n" "(nastavení padů za bÄ›hu hry není jeÅ¡tÄ› podporováno)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1355,11 +1333,11 @@ msgstr "" "SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " "zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1367,17 +1345,17 @@ msgstr "" "Nelze spustit jádro.\n" "Zkontrolujte VaÅ¡e nastavení." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "PoÄet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "ZemÄ›:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "VytvoÅ™it AR kód" @@ -1386,25 +1364,7 @@ msgstr "VytvoÅ™it AR kód" msgid "Create new perspective" msgstr "VytvoÅ™it novou perspektivu" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "VytvoÅ™il VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Tvůrce:" @@ -1412,11 +1372,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1430,12 +1390,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "SouÄasný adresář se zmÄ›nil z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1443,73 +1403,73 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ÄŒeÅ¡tina" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 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 "" +msgstr "DVDLowRead - Fatální chyba: nelze Äíst ze svazku" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze pÅ™eÄíst svazek" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Soubory Datel MaxDrive/Pro(*.sav)" @@ -1521,11 +1481,11 @@ msgstr "Soubory Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Mrtvá Zóna" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "LadÄ›ní" @@ -1533,24 +1493,24 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1559,11 +1519,11 @@ msgid "Default font" msgstr "Výchozí typ písma" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1572,11 +1532,11 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Popis" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Zjistit" @@ -1589,13 +1549,13 @@ msgstr "" "ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. " "Zásek." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1619,28 +1579,16 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Zakázat OsvÄ›tlení" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Zakázat Hloubku Podle Pixelu" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Zakázat Textury" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1654,7 +1602,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1670,17 +1618,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Zakázat texturování.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1689,11 +1627,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1707,20 +1645,24 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Webová stránka Dolphin" @@ -1728,32 +1670,32 @@ msgstr "&Webová stránka Dolphin" msgid "Dolphin Configuration" msgstr "Dolphin Nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Nastavení Emulovaného Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1761,7 +1703,7 @@ msgstr "" "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " "souborů..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1769,16 +1711,21 @@ msgstr "" "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " "pro zobrazení vÅ¡ech her..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Dolů" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Stáhnout kódy (Databáze WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Stáhnuto %lu kódů. (přídáno %lu)" @@ -1787,27 +1734,27 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1817,7 +1764,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1827,7 +1774,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1837,41 +1784,41 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "NizozemÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Kopie" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" "CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- " -"Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v " -"tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." +"Pokud jste nedávno vaÅ¡i instalaci Dolphin aktualizovali, je v tomto bodÄ› " +"pravdÄ›podobnÄ› tÅ™eba restartovat, aby Windows uvidÄ›l nový ovladaÄ." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "EVROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "PÅ™edÄasné Aktualizace PamÄ›ti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Upravit" @@ -1879,7 +1826,7 @@ msgstr "Upravit" msgid "Edit ActionReplay Code" msgstr "Upravit kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Upravit nastavení" @@ -1887,12 +1834,12 @@ msgstr "Upravit nastavení" msgid "Edit Patch" msgstr "Upravit záplatu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Upravit" @@ -1900,15 +1847,15 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1922,7 +1869,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1938,19 +1885,19 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stav Emulace:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1966,72 +1913,67 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Zapnout BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2045,7 +1987,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2053,11 +1995,11 @@ msgstr "" "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " "VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Zapnout stránky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2070,7 +2012,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2082,7 +2024,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2090,21 +2032,28 @@ msgstr "" "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " "pro VÅ ECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2116,7 +2065,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2124,7 +2073,7 @@ msgstr "" "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2138,14 +2087,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2163,17 +2112,17 @@ msgstr "Záznam %d/%d" msgid "Entry 1/%d" msgstr "Záznam 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Rovná se" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2213,36 +2162,32 @@ msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx% msgid "Execute" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "UkonÄit Dolphin s emulátorem" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportovat Soubor" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportovat Nahrávku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportovat vÅ¡echny Uložené hry" @@ -2250,17 +2195,17 @@ msgstr "Exportovat vÅ¡echny Uložené hry" msgid "Export failed, try again?" msgstr "Exportování selhalo, zkusit znovu?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportovat Uloženou hru jako..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" -msgstr "VnÄ›jší Vyr. Paměť Snímků" +msgstr "VnÄ›jší vyrovnávací paměť Snímků" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" @@ -2270,52 +2215,52 @@ msgstr "Extra Parametr" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parametr užiteÄný pouze v ''Metroid: Other M''" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrahovat VÅ¡echny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrahovat ZavadÄ›Ä Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrahuji..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Bajt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "PÅ™ehrávaÄ FIFO" @@ -2323,7 +2268,7 @@ msgstr "PÅ™ehrávaÄ FIFO" msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Velikost FST:" @@ -2331,15 +2276,15 @@ msgstr "Velikost FST:" msgid "Failed to Connect!" msgstr "PÅ™ipojení Selhalo!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Naslouchání Selhalo!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2376,20 +2321,25 @@ msgstr "Nelze nahrát bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Nelze nahrát hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Zápis hlaviÄky selhal pro %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"Nelze Äíst uložená data\n" -"(0xA000-)\n" -"Data v paměťové kartÄ› můžou být zkrácená" +"Nelze pÅ™eÄíst blok uložených dat %d\n" +"Data v paměťové kartÄ› můžou být zkrácena\n" +"Pozice souboru: %llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2458,45 +2408,43 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" -msgstr "" +msgstr "PerÅ¡tina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"závažná desynchronizace. PÅ™ehrávání ukonÄeno. (Chyba v PlayWiimote: %u != " +"%u, bajt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "PÅ™ehrávaÄ Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informace o souboru" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Soubor neobsahoval žádné kódy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Soubor pÅ™eveden na .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2513,7 +2461,7 @@ msgstr "" "Soubor má příponu \"%s\"\n" "platné přípony jsou (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Soubor nerozpoznán jako paměťová karta" @@ -2526,47 +2474,47 @@ msgstr "Soubor není komprimovaný" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Neznámý režim otevÅ™ení : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "Najít další" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "Najít pÅ™edchozí" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2526,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2538,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2612,57 +2560,56 @@ msgstr "" msgid "Forward" msgstr "DopÅ™edu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "Nalezeno %d výsledků pro '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Snímek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Snímek" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" -msgstr "Snímek" +msgstr "Informace o snímku" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Rozsah Snímku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limit Snímků:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2670,20 +2617,20 @@ msgstr "FrancouzÅ¡tina" msgid "Frets" msgstr "Pražce" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" @@ -2691,62 +2638,66 @@ msgstr "Soubor GCI(*.gci)" msgid "GCMic Configuration" msgstr "Nastavení GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID Hry:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Hra už běží!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Hra neběží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kódy Gecko" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2754,43 +2705,43 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" -"(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +"(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován. Zkuste použít )" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Obecné" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Obecná Nastavení" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "NÄ›mÄina" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index je vÄ›tší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafická nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2807,7 +2758,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "ŘeÄtina" @@ -2827,11 +2778,11 @@ msgstr "Zelená vpravo" msgid "Guitar" msgstr "Kytara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacky" @@ -2839,11 +2790,11 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "HebrejÅ¡tina" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Výška" @@ -2851,7 +2802,7 @@ msgstr "Výška" msgid "Help" msgstr "NápovÄ›da" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2867,15 +2818,15 @@ msgstr "" "\n" "Sajonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2889,8 +2840,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hostovat" @@ -2898,26 +2849,26 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "MaÄarÅ¡tina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2930,31 +2881,31 @@ msgstr "" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Nastavení IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "InfrÄ." -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "InfraÄer. Ukazovátko" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Citlivost InfraÄer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -2962,11 +2913,11 @@ msgstr "Adresáře ISO" msgid "ITALY" msgstr "ITÃLIE" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2974,28 +2925,28 @@ msgstr "" "Pokud je zaÅ¡krtnuto, registry ohraniÄujícího rámeÄku budou aktualizovány. " "Používáno v hrách Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" "Pokud nastavíte limit snímků vÄ›tší než plná rychlost hry (NTSC:60, PAL:50), " -"mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP, aby to bylo úÄinné." +"mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP (v závislosti na hÅ™e může " +"spravit klikání zvuku, ale také může způsobit neustálý hluk)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3009,7 +2960,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3023,7 +2974,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -3031,7 +2982,7 @@ msgstr "Importovat Uloženou hru" msgid "Import failed, try again?" msgstr "Import selhal, zkusit znovu?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3039,11 +2990,11 @@ msgstr "" "Importovaný soubor má příponu gsc\n" "ale nemá správnou hlaviÄku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Importovaný soubor má neplatnou délku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3051,7 +3002,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3063,26 +3014,16 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Zlepší výkon, ale způsobí, že ve vÄ›tÅ¡inÄ› her zmizí osvÄ›tlení.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3090,7 +3031,7 @@ msgstr "Info" msgid "Information" msgstr "Informace" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Vstup" @@ -3102,7 +3043,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte ZaÅ¡ifrovaný nebo RozÅ¡ifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3110,11 +3051,11 @@ msgstr "Vložit SD Kartu" msgid "Insert name here.." msgstr "Zde vložte jméno..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" @@ -3125,42 +3066,44 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "Chyba v kontrole celistvosti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "Kontrola celistvosti dokonÄena" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "Kontrola celistvosti dokonÄena. Nebyly nalezeny žádné chyby." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"Kontrola celistvosti oddílu %d selhala. Váš výpis ISO je pravÄ›podobnÄ› " +"poÅ¡kozen nebo byl nesprávnÄ› opraven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Nastavení Rozhraní" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "VnitÅ™ní chyba LZO - komprimace selhala" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3169,19 +3112,19 @@ msgstr "" "VnitÅ™ní chyba LZO - dekomprimace selhala (%d) (%ld, %ld) \n" "Zkuste znovu nahrát stav" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3190,11 +3133,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Neplatná Velikost(%x) nebo Kouzelné slovo (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Neplatná Hodnota!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." @@ -3203,7 +3146,7 @@ msgstr "Neplatný bat.map nebo záznam adr." msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Neplatný soubor" @@ -3218,29 +3161,29 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "Neplatné parametry hledání (není vybrán žádný objekt)" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 +msgid "Invalid search string (couldn't convert to number)" +msgstr "Neplatný Å™etÄ›zec hledání (nelze pÅ™evést na Äíslo)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 -msgid "Invalid search string (couldn't convert to number)" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "Neplatný Å™etÄ›zec hledání (jsou podporovány pouze sudé délky Å™etÄ›zce)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Neplatný stav" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3248,16 +3191,16 @@ msgstr "ItalÅ¡tina" msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "JaponÅ¡tina" @@ -3265,28 +3208,27 @@ msgstr "JaponÅ¡tina" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Skryje kurzor myÅ¡i, pokud je nad oknem emulace.\n" +"Okno hry bude vždy navrchu ostatních oken.\n" "\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "Okno vždy navrchu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "KorejÅ¡tina" @@ -3304,19 +3246,23 @@ msgstr "TlaÄítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Jazyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Poslední PÅ™epsaný Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Poslední Uložený Stav" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3326,8 +3272,8 @@ msgstr "Vlevo" msgid "Left Stick" msgstr "Levý Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3335,7 +3281,7 @@ msgstr "" "Levé kliknutí pro detekci zkratky.\n" "Zadejte mezerník pro vyÄiÅ¡tÄ›ní." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3345,7 +3291,7 @@ msgstr "" "ProstÅ™ední kliknutí pro vyÄiÅ¡tÄ›ní.\n" "Pravé kliknutí pro více možností." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3353,76 +3299,76 @@ msgstr "" "Levé/Pravé kliknutí pro více možností.\n" "ProstÅ™ední pro vymazání." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitovat podle SzS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Nahrát Slot Stavu 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Nahrát Slot Stavu 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Nahrát Slot Stavu 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Nahrát Slot Stavu 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Nahrát Slot Stavu 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Nahrát Slot Stavu 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Nahrát Slot Stavu 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Nahrát Slot Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3436,36 +3382,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "NaÄíst pÅ™ednastavené hodnoty z dostupných hackových vzorů." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Uzamknout Vlákna do Jader" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Záznam" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Nastavení Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "Zaznamenat SzS do souboru" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Typy Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Zaznamenat poÄet snímků vykreslených za sekundu do User/Logs/fps.txt. Tuto " +"funkci využijte pro měření výkonu Dolphin\n" +"\n" +".Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 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:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Protokolování" @@ -3473,10 +3427,6 @@ msgstr "Protokolování" msgid "Lost connection to server!" msgstr "PÅ™ipojení k serveru ztraceno!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "TlaÄítko M" @@ -3490,12 +3440,12 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" @@ -3504,33 +3454,33 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Výrobce:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Pam. karta už má uložení pro tento název" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Pam. karta již otevÅ™ena" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Paměťová karta" @@ -3542,7 +3492,7 @@ msgstr "" "Správce Paměťových karet Varování-PÅ™ed použitím zálohujte, mÄ›l by být " "spravený, ale mohl by vÄ›ci poÅ¡kodit!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3567,20 +3517,20 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3589,7 +3539,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3605,16 +3555,16 @@ msgstr "" msgid "Monospaced font" msgstr "Písmo se stejnou rozteÄí" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3636,7 +3586,7 @@ msgstr "" msgid "Multiply" msgstr "Násobit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3644,13 +3594,15 @@ msgstr "" "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " "Wiimote. Žádný efekt na emulovaná Wiimote." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" -msgstr "" +msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" +"POZNÃMKA: Velikost proudu se neshoduje se\n" +"skuteÄnou délkou dat\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3736,38 +3688,38 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Jméno:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Jméno: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Původní soubory CGI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Další Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Další Skenování" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "PÅ™ezdívka :" @@ -3775,7 +3727,7 @@ msgstr "PÅ™ezdívka :" msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nenalezena žádná ISO nebo WADS" @@ -3784,24 +3736,24 @@ msgstr "Nenalezena žádná ISO nebo WADS" msgid "No banner file found for title %s" msgstr "Nebyl nalezen žádný plakát s názvem %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" -msgstr "" +msgstr "Žádný popis není dostupný" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" msgstr "Žádné pÅ™ipínání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Není naÄten žádný soubor" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Žádné volné záznamy indexu adresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Žádný soubor s nahrávkou" @@ -3810,33 +3762,33 @@ msgstr "Žádný soubor s nahrávkou" msgid "No save folder found for title %s" msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "NepÅ™ipojen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Poznámky" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Poznámky:" @@ -3845,7 +3797,7 @@ msgstr "Poznámky:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "UpozornÄ›ní" @@ -3853,28 +3805,28 @@ msgstr "UpozornÄ›ní" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "PoÄet Kódů:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "NunÄak" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Zrychlení NunÄaku" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Vypnuto" @@ -3882,60 +3834,56 @@ msgstr "Vypnuto" msgid "Offset:" msgstr "Logická Adresa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "Zobrazovat zprávy na obrazovce" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otevřít soubor..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: nelze vytvoÅ™it kontext pro zařízení %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nelze nalézt zvuková zařízení" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Otevřít ladící program" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "OtevÅ™e protokol" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Volby" @@ -3944,7 +3892,7 @@ msgstr "Volby" msgid "Orange" msgstr "Oranžová" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3954,8 +3902,8 @@ msgstr "" "KliknÄ›te pravým tlaÄítkem a exportujte vÅ¡echna uložení,\n" "a importujte je do nové paměťové karty\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Jiné" @@ -3966,19 +3914,19 @@ msgid "" msgstr "" "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Výstup" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "S&pustit nahrávku..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3994,7 +3942,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Spárovat" @@ -4006,30 +3954,34 @@ msgstr "Odstavec" msgid "Parameters" msgstr "Parametry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Pozastavit na konci filmu" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Dokonalá" @@ -4038,36 +3990,36 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "PÅ™ehrát nahrávku" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "PÅ™ehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Hratelné" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Možnosti PÅ™ehrávání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4079,54 +4031,54 @@ msgstr "PÅ™ed uložením si prosím vytvoÅ™te perspektivu" msgid "Plus-Minus" msgstr "Plus-Mínus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4139,11 +4091,11 @@ msgstr "PÅ™edvolby:" msgid "Prev Page" msgstr "PÅ™ed. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "PÅ™edchozí Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "PÅ™edchozí Hodnota" @@ -4151,7 +4103,7 @@ msgstr "PÅ™edchozí Hodnota" msgid "Print" msgstr "Vytisknout" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4159,7 +4111,7 @@ msgstr "Profil" msgid "Properties" msgstr "Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Zahodit Vyrovnávací Paměť" @@ -4167,8 +4119,8 @@ msgstr "Zahodit Vyrovnávací Paměť" msgid "Question" msgstr "Otázka" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "UkonÄit" @@ -4186,7 +4138,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4194,46 +4146,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSKO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rozsah" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Opravdová" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Opravdový Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Opravdové Wiimoty" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Potvrzení o znovupÅ™ipojení Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Znovu pÅ™ipojit Wiimote pÅ™i Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Nahrávat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informace o Nahrávání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Možnosti Nahrávání" @@ -4249,7 +4201,7 @@ msgstr "ÄŒervená vlevo" msgid "Red Right" msgstr "ÄŒervená vpravo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4263,29 +4215,29 @@ 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Obnovit" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4295,17 +4247,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Resetovat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Výsledky" @@ -4322,7 +4274,7 @@ msgstr "Vpravo" msgid "Right Stick" msgstr "Pravý Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrace" @@ -4331,116 +4283,112 @@ msgstr "Vibrace" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Spustit DSP LLE na samostatném vláknÄ› (nedoporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "RuÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Uložit Sta&v" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "BezpeÄná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Vzorkovací frekvence:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Uložit" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Uložit GCI jako..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Uložit do Slotu Stavu 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Uložit do Slotu Stavu 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Uložit do Slotu Stavu 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Uložit do Slotu Stavu 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Uložit do Slotu Stavu 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Uložit do Slotu Stavu 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Uložit do Slotu Stavu 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Uložit do Slotu Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Skenuji..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "SnímkObrz" @@ -4448,27 +4396,25 @@ msgstr "SnímkObrz" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" -msgstr "Hledání Cheatů" +msgstr "Hledat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" -msgstr "Uložit souÄasnou perspektivu" +msgstr "Hledat v souÄasném objektu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "Hledat hexadecimální hodnotu:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4477,20 +4423,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Vybrat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4508,23 +4454,23 @@ msgstr "Vyberte soubor s uloženou pozicí pro import" msgid "Select floating windows" msgstr "Vybrat plovoucí okna" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Vyberte stav k uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4540,11 +4486,16 @@ msgstr "" "Vynutit 4:3: Roztáhne obraz na pomÄ›r4:3.\n" "Roztáhnout do okna: Roztáhne obraz do velikosti okna." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Zadaný soubor \"%s\" neexistuje" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Vybraný typ písma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4561,7 +4512,7 @@ msgstr "" "Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " "funguje." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4573,15 +4524,15 @@ msgstr "" "Zvolí jaké bude vnitÅ™nÄ› grafické API použito.\n" "Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 " "je nÄ›kde mezi nimi.\n" -"Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" +"Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Poslat" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "UmístÄ›ní Senzorové TyÄe:" @@ -4589,48 +4540,54 @@ msgstr "UmístÄ›ní Senzorové TyÄe:" msgid "Separator" msgstr "OddÄ›lovaÄ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Sériový port 1 - Tito je port, který používají zařízení jako internetový " "adaptér" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index je vÄ›tší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Nastavení..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nelze najít soubor s nastavením" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "TÅ™es" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -4638,105 +4595,105 @@ msgstr "Krátké Jméno:" msgid "Shoulder Buttons" msgstr "Zadní TlaÄítka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Zobrazit &Konzoli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Zobrazit Záznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Zobrazit &Stavový řádek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Zobrazit Panel Nás&trojů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Zobrazit Francii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Zobrazit Itálii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Zobrazit JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Jazyk Zobrazení:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Zobrazit Nastavení &Záznamu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Zobrazit PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Zobrazit Platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Zobrazit Statistiky" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Zobrazit Tchaj-wan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Zobrazit USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Zobrazit Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Zobrazí rámeÄek s potvrzením pÅ™ed zastavením hry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4744,27 +4701,41 @@ msgstr "" "Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " "může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Zobrazit poÄítadlo zpoždÄ›ní" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"Zobrazit zprávy v oblasti obrazovky emulace.\n" +"Tyto zprávy zahrnují zápisy do paměťových karet, podpůrné vrstvy videa a " +"informace o CPU a ÄiÅ¡tÄ›ní mezipamÄ›ti JIT." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4776,15 +4747,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Zobrazit tuto zprávu nápovÄ›dy" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4794,31 +4761,35 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4830,7 +4801,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4846,17 +4817,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4864,7 +4835,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snímek" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Softwarový VykreslovaÄ" @@ -4876,19 +4847,19 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" "Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " -"backendů.\n" +"podpůrných vrstev.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Nastavení Zvuku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." -msgstr "Zvukový backend %s je neplatný." +msgstr "Podpůrná vrstva zvuku %s je neplatná." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format @@ -4899,17 +4870,17 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4929,11 +4900,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "UrÄit backend videa" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost pÅ™enosu Disku" @@ -4941,51 +4908,55 @@ msgstr "Zvýšit rychlost pÅ™enosu Disku" msgid "Square Stick" msgstr "ÄŒtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standardní OvladaÄ" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Spustit &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "ZaÄít na&hrávat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "ZaÄít Nahrávat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stav" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ukládání stavu" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4999,7 +4970,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5020,12 +4991,12 @@ msgstr "Soubor úspěšnÄ› exportován do %s" msgid "Successfully imported save files" msgstr "Uložení byly úspěšnÄ› importovány" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Jazyk Systému:" @@ -5033,7 +5004,7 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5054,30 +5025,30 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5093,13 +5064,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní souÄet byl úspěšnÄ› opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5122,7 +5093,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevÅ™en, hlaviÄka souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5139,8 +5110,7 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5150,13 +5120,13 @@ msgstr "" "Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " "chybÄ›t jakékoliv aktualizace textur z RAM.\n" "\n" -"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." +"Pokud si nejste jisti, použijte hodnotu zcela vpravo." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5189,15 +5159,12 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Vzhled" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "VýbÄ›r vzhledu se zvrtl" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5205,7 +5172,7 @@ msgstr "" "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " "pravdÄ›podobnÄ› neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5213,7 +5180,7 @@ msgstr "" "Tato nastavení potlaÄí hlavní nastavení Dolphinu.\n" "NeurÄený znamená, že hra použije nastavení Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5221,14 +5188,16 @@ msgstr "" "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5243,7 +5212,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5254,7 +5223,7 @@ msgstr "" "Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " "může způsobovat obÄasné chyby/pády." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Tohle Vám umožní RuÄnÄ› Upravovat konfiguraÄní soubory INI" @@ -5263,40 +5232,40 @@ msgstr "Tohle Vám umožní RuÄnÄ› Upravovat konfiguraÄní soubory INI" msgid "Threshold" msgstr "Práh" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "NaklánÄ›ní" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Název" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5316,7 +5285,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "TureÄtina" @@ -5328,12 +5297,12 @@ msgstr "ToÄna" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5341,10 +5310,10 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "NEZNÃMÃ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#, c-format msgid "UNKNOWN_%02X" -msgstr "NEZNÃMÃ" +msgstr "NEZNÃMÉ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5369,24 +5338,24 @@ msgstr "" "rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" "ChtÄ›li byste tento řádek ignorovat a pokraÄovat v analýze?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Nedefinován %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Vrátit zpÄ›t Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "NeoÄekávané volání 0x80? UkonÄování..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Neznámé" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Neznámý příkaz DVD %08x - závažná chyba" @@ -5411,32 +5380,32 @@ msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" msgid "Up" msgstr "Nahoru" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aktualizovat" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5449,7 +5418,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5463,15 +5432,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Synch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Hodnota" @@ -5479,23 +5448,23 @@ msgstr "Hodnota" msgid "Value:" msgstr "Hodnota:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Hodnota:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Hlasitost" @@ -5506,11 +5475,10 @@ msgid "WAD installation failed: error creating %s" msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 -#, fuzzy msgid "WAD installation failed: error creating ticket" -msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" +msgstr "Instalace WAD selhala: chyba pÅ™i vytváření lístku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5523,16 +5491,16 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5551,7 +5519,7 @@ msgstr "" "%s\n" "PÅ™ejete si pokraÄovat?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5564,7 +5532,7 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5576,7 +5544,7 @@ msgstr "" "mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze " "pro Ätení." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5588,7 +5556,7 @@ msgstr "" "naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " "desynchronizaci." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5622,7 +5590,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - soubor není otevÅ™en." @@ -5630,31 +5598,31 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5662,17 +5630,17 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5685,19 +5653,19 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimoty" @@ -5717,27 +5685,26 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Pracuji..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Zapsat do Konzole" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 -#, fuzzy +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" -msgstr "Zapsat do Souboru" +msgstr "Zapsat do LadiÄe" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Zapsat do Souboru" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Zapsat do Okna" @@ -5756,9 +5723,9 @@ msgstr "XAudio2 spuÅ¡tÄ›ní selhalo: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 vytvoÅ™ení hlavního hlasu selhalo: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5776,25 +5743,25 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nemůžete zavřít panely, které mají uvnitÅ™ stránky." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Musíte si zvolit hru!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Musíte zadat jméno!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " "soustavÄ›." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -5817,25 +5784,25 @@ msgstr "" "MÄ›l by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvoÅ™it nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Kód Zero 3 není podporován" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Nulový kód, který dolphin nezná: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5851,7 +5818,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5870,7 +5837,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5885,11 +5852,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -5906,7 +5873,7 @@ msgstr "ÄŒtení dat selhalo ze souboru: %s" msgid "failed to read header" msgstr "Nelze Äíst z hlaviÄky" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." @@ -5916,7 +5883,7 @@ msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." msgid "not a wii save or read failure for file header size %x" msgstr "není uložená hra wii nebo nelze Äíst z hlaviÄky souboru o velikosti %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5925,7 +5892,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -5937,10 +5904,13 @@ msgstr "Korekce z Far:" msgid "zNear Correction: " msgstr "Korekce zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| NEBO" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Výchozí)" @@ -6008,6 +5978,32 @@ 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 "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle " +#~ "bodu.\n" +#~ "Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky " +#~ "podle pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6041,15 +6037,48 @@ msgstr "| NEBO" #~ msgid "Could not copy %s to %s" #~ msgstr "Nelze kopírovat %s do %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "VytvoÅ™il KDE-look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VytvoÅ™il VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "VytvoÅ™il black_rider a publikováno na ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Vyrovnávací paměť DList" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Lighting" +#~ msgstr "Zakázat OsvÄ›tlení" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Zakázat Hloubku Podle Pixelu" + +#~ msgid "Disable Textures" +#~ msgstr "Zakázat Textury" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Zakázat Reproduktor Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Zakázat texturování.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6095,6 +6124,9 @@ msgstr "| NEBO" #~ msgid "Enable Audio Throttle" #~ msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" +#~ msgid "Enable BAT" +#~ msgstr "Zapnout BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" @@ -6113,6 +6145,15 @@ msgstr "| NEBO" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Povolit SpoÅ™iÄ Obrazovky (zmírnÄ›ní vypálení)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› " +#~ "napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " +#~ "VYPNUTO = Rychlé)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" @@ -6151,6 +6192,9 @@ msgstr "| NEBO" #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "UkonÄit Dolphin s emulátorem" + #~ msgid "Failed to compile ps %s" #~ msgstr "Nelze zkompilovat ps %s" @@ -6166,6 +6210,9 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6201,6 +6248,15 @@ msgstr "| NEBO" #~ "window has focus." #~ msgstr "Skrýt kurzor, když je nad vykreslovacím oknem a okno je aktivní" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Zlepší výkon, ale způsobí, že ve vÄ›tÅ¡inÄ› her zmizí osvÄ›tlení.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "Input Source" #~ msgstr "Zdroj Vstupu:" @@ -6239,6 +6295,15 @@ msgstr "| NEBO" #~ "Nahrání původních mipmap je správnÄ›jší chování, ale může také snížit " #~ "výkon (Váš užitek se ale může mÄ›nit)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Uzamknout Vlákna do Jader" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" + #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Mixér: Nepodporovaná vzorkovací frekvence." @@ -6255,6 +6320,12 @@ msgstr "| NEBO" #~ msgid "OK" #~ msgstr "OK" +#~ msgid "Opens the debugger" +#~ msgstr "Otevřít ladící program" + +#~ msgid "Opens the logger" +#~ msgstr "OtevÅ™e protokol" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6279,6 +6350,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Sample Rate:" +#~ msgstr "Vzorkovací frekvence:" + #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" @@ -6319,6 +6393,9 @@ msgstr "| NEBO" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zobrazit poÄet snímků vykreslených za sekundu." +#~ msgid "Show this help message" +#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6353,12 +6430,18 @@ msgstr "| NEBO" #~ "Ostatní volby jsou pevná rozliÅ¡ení pro volbu kvality obrazu nezávislé na " #~ "Vaší velikosti displeje." +#~ msgid "Specify a video backend" +#~ msgstr "UrÄit backend videa" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Spustit vykreslovaÄe v Celé obrazovce" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +#~ msgid "Theme selection went wrong" +#~ msgstr "VýbÄ›r vzhledu se zvrtl" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/de.po b/Languages/po/de.po index 516316ed69..fcc41b11d4 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-02-17 01:23+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: LucasX \n" "Language-Team: \n" "Language: German\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (zu viele zum anzeigen)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Spiel: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NICHT" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Nicht Verbunden" @@ -151,156 +144,156 @@ msgstr "%sGCI exportieren%s" msgid "%sImport GCI%s" msgstr "%sGCI importieren%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& UND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Ãœber &Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "Von &DVD-Laufwerk starten..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Haltepunkte" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "Nach ISOs &suchen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Cheat Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Datei" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Hilfe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Status &laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memory-Card Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Arbeitsspeicher" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Ö&ffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Optionen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Pau&se" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Register" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Sound" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Sto&pp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Werkzeuge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ansicht" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -316,27 +309,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UNBEKANNT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(aus)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 Bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 Bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 Bit" @@ -344,46 +337,48 @@ msgstr "8 Bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Ein NetPlay Fenster ist bereits geöffnet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Es wird derzeit kein Spiel ausgeführt." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Konnte kein unterstütztes Bluetooth-Gerät finden!\n" "(Nur der Microsoft Bluetooth-Stack wird unterstüzt.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -432,19 +427,19 @@ msgstr "AR Codes" msgid "About Dolphin" msgstr "Ãœber Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -453,8 +448,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Aktion" @@ -473,7 +468,7 @@ msgstr "" "Fehlerhafter Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -481,7 +476,7 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im folgendem " "Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, fuzzy, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -490,7 +485,7 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) in _Fill_ " "und _Slide_ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, fuzzy, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -499,7 +494,7 @@ msgstr "" "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Ram " "schreiben und _Fill_ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -508,16 +503,17 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im " "geschriebennen Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x) im kopierten Speicher (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Fehler: Master-Code und schreiben in CCXXXXXX nicht umgesetzt " "in (%s)" @@ -527,27 +523,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fehler: Fehlerhafter AR-Code in Zeile: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, fuzzy, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: _Bedingungs_-Code: Fehlerhafte Größe %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, fuzzy, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ungültiger _Normal-Code-Type_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, fuzzy, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ %i: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, fuzzy, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ 0: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Grafikkarte:" @@ -556,11 +552,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -568,13 +564,13 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Hinzufügen..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse: " @@ -614,71 +610,78 @@ msgstr "" "\n" "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " +"Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropische Filterung:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -691,31 +694,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Ãœbernehmen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -723,13 +726,13 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -737,12 +740,12 @@ msgstr "Seitenverhältnis:" msgid "At least one pane must remain open." msgstr "Mindestens eine Palette muss geöffnet bleiben." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -750,26 +753,26 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -779,19 +782,11 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "Register" @@ -800,17 +795,17 @@ msgstr "Register" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Einstellungen" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Audio Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Hintergrund-Eingabe" @@ -823,16 +818,16 @@ msgstr "Rückwärts" msgid "Bad File Header" msgstr "Ungültige Header-Datei" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -840,11 +835,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Leiste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -856,7 +851,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blockzuteilungs-Tabellen-Prüfsumme fehlerhaft." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blöcke" @@ -872,47 +867,53 @@ msgstr "Blau links" msgid "Blue Right" msgstr "Blau rechts" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Unten" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Defekt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Durchsuchen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -925,30 +926,20 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -957,7 +948,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Abbrechen" @@ -974,7 +965,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +975,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -993,18 +984,18 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" @@ -1012,28 +1003,28 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Mitte" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Wechseln" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Disc &wechseln..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Disc wechseln" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Spiel wechseln" @@ -1056,12 +1047,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Parameter _sign_ zu zNear ändern (nach Korrektur)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1069,48 +1059,48 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cheat Suche" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1118,15 +1108,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1140,8 +1130,8 @@ msgstr "Klassik" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Löschen" @@ -1153,22 +1143,22 @@ msgstr "" "Client kann während ein Spiel emmuliert wird, nicht verbunden werden! " "NetPlay ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Schließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Konfiguration" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code: " @@ -1176,96 +1166,96 @@ msgstr "Code: " msgid "Command" msgstr "Befehl" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimiere ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfiguration" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfigurieren" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Steuerung bearbeiten" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Pads konfigurieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote %i verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Verbinden..." @@ -1281,16 +1271,16 @@ msgstr "Strg" msgid "Convert to GCI" msgstr "Zu GCI konvertieren" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Kern" @@ -1299,7 +1289,7 @@ msgstr "Kern" msgid "Could not create %s" msgstr "%s konnte nicht erstellt werden" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Konnte Backend %s nicht initialisieren." @@ -1320,12 +1310,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 #, fuzzy msgid "" "Could not set pads. The player left or the game is currently running!\n" @@ -1335,7 +1325,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1348,11 +1338,11 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 #, fuzzy msgid "" "Couldn't init the core.\n" @@ -1361,17 +1351,17 @@ msgstr "" "Konnte denn _Core nicht init_.\n" "Kontrolliere deine Konfiguartion." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR-Code erstellen" @@ -1380,26 +1370,7 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Erstellt von VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Ersteller: " @@ -1407,11 +1378,11 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Abschneiden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1422,13 +1393,13 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "Aktuelles Verzeichnis wird gemäß wxFileSelector von %s nach %s geändert!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1436,15 +1407,15 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tschechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1452,37 +1423,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1494,16 +1465,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro Dateien(*.sav)" @@ -1515,11 +1486,11 @@ msgstr "Datel MaxDrive/Pro Dateien(*.sav)" msgid "Dead Zone" msgstr "Tote Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1528,24 +1499,24 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1554,11 +1525,11 @@ msgid "Default font" msgstr "Standard Schriftart" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1567,12 +1538,12 @@ msgstr "Spielstand löschen" msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Frage" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Erkenne" @@ -1583,13 +1554,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1613,30 +1584,17 @@ msgstr "" "Die Verzeichnis-Prüfsumme ist fehlerhaft,\n" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "keine Beleuchtung" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Farbtiefe" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "keine Texturen" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1645,7 +1603,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1655,14 +1613,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disc" @@ -1671,11 +1622,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Disc Lesefehler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Anzeige" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1686,20 +1637,24 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Webseite" @@ -1707,33 +1662,33 @@ msgstr "Dolphin &Webseite" msgid "Dolphin Configuration" msgstr "Dolphin Konfiguration" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulierte-Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1741,7 +1696,7 @@ msgstr "" "Dolphin konnte keine GC oder Wii ISOs finden. Hier doppelklicken um nach " "ISOs zu suchen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1749,16 +1704,21 @@ msgstr "" "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " "doppelklicken um alle Spiele anzuzeigen..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Runter" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Codes Herunterladen (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" @@ -1767,34 +1727,34 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Texturen dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1802,32 +1762,32 @@ msgid "" "If unsure, leave this unchecked." msgstr "Angezeigte Spieltexturen nach User/Dump/Textures// dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holländisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Beenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB Kopie-Regionen" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1841,11 +1801,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Bearbeiten" @@ -1853,7 +1813,7 @@ msgstr "Bearbeiten" msgid "Edit ActionReplay Code" msgstr "ActionReplay Code bearbeiten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Einstellungen bearbeiten" @@ -1861,12 +1821,12 @@ msgstr "Einstellungen bearbeiten" msgid "Edit Patch" msgstr "Patch bearbeiten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Bearbeiten..." @@ -1874,15 +1834,15 @@ msgstr "Bearbeiten..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emu-Thread läuft bereits." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1891,7 +1851,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1901,19 +1861,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulierbarkeit:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1923,74 +1883,69 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "BAT aktivieren" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -2002,7 +1957,7 @@ msgstr "" "Anisotropische Filterung aktivieren.\n" "Verbessert die Grafikqualität bei schrägen Blickwinkeln." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2010,11 +1965,11 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Blättern verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2022,7 +1977,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2030,7 +1985,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2038,21 +1993,28 @@ msgstr "" "Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " "beschleunigen. Dies für JEDES andere Spiel deaktivieren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Ermöglicht Ãœbersetzung von Blockadressen (BAT), eine Funktion der " -"Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " -"Emulieren. (ON = Kompatibel, OFF = Schnell)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2060,7 +2022,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2068,7 +2030,7 @@ msgstr "" "Aktiviert die Speicher-Verwaltungs-Einheit, die für einige Spiele gebraucht " "wird. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2079,14 +2041,14 @@ msgstr "" msgid "End" msgstr "Ende" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Englisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Erweiterungen" @@ -2104,17 +2066,17 @@ msgstr "Eintrag %d/%d" msgid "Entry 1/%d" msgstr "Eintrag 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Gleich" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Fehler" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " @@ -2155,36 +2117,32 @@ msgstr "" msgid "Execute" msgstr "Ausführen" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphin mit Emulator beenden." - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Datei exportieren" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Aufnahme exportieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2192,15 +2150,15 @@ msgstr "Alle Spielstände exportieren" msgid "Export failed, try again?" msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Spielstand exportieren als..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2213,52 +2171,52 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrahieren..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "Spieler" @@ -2267,7 +2225,7 @@ msgstr "Spieler" msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Größe:" @@ -2275,16 +2233,16 @@ msgstr "FST Größe:" msgid "Failed to Connect!" msgstr "Verbindungsaufbau fehlgeschlagen!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 #, fuzzy msgid "Failed to Listen!!" msgstr "_Listen_ Fehlgeschlagen!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2313,6 +2271,11 @@ msgstr "Fehler beim Laden von hid.dll" msgid "Failed to load hid.dll" msgstr "Fehler beim Laden von hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fehler beim Schreiben eines Header für %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Fehler beim Lesen von banner.bin" @@ -2395,48 +2358,43 @@ msgstr "Fehler beim Schreiben eines Header für %s" msgid "Failed to write header for file %d" msgstr "Fehler beim Schreiben eines Header für Datei %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Native Mipmaps laden" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Datei enthielt keine Codes." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Datei zu .gci konvertiert." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2453,7 +2411,7 @@ msgstr "" "Die Datei besitzt die Erweiterung \"%s\",\n" "gültige Erweiterungen sind (.raw/.gcp)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Diese Datei wird nicht als Memorycard anerkannt." @@ -2466,49 +2424,49 @@ msgstr "Datei nicht komprimiert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9 erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Filterung erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2521,7 +2479,7 @@ msgstr "" "Verbessert Textur-Qualität (besonders bei hoher interner Auflösung) aber " "verursacht Fehler in einigen Spielen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2532,7 +2490,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:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2551,61 +2509,61 @@ msgstr "" msgid "Forward" msgstr "Vorwärts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "Nächster Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Frei Umsehen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Französisch" @@ -2613,21 +2571,21 @@ msgstr "Französisch" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Vollbild" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Datei(*.gci)" @@ -2636,58 +2594,62 @@ msgstr "GCI Datei(*.gci)" msgid "GCMic Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spiel ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Spiel wird bereits emuliert!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Spiel wird nicht emuliert!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2703,42 +2665,42 @@ msgstr "" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " "unterstützt.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Allgemein" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Deutsch" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Der Index ist größer als AR-Codelisten-Größe %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Größer als" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2749,7 +2711,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Griechisch" @@ -2769,11 +2731,11 @@ msgstr "Grün rechts" msgid "Guitar" msgstr "Gitarre" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2781,11 +2743,11 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebräisch" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Höhe" @@ -2793,7 +2755,7 @@ msgstr "Höhe" msgid "Help" msgstr "Hilfe" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2810,15 +2772,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Verbergen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Mauszeiger verstecken" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2832,8 +2794,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2841,28 +2803,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungarisch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Versucht Daten von einem unbekannten Ticket zu bekommen: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2875,31 +2837,31 @@ msgstr "" "TitleID %016llx.\n" " Dolphin wird wahrscheinlich jetzt hängen bleiben." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Einstellungen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR-Zeiger" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO Verzeichnisse" @@ -2907,24 +2869,24 @@ msgstr "ISO Verzeichnisse" msgid "ITALY" msgstr "ITALIEN" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, OFF " "= Schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2935,12 +2897,12 @@ msgstr "" "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" "Einstellungen deaktiviert werden, damit dies wirksam wird." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Formatänderungen emulieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2949,7 +2911,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2958,7 +2920,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Spielstand importieren" @@ -2966,7 +2928,7 @@ msgstr "Spielstand importieren" msgid "Import failed, try again?" msgstr "Importieren fehlgeschlagen, noch einmal versuchen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2974,11 +2936,11 @@ msgstr "" "Die importierte Datei hat die Erweiterung gsc, aber besitzt keinen korrekten " "Header." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Importierte Datei hat eine ungültige Länge" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2986,7 +2948,7 @@ msgstr "" "Importierte Datei hat die Erweiterung sav,\n" "aber besitzt keinen korrekten Header." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2997,26 +2959,16 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " -"Beleuchtung in Spielen ab, die sie benutzen." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Ingame" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3024,7 +2976,7 @@ msgstr "Info" msgid "Information" msgstr "Informationen" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Eingabe" @@ -3036,7 +2988,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3044,12 +2996,12 @@ msgstr "SD-Karte einlegen" msgid "Insert name here.." msgstr "Namen hier eingeben.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3060,44 +3012,44 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Interface Einstellungen" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Internationaler LZO-Fehler - Komprimierung fehlgeschlagen" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3107,20 +3059,20 @@ msgstr "" "%li) \n" "Versuche diesen Status nochmal zu laden." -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3129,11 +3081,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ungültige Größe (%x) oder _Zauberwort_ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ungültigen Wert!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" @@ -3142,7 +3094,7 @@ msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ungültige Datei" @@ -3157,29 +3109,29 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ungültiger Status" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italienisch" @@ -3187,16 +3139,16 @@ msgstr "Italienisch" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanisch" @@ -3204,7 +3156,7 @@ msgstr "Japanisch" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3214,17 +3166,17 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreanisch" @@ -3242,19 +3194,23 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Sprache:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Letzter überschriebener Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Letzter gespeicherter Status" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3264,8 +3220,8 @@ msgstr "Links" msgid "Left Stick" msgstr "Stick links" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3273,7 +3229,7 @@ msgstr "" "Zum Erkennen, auf Tastenkürzel linksklicken.\n" "Drücken Sie die Leertaste, zum löschen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3283,7 +3239,7 @@ msgstr "" "Mittlere Maustaste zum Löschen.\n" "Rechtsklick für weitere Optionen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3291,78 +3247,78 @@ msgstr "" "Links/Rechts-Klick für mehr Optionen.\n" "Mittlere Maustaste zum Löschen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Status aus Slot 1 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Status aus Slot 2 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Status aus Slot 3 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Status aus Slot 4 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Status aus Slot 5 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Status aus Slot 6 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Status aus Slot 7 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Status aus Slot 8 laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3375,40 +3331,43 @@ msgstr "Hochauflösende Texturen aus User/Load/Textures// laden" msgid "Load preset values from hack patterns available." msgstr "Lade _Preset_-Werte aus dem verfügbarren Hack-Struktur_-en_." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "Threads an Cores binden" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 #, fuzzy msgid "Log Types" msgstr "Typ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3416,10 +3375,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "Die Verbindung zum Server wurde getrennt!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Wähle die 'low level' (LLE) oder 'high level' (HLE) Audioemulation" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Mittlere Taste" @@ -3433,12 +3388,12 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" @@ -3447,34 +3402,34 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Hersteller:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Memorycard hat bereits eine Spielstand für diesen Tittel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Memorycard ist bereits geöffnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Memory Card" @@ -3486,7 +3441,7 @@ msgstr "" "Memory-Card Manager WARNUNG - Erstelle Backups bevor der Benutzung. Dies " "sollte zwar gefixt sein, aber könnte dennoch Probleme machen (mangle stuff)!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3511,21 +3466,21 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3534,7 +3489,7 @@ msgstr "Sonstige Einstellungen" msgid "Modifier" msgstr "Modifikator" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3546,16 +3501,16 @@ msgstr "" msgid "Monospaced font" msgstr "Monospaced Schriftart" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3570,17 +3525,17 @@ msgstr "" msgid "Multiply" msgstr "Stern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3669,38 +3624,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Name:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Name: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI Dateien(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Nächste Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Nächster Scan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Nickname:" @@ -3708,7 +3663,7 @@ msgstr "Nickname:" msgid "No Country (SDK)" msgstr "Kein Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Keine ISOs oder WADs gefunden" @@ -3717,8 +3672,8 @@ msgstr "Keine ISOs oder WADs gefunden" msgid "No banner file found for title %s" msgstr "Keine Banner-Datei für Tittel %s gefunden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3726,15 +3681,15 @@ msgstr "" msgid "No docking" msgstr "Nicht Andocken" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Keine freien Verzeichnis-Indexeinträge." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "Ungültige Aufnahmedatei" @@ -3744,33 +3699,33 @@ msgstr "Ungültige Aufnahmedatei" msgid "No save folder found for title %s" msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norwegisch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nicht Verbunden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notizen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notizen: " @@ -3779,7 +3734,7 @@ msgstr "Notizen: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Notizen" @@ -3787,28 +3742,28 @@ msgstr "Notizen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Anzahl von Codes: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuck Beschleunigung" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Aus" @@ -3816,60 +3771,56 @@ msgstr "Aus" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Nur %d Blöcke verfügbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Datei öffnen..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kann Kontext für Gerät %s nicht erstellen" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kann kein Sound-Gerät finden" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kann Gerät %s nicht öffnen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Öffnet den Debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Öffnet den Logger" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Optionen" @@ -3878,7 +3829,7 @@ msgstr "Optionen" msgid "Orange" msgstr "Orange" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3889,8 +3840,8 @@ msgstr "" "klicke Rechts und exportiere alle Spielstände,\n" "und importiere die Spielstände auf eine neue Memorycard.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3902,19 +3853,19 @@ msgstr "" "Der andere Client wurde, während das Spiel läuft, getrennt! Nun ist NetPlay " "inaktiv. Beenden Sie nun manuell das Spiel." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Au&fnahme abspielen..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3930,7 +3881,7 @@ msgstr "Bild Ab" msgid "Page Up" msgstr "Bild Hoch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Verbinden" @@ -3942,31 +3893,35 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Parameter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekt" @@ -3975,37 +3930,37 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektive %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Start" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Spielbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Optionen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4017,55 +3972,55 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4078,11 +4033,11 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Vorherige Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Vorheriger Wert" @@ -4090,7 +4045,7 @@ msgstr "Vorheriger Wert" msgid "Print" msgstr "Druck" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4098,7 +4053,7 @@ msgstr "Profil" msgid "Properties" msgstr "Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Cache löschen" @@ -4106,8 +4061,8 @@ msgstr "Cache löschen" msgid "Question" msgstr "Frage" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Beenden" @@ -4125,7 +4080,7 @@ msgstr "R Taste" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4133,50 +4088,50 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Weite" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Echt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Wiederverbindung Bestätigen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote wiederverbinden, beim laden eines State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4192,7 +4147,7 @@ msgstr "Rot links" msgid "Red Right" msgstr "Rot rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4206,29 +4161,29 @@ msgstr "" "Lässt das gerenderte Bild feiner aussehen, aber führt auch zu starkem Abfall " "der Performance." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Aktualisieren" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Entfernen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4238,17 +4193,17 @@ msgstr "" "Szene als Drahtgittermodell rendern.\n" "Dies ist nur für Debugging nützlich." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Zurücksetzen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Ergebnisse" @@ -4265,7 +4220,7 @@ msgstr "Rechts" msgid "Right Stick" msgstr "Stick rechts" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4274,117 +4229,113 @@ msgstr "Rumble" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sicher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Abtastrate:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Speichern" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "CGI speichern unter..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Status in Slot 1 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Status in Slot 2 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Status in Slot 3 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Status in Slot 4 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Status in Slot 5 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Status in Slot 6 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Status in Slot 7 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Status in Slot 8 speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Suche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4392,24 +4343,24 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Rollen Feststell" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Suche" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4420,21 +4371,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4452,23 +4403,23 @@ msgstr "Speicherdatei zum Importieren auswählen" msgid "Select floating windows" msgstr "Wähle unverankerte Fenster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4485,11 +4436,16 @@ msgstr "" "Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" "An Fenster anpassen: Bild auf Fenstergröße strecken." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Die ausgewählte Datei \"%s\" existiert nicht" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Ausgewählte Schriftart" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4499,7 +4455,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4509,11 +4465,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Senden" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Position der Sensorleiste:" @@ -4521,49 +4477,55 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serieller Port 1 - Dies ist der Port, den Geräte, wie der Net-Adapter, " "benutzen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Der Index ist größer als die AR-Code-Listengröße %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Einstellungen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4572,109 +4534,109 @@ msgstr "Kurzer Name:" msgid "Shoulder Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "&Konsole anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "&Log anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "&Statusleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "&Werkzeugleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Frankreich anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Sprache anzeigen:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Plattformen anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Taiwan anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4684,27 +4646,39 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Kommentar anzeigen" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Namen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4712,49 +4686,49 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Diese Hilfetexte anzeigen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Unbekannte Anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 #, fuzzy msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4762,7 +4736,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4772,17 +4746,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4790,7 +4764,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4802,11 +4776,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Sound Einstelungen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Sound-Backend %s ist ungültig." @@ -4820,17 +4794,17 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanisch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4842,11 +4816,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Wähle ein Video-Backend" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Ãœbertragungsrate beschleunigen" @@ -4854,51 +4824,55 @@ msgstr "Disc-Ãœbertragungsrate beschleunigen" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standard-Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Starte &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Aufnahme starten" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Aufnahme starten" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Status" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Status" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4907,7 +4881,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "An Fenstergröße anpassen" @@ -4928,12 +4902,12 @@ msgstr "Die Datei wurde erfolgreich nach %s exportiert" msgid "Successfully imported save files" msgstr "Die gespeicherte Datei wurde erfolgreich importiert" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Systemsprache:" @@ -4941,7 +4915,7 @@ msgstr "Systemsprache:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4963,31 +4937,31 @@ msgstr "" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Testen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -5004,13 +4978,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5035,7 +5009,7 @@ msgstr "" "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht " "geschrieben." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -5052,7 +5026,7 @@ msgstr "Der Name darf nicht das Zeichen \",\" enthalten" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5060,13 +5034,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Der Spielstand, denn Sie versuchen zu kopieren, hat eine ungültige " "Dateigröße." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5100,15 +5074,12 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Theme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Theme-Auswahl schiefgelaufen" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5116,7 +5087,7 @@ msgstr "" "Es müsste ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " "wahrscheinlich unvollständig." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5125,7 +5096,7 @@ msgstr "" "Grau hinterlegte Kästchen bedeuten, dass die globalen Einstellungen benutzt " "werden." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5133,14 +5104,15 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5148,7 +5120,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5161,7 +5133,7 @@ msgstr "" "als einem Kern,\n" "kann aber gelegentlich Abstürze/Fehler verursachen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" @@ -5170,42 +5142,42 @@ msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" msgid "Threshold" msgstr "Schwelle" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Neigung" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "Oben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 #, fuzzy msgid "Toggle All Log Types" msgstr "Alle umschalten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -5225,7 +5197,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Türkisch" @@ -5237,12 +5209,12 @@ msgstr "" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5250,7 +5222,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UNBEKANNT" @@ -5273,24 +5245,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Undefiniert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Status laden rückgängig machen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Unbekannt" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Unbekannter DVD-Befehl %08x - fataler Fehler" @@ -5316,33 +5288,33 @@ msgstr "" msgid "Up" msgstr "Hoch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Update" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5350,7 +5322,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5359,15 +5331,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Hilfsmittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Wert" @@ -5375,23 +5347,23 @@ msgstr "Wert" msgid "Value:" msgstr "Wert:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Wert: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Lautstärke" @@ -5406,7 +5378,7 @@ msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" msgid "WAD installation failed: error creating ticket" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5415,16 +5387,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" @@ -5443,7 +5415,7 @@ msgstr "" "%s\n" "Wollen Sie fortfahren?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5456,7 +5428,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5464,7 +5436,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5472,7 +5444,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5492,7 +5464,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Konnte Datei nicht öffnen." @@ -5500,32 +5472,32 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Breitbild Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5533,17 +5505,17 @@ msgstr "Wii Speicherdateien (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Konnte die Datei nicht lesen" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5556,19 +5528,19 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5589,27 +5561,27 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Arbeite..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "In Konsole ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "In Datei ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "In Datei ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 #, fuzzy msgid "Write to Window" msgstr "In Fenster zeigen ->" @@ -5629,7 +5601,7 @@ msgstr "XAudio2 _init_ fehlgeschlagen: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 _Master-Stimmenerstellung_ fehlgeschlagen: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5647,24 +5619,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Sie müssen ein Spiel auswählen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Sie müssen einen Namen eingeben!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 #, fuzzy msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -5685,25 +5657,25 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP Hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 Code wird nicht unterstüzt" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ warte ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5715,7 +5687,7 @@ msgstr "" msgid "[Custom]" msgstr "[Benutzerdefiniert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5726,7 +5698,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5735,11 +5707,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5756,7 +5728,7 @@ msgstr "Fehler beim Lesen von Daten aus der Datei: %s" msgid "failed to read header" msgstr "Fehler beim Lesen des Header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." @@ -5766,7 +5738,7 @@ msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." msgid "not a wii save or read failure for file header size %x" msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5775,7 +5747,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -5787,7 +5759,7 @@ msgstr "zFar Korrektion: " msgid "zNear Correction: " msgstr "zNear Korrektion: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ODER" @@ -5797,6 +5769,9 @@ msgstr "| ODER" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Add function" #~ msgstr "&Funktion hinzufügen" @@ -5983,6 +5958,24 @@ msgstr "| ODER" #~ msgid "Count: %i" #~ msgstr "Anzahl: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Erstellt von KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." +#~ "com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Erstellt von VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Erstellt von black_rider und veröffentlicht auf ForumW.org > Web " +#~ "Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -5995,6 +5988,16 @@ msgstr "| ODER" #~ msgid "Data Type" #~ msgstr "Datentyp" +#~ msgid "Disable Lighting" +#~ msgstr "keine Beleuchtung" + +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Farbtiefe" + +#~ msgid "Disable Textures" +#~ msgstr "keine Texturen" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6064,6 +6067,9 @@ msgstr "| ODER" #~ msgid "Enable Audio Throttle" #~ msgstr "Audio-Throttle aktivieren" +#~ msgid "Enable BAT" +#~ msgstr "BAT aktivieren" + #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" @@ -6088,6 +6094,15 @@ msgstr "| ODER" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Bildschirmschoner erlauben" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ermöglicht Ãœbersetzung von Blockadressen (BAT), eine Funktion der " +#~ "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " +#~ "Emulieren. (ON = Kompatibel, OFF = Schnell)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6136,9 +6151,16 @@ msgstr "| ODER" #~ msgid "Error opening file %s for recording" #~ msgstr "Fehler beim Öffnen der Datei %s für die Aufnahme." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphin mit Emulator beenden." + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fehler beim Laden von DSP-ROM: %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Native Mipmaps laden" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6194,6 +6216,15 @@ msgstr "| ODER" #~ "Wenn ein Spiel einfriert, nur im Interpreter funktioniert, oder Dolphin " #~ "Abstürzt, könnte diese Option das beheben." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " +#~ "Beleuchtung in Spielen ab, die sie benutzen." + #~ msgid "Input Source" #~ msgstr "Eingabequelle" @@ -6240,6 +6271,16 @@ msgstr "| ODER" #~ "Native Mipmaps zu laden ist genauer, aber könnte auch die Performance " #~ "verschlechtern (Leistung kann dennoch variieren)" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" + +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "Threads an Cores binden" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Wähle die 'low level' (LLE) oder 'high level' (HLE) Audioemulation" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script Konsole" @@ -6286,6 +6327,12 @@ msgstr "| ODER" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Öffnet den Debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Öffnet den Logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6324,6 +6371,9 @@ msgstr "| ODER" #~ msgid "Running script...\n" #~ msgstr "Script ausführen...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Abtastrate:" + #~ msgid "Save code" #~ msgstr "Code speichern" @@ -6376,6 +6426,9 @@ msgstr "| ODER" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zeigt die Anzahl der Bilder, die pro Sekunde gerendert werden." +#~ msgid "Show this help message" +#~ msgstr "Diese Hilfetexte anzeigen" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6420,6 +6473,9 @@ msgstr "| ODER" #~ "Die anderen Optionen sind feste Auflösungen um Qualität unabhängig der " #~ "Displaygröße zu wählen." +#~ msgid "Specify a video backend" +#~ msgstr "Wähle ein Video-Backend" + #~ msgid "Specify an audio plugin" #~ msgstr "Audio-Plugin auswählen" @@ -6444,6 +6500,9 @@ msgstr "| ODER" #~ msgid "The file " #~ msgstr "Die Datei " +#~ msgid "Theme selection went wrong" +#~ msgstr "Theme-Auswahl schiefgelaufen" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 8b165d6d39..fb0fc614f4 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -1,14 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translation of dolphin-emu.pot to LANGUAGE +# Copyright (C) 2003-2013 +# This file is distributed under the same license as the dolphin-emu package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Dolphin Emu\n" +"Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "" @@ -43,7 +43,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -53,14 +53,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -140,156 +133,156 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -305,27 +298,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -333,44 +326,45 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -389,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -403,19 +397,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -424,8 +418,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -439,42 +433,43 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -482,27 +477,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -511,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -523,13 +518,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -555,68 +550,72 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -628,42 +627,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +670,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -684,43 +683,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -728,16 +719,16 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -750,16 +741,16 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -767,11 +758,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -783,7 +774,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -799,47 +790,53 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -851,29 +848,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -882,7 +869,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -898,7 +885,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -906,24 +893,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -931,28 +918,28 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" @@ -971,11 +958,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -983,47 +969,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1031,14 +1017,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1052,8 +1038,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1063,22 +1049,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1086,95 +1072,95 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1190,16 +1176,16 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1208,7 +1194,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1226,18 +1212,18 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1246,27 +1232,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1275,24 +1261,7 @@ msgstr "" 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:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1300,11 +1269,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1315,12 +1284,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1328,15 +1297,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1344,36 +1313,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1385,16 +1354,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1406,11 +1375,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1418,24 +1387,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1444,11 +1413,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1457,11 +1426,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1472,13 +1441,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1500,28 +1469,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1530,7 +1487,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1540,14 +1497,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1556,11 +1506,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1571,20 +1521,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1592,53 +1546,58 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1647,65 +1606,65 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1715,11 +1674,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1727,7 +1686,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1735,12 +1694,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1748,15 +1707,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1765,7 +1724,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1775,19 +1734,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1797,72 +1756,67 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1871,17 +1825,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1889,7 +1843,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1897,24 +1851,34 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1922,13 +1886,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1939,14 +1903,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1964,17 +1928,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2009,36 +1973,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2046,15 +2006,15 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2066,52 +2026,52 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2119,7 +2079,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2127,15 +2087,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2163,6 +2123,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2232,45 +2197,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2283,7 +2244,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2296,47 +2257,47 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2344,7 +2305,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2352,7 +2313,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2369,56 +2330,56 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2426,20 +2387,20 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2447,57 +2408,61 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2510,41 +2475,41 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2555,7 +2520,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2575,11 +2540,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2587,11 +2552,11 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2599,7 +2564,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2609,15 +2574,15 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2628,8 +2593,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2637,26 +2602,26 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2665,31 +2630,31 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2697,33 +2662,33 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2732,7 +2697,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2741,7 +2706,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2749,23 +2714,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2773,23 +2738,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2797,7 +2755,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2809,7 +2767,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2817,11 +2775,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2830,61 +2788,61 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2893,11 +2851,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2906,7 +2864,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2918,29 +2876,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2948,16 +2906,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2965,24 +2923,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -3000,19 +2958,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3022,96 +2984,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3122,36 +3084,40 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3159,10 +3125,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3174,12 +3136,12 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3188,33 +3150,33 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3224,7 +3186,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3243,20 +3205,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3265,7 +3227,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3277,16 +3239,16 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3301,17 +3263,17 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3399,38 +3361,38 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3438,7 +3400,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3447,8 +3409,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3456,15 +3418,15 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3473,33 +3435,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3508,7 +3470,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3516,28 +3478,28 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3545,60 +3507,56 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3607,15 +3565,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3625,19 +3583,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3653,7 +3611,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3665,30 +3623,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3697,36 +3659,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3738,54 +3700,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3798,11 +3760,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3810,7 +3772,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3818,7 +3780,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3826,8 +3788,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3845,7 +3807,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3853,46 +3815,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3908,7 +3870,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3917,46 +3879,46 @@ msgid "" "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 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3973,7 +3935,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -3982,116 +3944,112 @@ msgstr "" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4099,23 +4057,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4126,20 +4084,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4154,23 +4112,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4181,11 +4139,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4195,7 +4157,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4205,11 +4167,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4217,46 +4179,52 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4264,130 +4232,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4395,46 +4374,46 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4442,7 +4421,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4452,17 +4431,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4470,7 +4449,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4482,11 +4461,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4500,17 +4479,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4522,11 +4501,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4534,51 +4509,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4587,7 +4566,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4608,12 +4587,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4621,7 +4600,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4642,30 +4621,30 @@ msgstr "" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4681,13 +4660,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4706,7 +4685,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4723,7 +4702,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4731,11 +4710,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4766,40 +4745,37 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4807,7 +4783,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4815,7 +4791,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4824,40 +4800,40 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4875,7 +4851,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4887,12 +4863,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4900,7 +4876,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4923,24 +4899,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4965,32 +4941,32 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4998,7 +4974,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5007,15 +4983,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5023,23 +4999,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5053,7 +5029,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5062,16 +5038,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5087,7 +5063,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5096,7 +5072,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5104,7 +5080,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5112,7 +5088,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5132,7 +5108,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5140,31 +5116,31 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5172,17 +5148,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5191,19 +5167,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5223,26 +5199,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5261,7 +5237,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5279,23 +5255,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5313,25 +5289,25 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5343,7 +5319,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5354,7 +5330,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5363,11 +5339,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5384,7 +5360,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5394,7 +5370,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5403,7 +5379,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5415,6 +5391,6 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 2ed1108db6..c8a0daac37 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-04-03 21:13+0200\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(πολλά αποτελέσματα για να εμφανιστοÏν)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Παιχνίδι : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -47,24 +47,17 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγÏαφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i Συνδεδεμένο" @@ -157,158 +150,158 @@ msgstr "%sΕξαγωγή GCI%s" msgid "%sImport GCI%s" msgstr "%sΕισαγωγή GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φακέλων" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&ΠεÏί..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Εκκίνηση από τον οδηγό DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Σημεία Διακοπής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ΕÏÏεση ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&ΔιαχειÏιστής Cheat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Εξομοίωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&ΑÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Βοήθεια" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&ΔιαχειÏιστής ΚαÏτών Μνήμης (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Μνήμη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Άνοιγμα..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&ΠαÏση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&ΚαταχωÏητές" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Ήχος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Διακοπή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Βίντεο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&ΠÏοβολή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -322,27 +315,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεÏγό)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" -msgstr "" +msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -350,46 +343,48 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<Τίποτα>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<Συστήματος>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" -msgstr "" +msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Ένα παÏάθυÏο NetPlay είναι ήδη ανοιχτό!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Αυτή τη στιγμή δεν εκτελείται κάπιο παιχνίδι." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Δε βÏέθηκε υποστηÏιζόμενη συσκευή bluetooth!\n" "(ΥποστηÏίζεται μόνο το Microsoft bluetooth stack)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -423,13 +418,13 @@ msgstr "" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -437,19 +432,19 @@ msgstr "Κωδικοί AR" msgid "About Dolphin" msgstr "Σχετικά με το Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Επιτάχυνση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "ΑκÏίβεια:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -463,8 +458,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ΕνέÏγεια" @@ -483,7 +478,7 @@ msgstr "" "ΠÏοβληματικός Κωδικός:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -491,7 +486,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -500,7 +495,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " "και Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -509,7 +504,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " "Write και Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -518,15 +513,16 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " "To Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν " "έχουν υλοποιηθεί (%s)" @@ -536,27 +532,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Σφάλμα Action Replay: μη έγκυÏη γÏαμμή κώδικα AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: Μη έγκυÏο μέγεθος %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Μη έγκυÏος Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυÏο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" @@ -565,11 +561,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -577,13 +573,13 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "ΠÏοσθήκη..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ΔιεÏθυνση :" @@ -609,76 +605,79 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" +msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" "ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"και 6 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" +msgstr "Ανάλυση" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -690,15 +689,15 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -708,16 +707,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ΑÏαβικά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -725,14 +724,14 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -740,12 +739,12 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -753,24 +752,24 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -781,42 +780,28 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " -"υφές.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" -msgstr "" +msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "&ΚαταχωÏητές" +msgstr "BP ΚαταχωÏητές" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ΧειÏισμός με Ανεστίαστο ΠαÏαθ." @@ -829,16 +814,16 @@ msgstr "Πίσω" msgid "Bad File Header" msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "ΛεπτομέÏειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Εικονίδιο:" @@ -846,11 +831,11 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -862,7 +847,7 @@ msgstr "Μπάσο" msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Μπλοκ" @@ -878,50 +863,56 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Βάση" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Χαλασμένο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "ΕÏÏεση" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Κουμπιά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 -msgid "C" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." msgstr "" +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +msgid "C" +msgstr "C" + #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" msgstr "Stick ΚάμεÏας " @@ -930,35 +921,19 @@ msgstr "Stick ΚάμεÏας " msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" -msgstr "" +msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " -"υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση " -"ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -973,7 +948,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -988,8 +963,9 @@ msgstr "Αποτυχία ανοίγματος %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" msgstr "" +"Δεν μποÏεί να γίνει κατάÏγηση καταχώÏησης συμβάντων όταν οÏισμένα εκκÏεμοÏν." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1000,7 +976,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1008,18 +984,18 @@ msgstr "" "Αδυναμία χÏήσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου σαν κάÏτα μνήμης.\n" "ΠÏοσπαθείτε να χÏησιμοποιήσετε το ίδιο αÏχείο σε δÏο slot;" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1027,28 +1003,28 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Καταλανικά" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "ΚέντÏο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Αλλαγή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Αλλαγή &Δίσκου..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Αλλαγή Δίσκου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" @@ -1069,11 +1045,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Συνομιλία" @@ -1081,47 +1056,47 @@ msgstr "Συνομιλία" msgid "Cheat Code" msgstr "Κωδικός Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Αναζήτηση Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "ΔιαχείÏιση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "Έλεγχος ΑκεÏαιότητας Κατάτμησης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "Έλεγχος ακεÏαιότητας..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1129,7 +1104,7 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,8 +1112,8 @@ msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1152,8 +1127,8 @@ msgstr "Κλασικό ΧειÏιστήÏιο" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1165,22 +1140,22 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Κλείσιμο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ρυ&θμίσεις..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "ΠληÏοφοÏίες ΚωδικοÏ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Κωδικός: " @@ -1188,95 +1163,95 @@ msgstr "Κωδικός: " msgid "Command" msgstr "Εντολή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Συμπίεση ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Ρυθμίσεις ΧειÏιστηÏίου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Ρυθμίσεις ΧειÏιστηÏίων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "ΣÏνδεση Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "ΣÏνδεση Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "ΣÏνδεση Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "ΣÏνδεση Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1292,16 +1267,16 @@ msgstr "ΧειÏιστήÏιο" msgid "Convert to GCI" msgstr "ΜετατÏοπή σε GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "ΠυÏήνας" @@ -1310,7 +1285,7 @@ msgstr "ΠυÏήνας" msgid "Could not create %s" msgstr "Αποτυχία δημιουÏγίας %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Αποτυχία εκκίνησης backend %s" @@ -1332,12 +1307,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώÏισης του αÏχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1347,7 +1322,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1360,11 +1335,11 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " "Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,17 +1347,17 @@ msgstr "" "Αδυναμία εκκίνησης του πυÏήνα.\n" "Ελέξγτε τις Ïυθμίσεις σας." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "ΧώÏα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" @@ -1391,28 +1366,7 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by KDE-Look.org" -msgstr "ΔημιουÏγήθηκε από KDE-Look.org" - -#: 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:496 -msgid "Created by VistaIcons.com" -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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "ΔημιουÏγός: " @@ -1420,11 +1374,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,12 +1392,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "ΠÏοσαÏμοζόμενο Projection Hack" @@ -1451,52 +1405,52 @@ msgstr "ΠÏοσαÏμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Τσέχικα" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Ψηφιακό Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1509,16 +1463,16 @@ msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" "DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "ΗμεÏομηνία:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "ΑÏχεία Datel MaxDrive/Pro(*.sav)" @@ -1530,11 +1484,11 @@ msgstr "ΑÏχεία Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "ÎεκÏή Ζώνη" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1542,24 +1496,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" @@ -1568,11 +1522,11 @@ msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "ΔιαγÏαφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" @@ -1581,11 +1535,11 @@ msgstr "ΔιαγÏαφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "ΠεÏιγÏαφή" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Ανίχνευση" @@ -1598,13 +1552,13 @@ msgstr "" "Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα " "χωÏάνε μέσα στο buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1628,28 +1582,16 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "ΑπενεÏγοποίηση Υφών" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1663,7 +1605,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1679,17 +1621,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ΑπενεÏγοποίηση υφών.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Δίσκος" @@ -1698,11 +1630,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1716,20 +1648,24 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Ιστοσελίδα του &Dolphin" @@ -1737,32 +1673,32 @@ msgstr "Ιστοσελίδα του &Dolphin" msgid "Dolphin Configuration" msgstr "Ρυθμίσεις Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Ρυθμίσεις Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1770,7 +1706,7 @@ msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1778,16 +1714,21 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Κάτω" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ΜεταφόÏτωση Κωδικών (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν %lu)" @@ -1796,27 +1737,27 @@ msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν msgid "Drums" msgstr "ΤÏμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1827,7 +1768,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1838,7 +1779,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1848,42 +1789,42 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Ολλανδικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι " "τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του " -"Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " +"Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δοÏνε " "τους νέους οδηγοÏÏ‚." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "ΕνημεÏώσεις Μνήμης ÎωÏίς" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "ΕπεξεÏγασία" @@ -1891,7 +1832,7 @@ msgstr "ΕπεξεÏγασία" msgid "Edit ActionReplay Code" msgstr "ΕπεξεÏγασία ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ΕπεξεÏγασία Ρυθμίσεων" @@ -1899,12 +1840,12 @@ msgstr "ΕπεξεÏγασία Ρυθμίσεων" msgid "Edit Patch" msgstr "ΕπεξεÏγασία Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "ΕπεξεÏγασία..." @@ -1912,15 +1853,15 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1935,7 +1876,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1951,19 +1892,19 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Κατάσταση ΛειτουÏγίας:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1979,72 +1920,67 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "ΕνεÏγοποίηση BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "ΕνεÏγοποίηση Bounding Box Υπολογισμών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2059,7 +1995,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2067,11 +2003,11 @@ msgstr "" "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " "(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "ΕνεÏγοποίηση σελίδων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2084,7 +2020,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2096,7 +2032,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2104,21 +2040,28 @@ msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " -"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2130,7 +2073,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2138,7 +2081,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2152,14 +2095,14 @@ msgstr "" msgid "End" msgstr "Τέλος" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2177,17 +2120,17 @@ msgstr "ΕγγÏαφή %d/%d" msgid "Entry 1/%d" msgstr "ΕγγÏαφή 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Ίσο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2230,36 +2173,32 @@ msgstr "" msgid "Execute" msgstr "Εκτέλεση" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Εξαγωγή ΑÏχείου" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Εξαγωγή ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Εξαγωγή ΕγγÏαφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεÏσεων" @@ -2267,15 +2206,15 @@ msgstr "Εξαγωγή όλων των αποθηκεÏσεων" msgid "Export failed, try again?" msgstr "Αποτυχία εξαγωγής, Ï€Ïοσπάθεια ξανά;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Εξαγωγή αποθήκευσης ως..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2287,52 +2226,52 @@ msgstr "Επιπλέον ΠαÏάμετÏος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον ΠαÏάμετÏος είναι χÏήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αÏχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Εξαγωγή ΑÏχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "ΑναπαÏαγωγή FIFO" @@ -2340,7 +2279,7 @@ msgstr "ΑναπαÏαγωγή FIFO" msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2348,15 +2287,15 @@ msgstr "Μέγεθος FST:" msgid "Failed to Connect!" msgstr "Αποτυχία σÏνδεσης!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Αποτυχία ακÏόασης!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2394,17 +2333,25 @@ msgstr "Αποτυχία φόÏτωσης bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Αποτυχία φόÏτωσης hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" -msgstr "Αποτυχία ανάγνωσης " +msgstr "" +"Αποτυχία ανάγνωσης του μπλόκ %d από το αÏχείο αποθήκευσης\n" +"ΜποÏεί να έχουν πεÏικοπεί τα δεδομένα στην κάÏτα μνήμης\n" +"Θέση αÏχείου:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2473,23 +2420,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "ΠεÏσικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "ΓÏήγοÏα Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2497,23 +2440,23 @@ msgstr "" "ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε " "PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "ΑναπαÏαγωγή Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "ΠληÏοφοÏίες ΑÏχείου" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Το αÏχείο δεν πεÏιείχε κωδικοÏÏ‚." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Το αÏχείο μετατÏάπηκε σε .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2530,7 +2473,7 @@ msgstr "" "Το αÏχείο έχει επέκταση \"%s\"\n" "έγκυÏες επεκτάσεις είναι (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Το αÏχείο δεν αναγνωÏίζεται σαν κάÏτα μνήμης" @@ -2543,47 +2486,47 @@ msgstr "Το αÏχείο δεν είναι συμπιεσμένο" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "ΕÏÏεση επομένου" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "ΕÏÏεση Ï€ÏοηγοÏμενου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ΠÏώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2596,7 +2539,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2608,7 +2551,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2631,57 +2574,56 @@ msgstr "" msgid "Forward" msgstr "ΜπÏοστά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "Î’Ïέθηκαν %d αποτελέσματα για '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" -msgstr "ΚαÏέ" +msgstr "ΠληÏοφοÏίες ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "ΕÏÏος ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Γαλλικά" @@ -2689,20 +2631,20 @@ msgstr "Γαλλικά" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Από" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "ΑÏχεία GCI(*.gci)" @@ -2710,57 +2652,61 @@ msgstr "ΑÏχεία GCI(*.gci)" msgid "GCMic Configuration" msgstr "Ρυθμίσεις ΜικÏοφώνου GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID ΠαιχνιδιοÏ:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Το παιχνίδι εκτελείται ήδη!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Το παιχνίδι δεν εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Το παιχνίδι δε βÏέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "GameCube αÏχεία αποθήκευσης(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις ΧειÏιστηÏίου Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" @@ -2777,43 +2723,43 @@ msgstr "" "Δοκιμάστε να χÏησιμοποιήσετε τον εγγενή διαχειÏιστή κώδικα τοποθετώντας το " "codehandler.bin αÏχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Γενικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ΓεÏμανικά" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " "κωδικών ar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "ΓÏαφικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2831,7 +2777,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Ελληνικά" @@ -2851,11 +2797,11 @@ msgstr "Δεξί ΠÏάσινο" msgid "Guitar" msgstr "ΚιθάÏα" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2863,11 +2809,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "ΕβÏαϊκά" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Ύψος" @@ -2875,7 +2821,7 @@ msgstr "Ύψος" msgid "Help" msgstr "Βοήθεια" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2891,15 +2837,15 @@ msgstr "" "\n" "Αντίο!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2914,8 +2860,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2923,28 +2869,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "ΟυγγÏικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ΥβÏιδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2957,31 +2903,31 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Δείκτης IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -2989,11 +2935,11 @@ msgstr "Φάκελοι ISO" msgid "ITALY" msgstr "ΙΤΑΛΙΑ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3001,14 +2947,14 @@ msgstr "" "Εάν επιλεχθεί, οι καταχωÏητές bounding box θα ανανεώνονται. ΧÏησιμοποιοÏνται " "από τα Paper Mario παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3019,11 +2965,11 @@ msgstr "" "διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές " "θόÏυβο αναλόγα με το παιχνίδι)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3037,7 +2983,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3052,7 +2998,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -3060,7 +3006,7 @@ msgstr "Εισαγωγή Αποθήκευσης" msgid "Import failed, try again?" msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3068,11 +3014,11 @@ msgstr "" "Το αÏχείο εισαγωγής έχει επέκταση gsc\n" "αλλά δεν έχει σωστή κεφαλίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Το αÏχείο εισαγωγής έχει μη έγκυÏο μήκος" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3080,7 +3026,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3092,27 +3038,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3120,7 +3055,7 @@ msgstr "ΠληÏοφοÏίες" msgid "Information" msgstr "ΠληÏοφοÏίες" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Είσοδος" @@ -3132,7 +3067,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -3140,11 +3075,11 @@ msgstr "Εισαγωγή ΚάÏτας SD" msgid "Insert name here.." msgstr "Εισάγετε όνομα εδώ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" @@ -3155,42 +3090,44 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "Σφάλμα Ελέγχου ΑκεÏαιότητας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε. Δε βÏέθηκαν σφάλματα." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"Ο έλεγχος ακεÏαιότητας για την κατάτμηση %d απέτυχε. Το αÏχείο έχει " +"πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος Ï„Ïόπο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία συμπίεσης" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3199,19 +3136,19 @@ msgstr "" "ΕσωτεÏικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n" "Δοκιμάστε να φοÏτώσετε ξανά το σημείο αποθήκευσης" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Εισαγωγή" @@ -3220,11 +3157,11 @@ msgstr "Εισαγωγή" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Μη έγκυÏο μέγεθος (%x) ή μαγική λέξη (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Μη έγκυÏη τιμή!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" @@ -3233,7 +3170,7 @@ msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" msgid "Invalid event type %i" msgstr "Μη έγκυÏος Ï„Ïπος συμβάντος %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Μη έγκυÏο αÏχείο" @@ -3248,29 +3185,29 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "Μη έγκυÏες παÏάμετÏοι αναζήτησης (δεν επιλέχθηκε αντικείμενο)" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 +msgid "Invalid search string (couldn't convert to number)" +msgstr "Μη έγκυÏο string αναζήτησης (δεν μποÏεί να γίνει μετατÏοπή σε νοÏμεÏο)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 -msgid "Invalid search string (couldn't convert to number)" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "Μη έγκυÏο string αναζήτησης (μόνο ζυγά μήκη string υποστηÏίζονται)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Ιταλικά" @@ -3278,16 +3215,16 @@ msgstr "Ιταλικά" msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Ιαπωνικά" @@ -3295,29 +3232,27 @@ msgstr "Ιαπωνικά" msgid "KOREA" msgstr "ΚΟΡΕΑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΔιατηÏεί το παÏάθυÏο του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Ï€Î¬Î½Ï‰ από όλα τα υπόλοιπα παÏάθυÏα.\n" "\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "ΔιατήÏηση παÏαθÏÏου στην κοÏυφή." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "ΚοÏεάτικα" @@ -3335,19 +3270,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Γλώσσα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3357,8 +3296,8 @@ msgstr "ΑÏιστεÏά" msgid "Left Stick" msgstr "ΑÏιστεÏÏŒ Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3366,7 +3305,7 @@ msgstr "" "ΑÏιστεÏÏŒ κλίκ για εντοπισμό των πλήκτÏων συντόμευσης.\n" "Πατήστε το πλήκτÏο διαστήματος για καθαÏισμό." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3376,7 +3315,7 @@ msgstr "" "Μεσαίο κλικ για καθάÏισμα.\n" "Δεξί κλικ για πεÏισσότεÏες επιλογές." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3384,76 +3323,76 @@ msgstr "" "ΑÏιστεÏÏŒ/Δεξί κλικ για πεÏισσότεÏες επιλογές.\n" "Μεσαίο κλικ για καθάÏισμα." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3467,36 +3406,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "ΦόÏτωση Ï€Ïοεπιλεγμένων τιμών από διαθέσιμα Ï€Ïότυπα hack." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "ΚαταγÏαφή" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Ρυθμίσεις ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "ΚαταγÏαφή FPS σε αÏχείο" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ΚαταγÏάφει τον αÏιθμό των καÏέ ανά δευτεÏόλεπτο στο αÏχείο User/Logs/fps." +"txt. ΧÏησιμοποιήστε αυτό το χαÏακτηÏιστικό όταν θέλετε να μετÏήσετε την " +"ταχÏτητα του Dolphin.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3504,10 +3452,6 @@ msgstr "ΚαταγÏαφή" msgid "Lost connection to server!" msgstr "Χάθηκε η σÏνδεση με τον διακομιστή!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Î§Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (LLE) ή Ï…ÏˆÎ·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (HLE) εξομοίωση ήχου" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3521,12 +3465,12 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" @@ -3535,33 +3479,33 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "ΚÏÏιο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID ΔημιουÏγοÏ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "ΔημιουÏγός:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Μέγιστη" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Η κάÏτα μνήμης έχει ήδη αποθηκευμένα δεδομένα για τον τίτλο" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3573,7 +3517,7 @@ msgstr "" "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " "χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3600,20 +3544,20 @@ msgstr "" msgid "Menu" msgstr "ΜενοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "ΜικÏόφωνο" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -3622,7 +3566,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3639,16 +3583,16 @@ msgstr "" msgid "Monospaced font" msgstr "Ισοπλατής γÏαμματοσειÏά" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3669,7 +3613,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3677,13 +3621,15 @@ msgstr "" "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " "Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" -msgstr "" +msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" +"ΣΗΜΕΙΩΣΗ: Το μέγεθος της Ïοής δεν ταιÏιάζει με το Ï€Ïαγματικό μήκος των " +"δεδομένων.\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3769,38 +3715,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Όνομα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Όνομα: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ΑÏχεία Native GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Îέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Επόμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Επόμενη Ανίχνευση" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ψευδώνυμο :" @@ -3808,7 +3754,7 @@ msgstr "Ψευδώνυμο :" msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Δε βÏέθηκαν ISO ή WAD" @@ -3817,24 +3763,24 @@ msgstr "Δε βÏέθηκαν ISO ή WAD" msgid "No banner file found for title %s" msgstr "Δε βÏέθηκε αÏχείο εικονιδίου για τον τίτλο %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" -msgstr "" +msgstr "Μη διαθέσιμη πεÏιγÏαφή" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" msgstr "ΑπενεÏγοποίηση του docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Δεν φοÏτώθηκε αÏχείο" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Δεν υπάÏχουν ελεÏθεÏες εγγÏαφές φακέλων" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Κανένα εγγεγÏαμένο αÏχείο" @@ -3843,33 +3789,33 @@ msgstr "Κανένα εγγεγÏαμένο αÏχείο" msgid "No save folder found for title %s" msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον τίτλο %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Μη Συνδεδεμένο" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Σημειώσεις" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Σημειώσεις: " @@ -3878,7 +3824,7 @@ msgstr "Σημειώσεις: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Σημείωση" @@ -3886,28 +3832,28 @@ msgstr "Σημείωση" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Επιτάχυνση Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Αντικείμενο" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "ΑνενεÏγός" @@ -3915,60 +3861,56 @@ msgstr "ΑνενεÏγός" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Άνοιγμα αÏχείου..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: δεν μποÏεί να δημιουÏγηθεί πεÏιεχόμενο για την συσκευή %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Άνοιγμα του debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Άνοιγμα της καταγÏαφής" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Ρυθμίσεις" @@ -3977,7 +3919,7 @@ msgstr "Ρυθμίσεις" msgid "Orange" msgstr "ΠοÏτοκαλί" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3988,8 +3930,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Άλλα" @@ -4001,19 +3943,19 @@ msgstr "" "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Έξοδος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Αναπα&Ïαγωγή ΕγγÏαφής" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "ΧειÏιστήÏιο" @@ -4029,7 +3971,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "ΤαίÏιασμα" @@ -4041,30 +3983,34 @@ msgstr "ΠαÏάγÏαφος" msgid "Parameters" msgstr "ΠαÏάμετÏοι" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "ΠαÏση στο τέλος της ταινίας" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Τέλειο" @@ -4073,36 +4019,36 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "ΑναπαÏαγωγή ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "ΑναπαÏαγωγή/ΠαÏση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Παίζεται" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Ρυθμίσεις ΑναπαÏαγωγής" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4114,54 +4060,54 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ΘÏÏα 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u > %u" @@ -4174,11 +4120,11 @@ msgstr "ΠÏοεπιλογές: " msgid "Prev Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ΠÏοηγοÏμενη Τιμή" @@ -4186,7 +4132,7 @@ msgstr "ΠÏοηγοÏμενη Τιμή" msgid "Print" msgstr "ΕκτÏπωση" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "ΠÏοφίλ" @@ -4194,7 +4140,7 @@ msgstr "ΠÏοφίλ" msgid "Properties" msgstr "Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ΚαθαÏισμός Cache" @@ -4202,8 +4148,8 @@ msgstr "ΚαθαÏισμός Cache" msgid "Question" msgstr "ΕÏώτηση" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Έξοδος" @@ -4221,7 +4167,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4229,46 +4175,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "ΡΩΣΙΑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "ΕÏÏος" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "ΠÏαγματικό" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "ΠÏαγματικό Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "ΠÏαγματικά Wiimotes" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Επιβεβαίωση ΕπανασÏνδεσης Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ΕπανασÏνδεση Wiimote Κατά Την ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "ΠληÏοφοÏίες ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Ρυθμίσεις ΕγγÏαφής" @@ -4284,7 +4230,7 @@ msgstr "ΑÏιστεÏÏŒ Κόκκινο" msgid "Red Right" msgstr "Δεξί Κόκκινο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4298,29 +4244,29 @@ 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Ανανέωση" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4330,17 +4276,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Αποτελέσματα" @@ -4357,7 +4303,7 @@ msgstr "Δεξιά" msgid "Right Stick" msgstr "Δεξί Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Δόνηση" @@ -4366,118 +4312,114 @@ msgstr "Δόνηση" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωÏιστό νήμα (δεν Ï€Ïοτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Ρώσικα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Ασφαλής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Ρυθμός Δειγματοληψίας:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Αποθήκ." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Αποθήκευση GCI ως..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Αποθήκευση Σημείου Αποθήκευσης 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Αποθήκευση Σημείου Αποθήκευσης 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Αποθήκευση Σημείου Αποθήκευσης 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Αποθήκευση Σημείου Αποθήκευσης 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Αποθήκευση Σημείου Αποθήκευσης 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Αποθήκευση Σημείου Αποθήκευσης 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ανίχνευση..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Στιγμιότυπο" @@ -4485,27 +4427,25 @@ msgstr "Στιγμιότυπο" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" -msgstr "Αναζήτηση Cheat" +msgstr "Αναζήτηση" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" -msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" +msgstr "Αναζήτηση Ï„Ïέχων Αντικειμένου" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "Αναζήτηση δεκαεξαδικής Τιμής:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4514,20 +4454,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Επιλογή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4545,23 +4485,23 @@ msgstr "Επιλέξτε ένα αÏχείο αποθήκευσης για ει msgid "Select floating windows" msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4580,11 +4520,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Επιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4601,7 +4546,7 @@ msgstr "" "σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4617,11 +4562,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε το Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Αποστολή" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Θέση Sensor Bar:" @@ -4629,50 +4574,56 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "ΣεÏβικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " "κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ρυθμίσεις..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσεων" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "ΚοÏνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "ΣÏντομο Όνομα:" @@ -4680,105 +4631,105 @@ msgstr "ΣÏντομο Όνομα:" msgid "Shoulder Buttons" msgstr "Κουμπιά Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Εμφάνιση &Κονσόλας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Εμφάνιση ΠαÏαθÏÏου Κατα&γÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Εμφάνιση ΜπάÏας Κατάστασης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Εμφάνιση FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Εμφάνιση Γαλλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Εμφάνιση Ιταλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Εμφάνιση JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Εμφάνιση Ρυθμίσεων &ΚαταγÏαφέα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Εμφάνιση PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Εμφάνιση ΠλατφόÏμας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Εμφάνιση Ταϊβάν" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Εμφάνιση USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Εμφάνιση Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή ενός παιχνιδιοÏ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4787,27 +4738,42 @@ msgstr "" "κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Εμφάνιση μετÏητή καθυστέÏησης " + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"Εμφανίζει μηνÏματα στην πεÏιοχή της εξομοίωσης στην οθόνη.\n" +"Στα μηνÏματα αυτά πεÏιλαμβάνονται εγγÏαφές στην κάÏτα μνήμης, πληÏοφοÏίες " +"σχετικά με την CPU και του βίντεο backend, καθώς και καθαÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î·Ï‚ JIT " +"cache." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4819,15 +4785,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4837,31 +4799,35 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4873,7 +4839,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4890,17 +4856,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Θέση Î’" @@ -4908,7 +4874,7 @@ msgstr "Θέση Î’" msgid "Snapshot" msgstr "Στιγμιότυπο" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Απεικόνιση ΛογισμικοÏ" @@ -4925,11 +4891,11 @@ msgstr "" "Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " "σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Το backend ήχου %s δεν είναι έγκυÏο." @@ -4943,17 +4909,17 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Ισπανικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4974,11 +4940,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Επιλέξτε ένα backend βίντεο" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από τον Δίσκο" @@ -4986,51 +4948,55 @@ msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από το msgid "Square Stick" msgstr "ΤετÏάγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Τυπικός Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Εκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Εκκίνηση ΛειτουÏγίας &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Εκκίνηση Ε&γγÏαφής" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Εκκίνηση ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Λειτ." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Σημεία Αποθήκευσης" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5044,7 +5010,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5065,12 +5031,12 @@ msgstr "Επιτυχής εξαγωγή αÏχείου στο %s" msgid "Successfully imported save files" msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -5078,7 +5044,7 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5099,30 +5065,30 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Υφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5138,13 +5104,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5167,7 +5133,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Το αÏχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αÏχείου δε θα γÏαφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -5185,7 +5151,7 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5197,12 +5163,12 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεξιότεÏη τιμή." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5235,15 +5201,12 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5251,7 +5214,7 @@ msgstr "" "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " "πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5260,7 +5223,7 @@ msgstr "" "Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " "του Dolphin. " -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5268,16 +5231,18 @@ msgstr "" "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5294,7 +5259,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5306,7 +5271,7 @@ msgstr "" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" @@ -5316,40 +5281,40 @@ msgstr "" msgid "Threshold" msgstr "Κατώφλι" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Πλάγιασμα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Τίτλος" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Εώς" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5369,7 +5334,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "ΤουÏκικά" @@ -5381,12 +5346,12 @@ msgstr "Πικάπ" msgid "Type" msgstr "ΤÏπος" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5394,10 +5359,10 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#, c-format msgid "UNKNOWN_%02X" -msgstr "ΑΓÎΩΣΤΟ" +msgstr "ΑΓÎΩΣΤΟ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5423,24 +5388,24 @@ msgstr "" "τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Μη οÏισμένο %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Άγνωστο" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Άγνωστη εντολή DVD %08x - κÏίσιμο σφάλμα" @@ -5465,32 +5430,32 @@ msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκ msgid "Up" msgstr "Πάνω" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "ΕνημέÏωση" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5503,7 +5468,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5511,22 +5476,22 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα " +"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μήνυμα " "σφάλματος.\n" "ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε " "gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Τιμή" @@ -5534,23 +5499,23 @@ msgstr "Τιμή" msgid "Value:" msgstr "Τιμή:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Τιμή: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Ένταση" @@ -5564,7 +5529,7 @@ msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά Ï„ msgid "WAD installation failed: error creating ticket" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουÏγία του εισιτηÏίου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5578,16 +5543,16 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" @@ -5607,7 +5572,7 @@ msgstr "" "%s\n" "Θέλετε να συνεχίσετε;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5621,7 +5586,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5633,7 +5598,7 @@ msgstr "" "φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων " "με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5646,7 +5611,7 @@ msgstr "" "την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " "ασυγχÏονισμός." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5682,7 +5647,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." @@ -5690,31 +5655,31 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5722,17 +5687,17 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5745,19 +5710,19 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "ÎœÎ¿Ï„Î­Ï Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5777,26 +5742,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Σε εÏγασία..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "ΕγγÏαφή στην Κονσόλα" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "ΕγγÏαφή στον Debugger" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "ΕγγÏαφή σε ΑÏχείο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "ΕγγÏαφή στο ΠαÏάθυÏο" @@ -5815,9 +5780,9 @@ msgstr "Αποτυχία αÏχικοποίησης XAudio2: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Αποτυχία δημιουÏγίας κεντÏικής φωνής XAudio2: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5835,23 +5800,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Δεν μποÏείτε να κλείσετε pane που έχουν σελίδες." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "ΠÏέπει να επιλέξετε ένα παιχνίδι!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "ΠÏέπει να εισάγετε ένα όνομα!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική ή δεκαεξαδική τιμή." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -5875,25 +5840,25 @@ msgstr "" "Θα έπÏεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουÏγηθεί ένα καινοÏÏιο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Δεν υποστηÏίζεται ο Zero 3 code" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Άγνωστος Zero code: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5909,7 +5874,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5928,7 +5893,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5942,11 +5907,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5963,7 +5928,7 @@ msgstr "αποτυχία ανάγνωσης δεδομένων από το Î±Ï msgid "failed to read header" msgstr "αποτυχία ανάγνωσης κεφαλίδας" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το αναφέÏετε." @@ -5975,7 +5940,7 @@ msgstr "" "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " "μεγέθους %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "." @@ -5984,7 +5949,7 @@ msgstr "." msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -5996,10 +5961,40 @@ msgstr "zFar ΔιόÏθωση: " msgid "zNear Correction: " msgstr "zNear ΔιόÏθωση: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα " +#~ "στις υφές.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" +#~ "Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " +#~ "υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή " +#~ "εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -6007,12 +6002,103 @@ msgstr "| OR" #~ msgid "Clear failed." #~ msgstr "Το καθάÏισμα απέτυχε." +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl." +#~ "deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " +#~ "Developments" + +#~ msgid "Disable Lighting" +#~ msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" + +#~ msgid "Disable Textures" +#~ msgstr "ΑπενεÏγοποίηση Υφών" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ΑπενεÏγοποίηση υφών.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + #~ msgid "Enable Audio Throttle" #~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" +#~ msgid "Enable BAT" +#~ msgstr "ΕνεÏγοποίηση BAT" + #~ msgid "Enable DTK Music" #~ msgstr "ΕνεÏγοποίηση Μουσικής DTK" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της " +#~ "Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην " +#~ "εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" + +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" + +#~ msgid "Fast Mipmaps" +#~ msgstr "ΓÏήγοÏα Mipmaps" + +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +#~ "πεÏισσότεÏα παιχνίδια.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Î§Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (LLE) ή Ï…ÏˆÎ·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (HLE) εξομοίωση ήχου" + +#~ msgid "Opens the debugger" +#~ msgstr "Άνοιγμα του debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Άνοιγμα της καταγÏαφής" + +#~ msgid "Sample Rate:" +#~ msgstr "Ρυθμός Δειγματοληψίας:" + +#~ msgid "Show this help message" +#~ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" + +#~ msgid "Specify a video backend" +#~ msgstr "Επιλέξτε ένα backend βίντεο" + +#~ msgid "Theme selection went wrong" +#~ msgstr "Η επιλογή θέματος απέτυχε" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/en.po b/Languages/po/en.po index a68862971a..3eee66bee4 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -52,14 +52,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -139,156 +132,156 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -304,27 +297,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -332,44 +325,45 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -388,13 +382,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -402,19 +396,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -423,8 +417,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -438,42 +432,43 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -481,27 +476,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -510,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -522,13 +517,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -554,68 +549,72 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -627,42 +626,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -670,12 +669,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -683,43 +682,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -727,16 +718,16 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -749,16 +740,16 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -766,11 +757,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -782,7 +773,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -798,47 +789,53 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -850,29 +847,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -881,7 +868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -897,7 +884,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -905,24 +892,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -930,28 +917,28 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" @@ -970,11 +957,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -982,47 +968,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1030,14 +1016,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1051,8 +1037,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1062,22 +1048,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1085,95 +1071,95 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1189,16 +1175,16 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1207,7 +1193,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1225,18 +1211,18 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1245,27 +1231,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1274,24 +1260,7 @@ msgstr "" 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:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1299,11 +1268,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1314,12 +1283,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1327,15 +1296,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1343,36 +1312,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1384,16 +1353,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1405,11 +1374,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1417,24 +1386,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1443,11 +1412,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1456,11 +1425,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1471,13 +1440,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1499,28 +1468,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1529,7 +1486,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1539,14 +1496,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1555,11 +1505,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1570,20 +1520,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1591,53 +1545,58 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1646,65 +1605,65 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1714,11 +1673,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1726,7 +1685,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1734,12 +1693,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1747,15 +1706,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1764,7 +1723,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1774,19 +1733,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1796,72 +1755,67 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1870,17 +1824,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1888,7 +1842,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1896,24 +1850,34 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1921,13 +1885,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1938,14 +1902,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1963,17 +1927,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2008,36 +1972,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2045,15 +2005,15 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2065,52 +2025,52 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2118,7 +2078,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2126,15 +2086,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2162,6 +2122,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2231,45 +2196,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2282,7 +2243,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2295,47 +2256,47 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2343,7 +2304,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2351,7 +2312,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2368,56 +2329,56 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2425,20 +2386,20 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2446,57 +2407,61 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2509,41 +2474,41 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2554,7 +2519,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2574,11 +2539,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2586,11 +2551,11 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2598,7 +2563,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2608,15 +2573,15 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2627,8 +2592,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2636,26 +2601,26 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2664,31 +2629,31 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2696,33 +2661,33 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2731,7 +2696,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2740,7 +2705,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2748,23 +2713,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2772,23 +2737,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2796,7 +2754,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2808,7 +2766,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2816,11 +2774,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2829,61 +2787,61 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2892,11 +2850,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2905,7 +2863,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2917,29 +2875,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2947,16 +2905,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2964,24 +2922,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -2999,19 +2957,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3021,96 +2983,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3121,36 +3083,40 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3158,10 +3124,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3173,12 +3135,12 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3187,33 +3149,33 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3223,7 +3185,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3242,20 +3204,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3264,7 +3226,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3276,16 +3238,16 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3300,17 +3262,17 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3398,38 +3360,38 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3437,7 +3399,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3446,8 +3408,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3455,15 +3417,15 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3472,33 +3434,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3507,7 +3469,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3515,28 +3477,28 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3544,60 +3506,56 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3606,15 +3564,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3624,19 +3582,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3652,7 +3610,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3664,30 +3622,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3696,36 +3658,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3737,54 +3699,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3797,11 +3759,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3809,7 +3771,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3817,7 +3779,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3825,8 +3787,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3844,7 +3806,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3852,46 +3814,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3907,7 +3869,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3916,46 +3878,46 @@ msgid "" "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 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3972,7 +3934,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -3981,116 +3943,112 @@ msgstr "" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4098,23 +4056,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4125,20 +4083,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4153,23 +4111,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4180,11 +4138,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4194,7 +4156,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4204,11 +4166,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4216,46 +4178,52 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4263,130 +4231,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4394,46 +4373,46 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4441,7 +4420,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4451,17 +4430,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4469,7 +4448,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4481,11 +4460,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4499,17 +4478,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4521,11 +4500,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4533,51 +4508,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4586,7 +4565,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4607,12 +4586,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4620,7 +4599,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4641,30 +4620,30 @@ msgstr "" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4680,13 +4659,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4705,7 +4684,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4722,7 +4701,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4730,11 +4709,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4765,40 +4744,37 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4806,7 +4782,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4814,7 +4790,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4823,40 +4799,40 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4874,7 +4850,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4886,12 +4862,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4899,7 +4875,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4922,24 +4898,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4964,32 +4940,32 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4997,7 +4973,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5006,15 +4982,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5022,23 +4998,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5052,7 +5028,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5061,16 +5037,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5086,7 +5062,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5095,7 +5071,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5103,7 +5079,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5111,7 +5087,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5131,7 +5107,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5139,31 +5115,31 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5171,17 +5147,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5190,19 +5166,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5222,26 +5198,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5260,7 +5236,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5278,23 +5254,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5312,25 +5288,25 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5342,7 +5318,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5353,7 +5329,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5362,11 +5338,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5383,7 +5359,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5393,7 +5369,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5402,7 +5378,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5414,6 +5390,6 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 6cb5a3a8dc..caf94af502 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,27 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-07 14:20+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-21 23:41+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Spanish\n" +"X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Juego:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NO" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,17 +55,10 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" -msgstr "%i conectado." +msgstr "%i conectado" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -154,156 +147,156 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Y" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Acerca de..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Iniciar desde unidad de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Puntos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Buscar ISO en..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Administrador de &trucos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Archivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Avanzar &frame" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Configuración gráfica" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ayuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Configuración de atajos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Cargar estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Administrador de tarjetas de memoria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opciones" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo de solo lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Sonido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Detener" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Herramientas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Vista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -319,27 +312,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONOCIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(off)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "Visión 3D" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -347,46 +340,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "¡¡Una ventana de NetPlay ya está abierta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Ningún juego está emulándose actualmente." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "¡No se ha podido encontrar un dispositivo de Bluetooth soportado!\n" -"(Solo se soporta el stack de Bluetooth de Microsoft)." +"Si no estás usando el stack de Microsoft tendrás que emparejarlos " +"manualmente y usar solo el botón \"Refrescar\"." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -421,13 +416,13 @@ msgstr "" "\n" "¡¡Debes redireccionar el puerto TCP para alojar!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Placa base AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -435,19 +430,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Acerca de Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Exactitud:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -461,8 +456,8 @@ msgstr "" "\n" "Si no estás seguro, elige EFB a textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acción" @@ -481,7 +476,7 @@ msgstr "" "Código culpable:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -489,7 +484,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Añadido de código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -498,7 +493,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Fill " "and Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -507,7 +502,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "escritura y llenado de RAM (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -516,46 +511,48 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Escribir con el puntero (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" -"Error de Action Replay: Código maestro y Escribir a CCXXXXXX no han sido " -"implementados (%s)" +"Error de Action Replay: Código Maestro y Escribir a CCXXXXXX no han sido " +"implementados (%s)\n" +"Los códigos maestros no son necesarios. No los uses." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error de Action Replay: Línea de código AR no válida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Error de Action Replay: Tipo de Código Normal no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código Normal %i: Subtipo no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo no válido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -564,11 +561,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Añadir parche" @@ -576,13 +573,13 @@ msgstr "Añadir parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Añadir..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Dirección:" @@ -622,75 +619,78 @@ msgstr "" "\n" "NOTA: Consulta LogWindow/Consola para ver los valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajusta la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configuración avanzada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, ciso, wad)" +msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "Todas las imágenes de GC/Wii (gcm, iso, ciso, gcz)" +msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) 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" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro anisotrópico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Antialias:" @@ -702,15 +702,15 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -720,16 +720,16 @@ msgstr "" "\n" "Si no estás seguro, selecciona (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -737,12 +737,12 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -750,37 +750,37 @@ msgstr "Relación de aspecto:" msgid "At least one pane must remain open." msgstr "Al menos una ventana debe permancer abierta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" -msgstr "Motor de Audio:" +msgstr "Motor de audio:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (tamaño de ventana)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -788,26 +788,13 @@ msgid "" msgstr "" "Ajusta automáticamente el tamaño de la ventana a tu resolución interna.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Generación automática de mipmaps en lugar de decodificación de la memoria.\n" -"Aumenta el rendimiento un poco, pero puede causar defectos de menor " -"importancia en la textura. \n" -"\n" -"Si no estás seguro, déjalo marcado." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registro BP" @@ -815,16 +802,16 @@ msgstr "Registro BP" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configuración del motor" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Motor:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Detectar entrada sin foco" @@ -837,16 +824,16 @@ msgstr "Atrás" msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalles de la imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Imagen:" @@ -854,11 +841,11 @@ msgstr "Imagen:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configuración básica" @@ -868,9 +855,9 @@ msgstr "Bajo" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "La suma de verificación de la Tabla de Localización de Bloques falló" +msgstr "La suma de verificación de la tabla de localización de bloques falló" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloques" @@ -886,47 +873,53 @@ msgstr "Azul izquierda" msgid "Blue Right" msgstr "Azul derecha" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Inferior" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Busca un directorio de salida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Búfer" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -938,36 +931,19 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "Registro CP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcular los valores de profundidad de los gráficos 3D por píxel en lugar de " -"por vértice.\n" -"En contraste con la iluminación de píxeles (que no es más que una mejora), " -"los cálculos por profundidad de píxel son necesarios para emular " -"correctamente un pequeño número de juegos.\n" -"\n" -"Si no estás seguro, deja esta marcada." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -984,7 +960,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -1000,7 +976,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1011,7 +987,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1019,18 +995,18 @@ msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" "¿Estás intentando usar el mismo archivo en ambas ranuras?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el título de conexión %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" @@ -1038,28 +1014,28 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalán" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Cambiar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Cambiar &disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Cambiar disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Cambiar juego" @@ -1080,12 +1056,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia el signo del parámetro zNear (después de la corrección)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1093,47 +1068,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Código de truco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Buscar trucos" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Comprobar integridad de la partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Comprobando integridad..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1141,7 +1116,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1149,8 +1124,8 @@ msgstr "" "Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1164,8 +1139,8 @@ msgstr "Clásico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpiar" @@ -1177,22 +1152,22 @@ msgstr "" "¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay " "ha sido deshabilitado. Debe detener el juego manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Cerrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Información del código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1200,95 +1175,95 @@ msgstr "Código:" msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimiendo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configuración" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar mandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Conectando..." @@ -1304,16 +1279,16 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Núcleo" @@ -1322,7 +1297,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "No se pudo crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "No se pudo inicializar el motor %s." @@ -1343,12 +1318,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1358,7 +1333,7 @@ msgstr "" "(definir los pads mientras el juego está ejecutándose no está permitido " "todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1368,14 +1343,14 @@ msgid "" msgstr "" "No se pudo escribir el archivo de tarjeta de memoria %s.\n" "\n" -"¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " +"¿Estás ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" -msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" +msgstr "No se pudo encontrar el comando para abrir la extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1383,17 +1358,17 @@ msgstr "" "No se pudo iniciar el núcleo.\n" "Revisa tu configuración." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crear Código AR" @@ -1402,56 +1377,38 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Creado por VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creador:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "Critico" +msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Recortar la imagen de 4:3 a 5:4 o desde 16:9 a 16:10.\n" +"Recorta la imagen de 4:3 a 5:4 o desde 16:9 a 16:10.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" msgstr "Fundido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1459,15 +1416,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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1475,36 +1432,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad direccional" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1516,16 +1473,16 @@ msgstr "DVDLowRead - Error fatal: fallo al leer del volumen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Fecha:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Archivos Datel MaxDrive/Pro(*.sav)" @@ -1537,36 +1494,36 @@ msgstr "Archivos Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Zona muerta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" -msgstr "Depurarando" +msgstr "Depuración" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:79 msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." -msgstr "Descomprimir ISOs seleccionadas..." +msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimir ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Predeterminado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1575,11 +1532,11 @@ msgid "Default font" msgstr "Fuente por defecto" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Borrar guardado" @@ -1588,11 +1545,11 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descripción" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1605,13 +1562,13 @@ msgstr "" "Se detectó un intento de leer más datos del DVD de los que entran en el " "búfer. Truncando." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1635,28 +1592,16 @@ msgstr "" "Falló la suma de verificación del directorio\n" " y falló la suma de verificación del directorio backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deshabilitar iluminación" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Desactivar profundidad por píxel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deshabilitar texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1671,7 +1616,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1680,24 +1625,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Desactivar emulación de copias EFB.\n" +"Desactiva la emulación de copias EFB.\n" "Se usan a menudo para el posprocesado o efectos de renderización a textura, " "así que activando esta opción se obtiene una gran mejora, pero casi siempre " "causará problemas.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar texturas.\n" -"\n" -"Si no estás seguro, déjalo sin marcar." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1706,38 +1641,42 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Error de lectura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Mostrar las entradas que lee el emulador.\n" +"Muestra las entradas que lee el emulador.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:80 msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "Decodificador Dolby Pro Logic II" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuración gráfica %s de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Website de Dolphin" @@ -1745,32 +1684,32 @@ msgstr "&Website de Dolphin" msgid "Dolphin Configuration" msgstr "Configuración de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuración de wiimote emulado de Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuración de wiimote de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1778,7 +1717,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1786,16 +1725,21 @@ msgstr "" "Dolphin está configurado actualmente para esconder todos los juegos. Haz " "doble clic aquí para mostrarlos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "Dolphin no ha podido completar la acción solicitada." + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Abajo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Descargar códigos (base de datos de WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Se descargaron %lu códigos. (%lu añadidos)" @@ -1804,27 +1748,27 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Volcar texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1834,7 +1778,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1844,7 +1788,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1854,42 +1798,42 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Salir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Copias de EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" "ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por " -"lo menos de versión %d.%d. Si actualizaste recientemente tu distribución de " -"Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " -"controlador." +"lo menos de versión %d.%d -- Si actualizaste recientemente tu distribución " +"de Dolphin, puede que se necesite reiniciar para que Windows reconozca el " +"nuevo controlador." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualización frecuente de memoria " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1897,7 +1841,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar configuración" @@ -1905,12 +1849,12 @@ msgstr "Editar configuración" msgid "Edit Patch" msgstr "Editar parche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1918,15 +1862,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efecto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Búfer de fotogramas embebido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "El proceso de emulación ya está ejecutándose" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1941,7 +1885,7 @@ msgstr "" "\n" "Si no estás seguro, activa Emulación virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1957,19 +1901,19 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado de emulación:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1985,72 +1929,67 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Habilitar BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Habilitar caché" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Habilitar atajos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2064,7 +2003,7 @@ msgstr "" "\n" "Si no estás seguro, elige 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2072,36 +2011,36 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Habilitar páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Habilitar esta opción si desea que se use la pantalla completa para la " +"Habilita esta opción si deseas que se use la pantalla completa para la " "representación.\n" "Si esto es desactivado, una ventana de renderizado se creará en su lugar.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Active esto si quiere usar la ventana principal de Dolphin para renderizar " +"Activa esto si quieres usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2109,21 +2048,32 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"Activa la emulación de Dolby Pro Logic II usando 5.1 surround. No disponible " +"en OSX." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL. " +"Requiere que renombres soft_oal.dll a OpenAl32.dll para que funcione." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2133,9 +2083,9 @@ msgstr "" "Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2143,7 +2093,7 @@ msgstr "" "Habilita la Unidad de Manejo de Memoria(MMU), necesario para algunos juegos. " "(ON = Compatible, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2157,14 +2107,14 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Mejoras" @@ -2182,17 +2132,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al predeterminado del " @@ -2233,36 +2183,32 @@ msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx" msgid "Execute" msgstr "Ejecutar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Cerrar Dolphin con el emulador" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar archivo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado a uno de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2270,15 +2216,15 @@ msgstr "Exportar todos los guardados" msgid "Export failed, try again?" msgstr "Fallo al exportar. ¿Intentar de nuevo?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar guardado como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2288,54 +2234,54 @@ msgstr "Parámetro extra" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "Parámetro extra solo útil en ''Metroid: Other M''." +msgstr "Parámetro extra útil en «Metroid: Other M» exclusivamente." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extraer partición..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extrayendo directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrayendo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte de FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2343,7 +2289,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2351,15 +2297,15 @@ msgstr "Tamaño del FST:" msgid "Failed to Connect!" msgstr "¡Fallo al conectar!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "¡Fallo al escuchar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Fallo al extraer a %s!" @@ -2395,12 +2341,17 @@ msgstr "Fallo al cargar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Fallo al cargar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fallo al escribir la cabecera para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Fallo al leer banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2477,23 +2428,19 @@ msgstr "Fallo al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Fallo al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Iraní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rápidos" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2501,23 +2448,23 @@ msgstr "" "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !" "= %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Jugador Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Información del fichero" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "El archivo no contenía códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Archivo convertido a .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2534,7 +2481,7 @@ msgstr "" "El archivo tiene la extensión \"%s\"\n" "Extensiones válidas son (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "El archivo no es reconocido como una tarjeta de memoria" @@ -2547,47 +2494,47 @@ msgstr "Archivo sin comprimir" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Encontrar siguiente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Encontrar anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forzar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forzar filtrado de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2601,7 +2548,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2614,7 +2561,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2636,56 +2583,56 @@ msgstr "" msgid "Forward" msgstr "Adelante" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "%d coincidencias para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Frame " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Info del frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Límite de fotogramas:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Cámara libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francés" @@ -2693,20 +2640,20 @@ msgstr "Francés" msgid "Frets" msgstr "Cuerdas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Desde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Pant. compl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolución en pantalla completa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" @@ -2714,57 +2661,61 @@ msgstr "Archivo GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuración del micro de GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID del juego:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "¡El juego ya está ejecutándose!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "¡El juego no está ejecutándose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2781,42 +2732,42 @@ msgstr "" "usando el controlador de código nativo colocando el fichero codehandler.bin " "en el directorio Sys y reiniciando Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "General" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ajustes generales" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemán" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: El índice es mayor que el tamaño de la lista de códigos AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configuración gráfica" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Mayor que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2834,7 +2785,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Griego" @@ -2854,11 +2805,11 @@ msgstr "Verde derecha" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ha sido llamada; ¡por favor, comunícalo!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2866,11 +2817,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreo" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2878,7 +2829,7 @@ msgstr "Altura" msgid "Help" msgstr "Ayuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2894,15 +2845,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2917,8 +2868,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hostear" @@ -2926,28 +2877,28 @@ msgstr "Hostear" msgid "Hotkey Configuration" msgstr "Configuración de atajos" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Se trató de obtener los datos de un ticket desconocido: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2960,31 +2911,31 @@ msgstr "" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Configuración IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Puntero IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -2992,11 +2943,11 @@ msgstr "Directorios de ISO" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3004,14 +2955,14 @@ msgstr "" "Si se elige, los registros del cuadro delimitador serán actualizados. Es " "usado por los juegos de Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3022,11 +2973,11 @@ msgstr "" "DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero " "puede causar ruido constante dependiendo del juego)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar cambios de formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3040,7 +2991,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3054,7 +3005,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Guardado" @@ -3062,7 +3013,7 @@ msgstr "Importar Guardado" msgid "Import failed, try again?" msgstr "Fallo al importar. ¿Probar otra vez?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3070,11 +3021,11 @@ msgstr "" "El archivo importado tiene una extensión .gsc,\n" "pero no tiene la cabecera correcta." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "El archivo importado tiene una longitud no válida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3082,7 +3033,7 @@ msgstr "" "El archivo importado tiene extensión .sav,\n" "pero no tiene la cabecera correcta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3094,27 +3045,16 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Mejora el rendimiento, pero causa que desaparezca la iluminación en juegos " -"que la utilicen.\n" -"\n" -"Si no estás seguro, déjala sin marcar." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Información" @@ -3122,7 +3062,7 @@ msgstr "Información" msgid "Information" msgstr "Información" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3134,7 +3074,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3142,11 +3082,11 @@ msgstr "Insertar tarjeta SD" msgid "Insert name here.." msgstr "Insertar un nombre aquí.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3157,23 +3097,23 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Error de comprobación de la integridad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Comprobación de la integridad finalizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Comprobación de la integridad finalizada. No se encontraron errores." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3182,19 +3122,19 @@ msgstr "" "Falló la comprobación de la integridad para la partición %d. Tu volcado está " "probablemente corrupto o ha sido parcheado incorrectamente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Configuración de la interfaz" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Error Interno de LZO - Fallo al comprimir" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3203,19 +3143,19 @@ msgstr "" "Error Interno de LZO - fallo al descomprimir (%d) (%li, %li) \n" "Tratando de cargar el estado de nuevo" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error Interno de LZO - lzo_init() falló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3224,11 +3164,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamaño no válido(%x) o Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "¡Valor no válido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" @@ -3237,7 +3177,7 @@ msgstr "bat.map o entrada de directorio no válido" msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Archivo no válido" @@ -3252,29 +3192,29 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "Parametros de búsqueda inválidos (ningun objeto seleccionado)" +msgstr "Parámetros de búsqueda inválidos (ningún objeto seleccionado)" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 +msgid "Invalid search string (couldn't convert to number)" +msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 -msgid "Invalid search string (couldn't convert to number)" -msgstr "Cadena de búsqueda incorrecta(no se pudo convertir en un número)" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 msgid "Invalid search string (only even string lengths supported)" msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado no válido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3282,16 +3222,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonés" @@ -3299,7 +3239,7 @@ msgstr "Japonés" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3309,17 +3249,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Mantener la ventana siempre visible" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3337,19 +3277,23 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último estado sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último estado guardado" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "Latencia:" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3359,8 +3303,8 @@ msgstr "Izquierda" msgid "Left Stick" msgstr "Stick izquierdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3368,7 +3312,7 @@ msgstr "" "Clic izquierdo para detectar atajos.\n" "Introduce espacio para limpiar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3378,7 +3322,7 @@ msgstr "" "Clic medio para borrar.\n" "Clic der. para más opciones." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3386,76 +3330,76 @@ msgstr "" "Clic izq./der. para más opciones.\n" "Clic medio para borrar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Usar FPS para limitar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "&Cargar estado 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "&Cargar estado 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "&Cargar estado 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "&Cargar estado 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "&Cargar estado 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "&Cargar estado 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "&Cargar estado 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "&Cargar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3469,36 +3413,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Cargar valores ya definidos de los patrones de hack disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Fijar procesos en núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Registrar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuración de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "Escribir FPS en un fichero" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipos de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Registrar el número de fotogramas renderizados por segundo a User/Logs/fps." +"txt. Usa esta característica cuando quieras medir el rendimiento de " +"Dolphin.\n" +"\n" +"Si no estás seguro, déjala sin marcar." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Salida de registro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Registrando" @@ -3506,10 +3459,6 @@ msgstr "Registrando" msgid "Lost connection to server!" msgstr "¡Se perdió la conexión con el servidor!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Especifica emulación de audio de bajo nivel (LLE) o alto nivel (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botón M" @@ -3523,12 +3472,12 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" @@ -3537,33 +3486,33 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Máx." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La tarjeta de memoria ya tiene un guardado para este juego" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "La tarjeta de memoria ya está abierta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3575,7 +3524,7 @@ msgstr "" "Administrador de tarjetas de memoria. ADVERTENCIA: Haga copias antes de " "usarlo; debería estar arreglado, ¡pero puede que estropee cosas!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3602,20 +3551,20 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3624,7 +3573,7 @@ msgstr "Configuraciones varias" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3640,16 +3589,16 @@ msgstr "" msgid "Monospaced font" msgstr "Fuente monoespaciada" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3659,7 +3608,7 @@ msgid "" "\n" "\n" msgstr "" -"Mueva el puntero del ratón sobre una opción para obtener una descripción " +"Mueve el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" "\n" "\n" @@ -3672,7 +3621,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3680,11 +3629,11 @@ msgstr "" "Silencia el altavoz del Wiimote. Arregla las desconexiones aleatorias en " "wiimotes reales. No tiene ningún efecto en wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "NOTA: El tamaño del flujo no coincide con la longitud actual de los datos\n" @@ -3773,38 +3722,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nombre:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nombre:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Archivos nativos GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próximo escaneado" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Apodo:" @@ -3812,7 +3761,7 @@ msgstr "Apodo:" msgid "No Country (SDK)" msgstr "Ningún país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Ninguna ISO o WAD ha sido encontrada." @@ -3821,8 +3770,8 @@ msgstr "Ninguna ISO o WAD ha sido encontrada." msgid "No banner file found for title %s" msgstr "No se encontró un archivo de banner para el juego %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Sin descripción" @@ -3830,15 +3779,15 @@ msgstr "Sin descripción" msgid "No docking" msgstr "Sin uniones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "No se ha cargado ningún fichero" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "No hay entradas de índice de directorio libres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "No hay grabaciones guardadas" @@ -3847,33 +3796,33 @@ msgstr "No hay grabaciones guardadas" msgid "No save folder found for title %s" msgstr "No se encontró carpeta de guardado para el juego %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "No definido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Sin conectar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3882,7 +3831,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Aviso" @@ -3890,28 +3839,28 @@ msgstr "Aviso" msgid "Num Lock" msgstr "Bloq Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Número de códigos:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleración del nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Off" @@ -3919,60 +3868,56 @@ msgstr "Off" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "Mensajes en pantalla" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Solo %d bloques disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir archivo..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: no se puede crear el contexto para el dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: no se encuentran dispositivos de sonido" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: no se puede abrir el dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abre el depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abre el registro" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opciones" @@ -3981,7 +3926,7 @@ msgstr "Opciones" msgid "Orange" msgstr "Naranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3992,8 +3937,8 @@ msgstr "" "Haz clic derecho y exporta todos los guardados,\n" "e impórtalos a una nueva tarjeta de memoria\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Otros" @@ -4005,19 +3950,19 @@ msgstr "" "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " "NetPlay ha sido deshabilitado. Debes detener el juego manualmente." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Salida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Reproducir grabación" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad" @@ -4033,7 +3978,7 @@ msgstr "Pág. abajo" msgid "Page Up" msgstr "Pág. arriba" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Emparejar" @@ -4045,30 +3990,34 @@ msgstr "Párrafo" msgid "Parameters" msgstr "Parámetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Pausar al acabar la película" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfecto" @@ -4077,36 +4026,36 @@ msgstr "Perfecto" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Reproducir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproducir grabación" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opciones de reproducción" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4118,54 +4067,54 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Puerto 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematuro de la película en PlayWiimote. %u > %u" @@ -4178,11 +4127,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4190,7 +4139,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4198,7 +4147,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpiar caché" @@ -4206,8 +4155,8 @@ msgstr "Limpiar caché" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Salir" @@ -4225,7 +4174,7 @@ msgstr "R Botón" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4233,46 +4182,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rango" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimotes reales" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar reconectar Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote al cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Grabar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opciones de grabación" @@ -4288,7 +4237,7 @@ msgstr "Rojo izquierda" msgid "Red Right" msgstr "Rojo derecha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4302,29 +4251,29 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualizar lista de juegos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4334,17 +4283,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar a ventana principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4361,7 +4310,7 @@ msgstr "Derecha" msgid "Right Stick" msgstr "Stick Derecho" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibración" @@ -4370,118 +4319,114 @@ msgstr "Vibración" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Arranca DSPLLE en un proceso dedicado (no recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Ruso" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Frecuencia del sonido:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Guardar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Guardar estado 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Guardar estado 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Guardar estado 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Guardar estado 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Guardar estado 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Guardar estado 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Guardar estado 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Guardar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "El estado guardado de la película %s está corrupto, deteniendo la " "grabación..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Pantallazo" @@ -4489,25 +4434,25 @@ msgstr "Pantallazo" msgid "Scroll Lock" msgstr "Bloq. desplazamiento" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Buscar objeto actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "Busdar valor hexadecimal:" +msgstr "Buscar valor hexadecimal:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4516,20 +4461,20 @@ msgid "Section %s not found in SYSCONF" msgstr "No se ha encontrado la sección %s en SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4547,23 +4492,23 @@ msgstr "Selecciona un archivo de guardado para importar" msgid "Select floating windows" msgstr "Selecciona las ventanas flotantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4581,11 +4526,15 @@ msgstr "" "\n" "Si no estás seguro, elige Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "El perfil del controlador escogido no existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Fuente seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4602,7 +4551,7 @@ msgstr "" "Si no estás seguro, elige la resolución que uses en el escritorio.\n" "Si sigues inseguro, elige la mayor resolución que te funcione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4618,11 +4567,11 @@ msgstr "" "\n" "Si no estás seguro, usa Direct3D9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posición de la barra sensora:" @@ -4630,50 +4579,58 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Puerto serie 1 - Este es el puerto que dispositivos como el adaptador de red " "usan." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"Ajusta la latencia (en ms). Valores más altos pueden recir el petardeo del " +"audio. Solo para el motor OpenAL." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configuración..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nombre corto:" @@ -4681,134 +4638,148 @@ msgstr "Nombre corto:" msgid "Shoulder Buttons" msgstr "Botones laterales" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar barra de e&stado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar barra de herramien&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar configuración de ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostar estadísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwán" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar una ventana de confirmación antes de detener un juego." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"Mostrar un mensaje cuando un posible error severo ha ocurrido.\n" -"Deshabilitar esto puede evitar ver mensajes que no son fatales, y molestos, " +"Muestra una alerta cuando un posible error crítico haya ocurrido.\n" +"Deshabilitando esto puedes evitar ver mensajes molestos que no son fatales, " "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Mostrar contador de lag" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"Mostrar mensajes en el área de emulación. Estos mensajes incluyen escritura " +"de tarjetas de memoria,sobre el motor de vídeo,información sobre la CPU y " +"limpieza de la cache JIT." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar título del guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4820,15 +4791,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostrar este mensaje de ayuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconocido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4838,31 +4805,35 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4874,7 +4845,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4891,17 +4862,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ranura B" @@ -4909,7 +4880,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Instántanea" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizado por software" @@ -4925,11 +4896,11 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si no estás seguro, " "elige No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configuración de sonido" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "El motor de sonido %s no es válido." @@ -4943,17 +4914,17 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Español" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volumen del altavoz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4973,11 +4944,7 @@ msgstr "" "\n" "Si no estás seguro, elige 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifica un motor de vídeo" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -4985,51 +4952,55 @@ msgstr "Acelerar la transferencia de disco" msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Control estándar" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Comenzar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Comenzar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Comenzar graba&ción" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Comenzar grabación" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estado" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados guardados" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "Volante" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Detener" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5046,7 +5017,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Estirar a la ventana" @@ -5067,12 +5038,12 @@ msgstr "Se exportó correctamente al archivo %s" msgid "Successfully imported save files" msgstr "Los archivos de guardado se han importado con éxito." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5080,7 +5051,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWÃN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5101,30 +5072,30 @@ msgstr "Tabla izquierda" msgid "Table Right" msgstr "Tabla derecha" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prueba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5140,13 +5111,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5170,7 +5141,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -5187,7 +5158,7 @@ msgstr "El nombre no puede contener coma (,)" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5199,18 +5170,18 @@ msgstr "" "\n" "Si no estás seguro, utiliza el valor más a la derecha." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "El guardado que está tratando de copiar tiene un tamaño de archivo no válido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -"El idioma seleccionado no lo soporta su sistema. Volviendo al predeterminado " -"del sistema." +"El idioma seleccionado no es soportado por tu sistema. Volviendo al " +"predeterminado del sistema." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5237,15 +5208,11 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "Tema visual" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +msgid "Theme:" +msgstr "Tema:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Hubo un error al seleccionar el tema" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5253,7 +5220,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5261,7 +5228,7 @@ msgstr "" "Estas opciones remplazan a las opciones de núcleo de Dolphin.\n" "Sin determinar significa que el juego usa la configuración de Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5269,32 +5236,34 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Esta característica le permite manejar la cámara del juego. \n" +"Esta característica te permite manejar la cámara del juego. \n" "\n" -"Mantenga pulsado el botón derecho del ratón y mueva el ratón para mover la " -"cámara alrededor. Mantenga pulsado SHIFT y pulse una de las teclas WASD para " +"Mantén pulsado el botón derecho del ratón y mueve el ratón para mover la " +"cámara alrededor. Mantén pulsado SHIFT y pulsa una de las teclas WASD para " "mover la cámara por una distancia determinada de pasos (SHIFT + 0 multiplica " -"(x2) y SHIFT+ 9 divide la misma (x0.5)). Presione SHIFT + R para reiniciar " +"(x2) y SHIFT+ 9 divide la misma (x0.5)). Presiona SHIFT + R para reiniciar " "la cámara. \n" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5306,7 +5275,7 @@ msgstr "" "Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero " "puede ocasionar errores gráficos o del programa." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" @@ -5315,40 +5284,40 @@ msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" msgid "Threshold" msgstr "Límite" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -5368,7 +5337,7 @@ msgstr "" "Intentando leer de un SYSCONF no válido\n" "bt ids del Wiimote no están disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5380,12 +5349,12 @@ msgstr "Mesa de DJ" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Puerto UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5393,7 +5362,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONOCIDO_%02X" @@ -5421,24 +5390,24 @@ msgstr "" "válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n" "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Deshacer cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "¿Llamada inesperada a 0x80? Cancelando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconocido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando desconocido de DVD %08x - error fatal" @@ -5464,32 +5433,32 @@ msgstr "" msgid "Up" msgstr "Arriba" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Usar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar advertencias" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5502,7 +5471,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5517,15 +5486,15 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilidad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5533,23 +5502,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volumen" @@ -5563,7 +5532,7 @@ msgstr "La instalación del WAD falló: error al crear %s" msgid "WAD installation failed: error creating ticket" msgstr "La instalación del WAD falló: error al crear el ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5577,16 +5546,16 @@ msgstr "" "Si no estás seguro, déjala sin marcar" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertencia - arrancando un DOL en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" @@ -5604,9 +5573,9 @@ msgstr "" "¡Advertencia! Es recomendable hacer una copia de todos los archivos en la " "carpeta:\n" "%s\n" -"¿Quiere continuar?" +"¿Quieres continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5620,7 +5589,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5631,7 +5600,7 @@ msgstr "" "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5643,7 +5612,7 @@ msgstr "" "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5678,7 +5647,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - el archivo no está abierto." @@ -5686,31 +5655,31 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5718,17 +5687,17 @@ msgstr "Archivos de guardado Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No se pudo leer el archivo" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5741,19 +5710,19 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configuración Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5773,26 +5742,26 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Trabajando..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escribir a la consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Escribir en el depurador" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escribir a archivo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escribir a ventana" @@ -5811,7 +5780,7 @@ msgstr "XAudio2 init falló: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 creación de voz maestra falló: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "Registro XF" @@ -5831,23 +5800,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No puede cerrar ventanas que tengan páginas en ellas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "¡¡Debes elegir un juego!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "¡Debes escribir un nombre!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Debes introducir un valor decimal o hexadecimal válido." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -5870,25 +5839,25 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Zelda TP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 no soportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código cero desconocido para Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ esperando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5904,7 +5873,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5924,7 +5893,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5939,11 +5908,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5960,7 +5929,7 @@ msgstr "Fallo al leer los datos del archivo: %s" msgid "failed to read header" msgstr "Fallo al leer la cabecera." -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comunícalo." @@ -5972,7 +5941,7 @@ msgstr "" "no es un guardado de Wii o fallo de lectura para la cabecera de archivo de " "tamaño %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5981,7 +5950,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "¡wxExecute dio un -1 al iniciar la aplicación!" @@ -5993,13 +5962,16 @@ msgstr "Correción zFar:" msgid "zNear Correction: " msgstr "Correción zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Recorrer frames" @@ -6063,12 +6035,42 @@ msgstr "| OR" #~ "Lo mejor es definir la relación de aspecto a \"Estirar\" cuando se " #~ "utiliza esta opción." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Generación automática de mipmaps en lugar de decodificación de la " +#~ "memoria.\n" +#~ "Aumenta el rendimiento un poco, pero puede causar defectos de menor " +#~ "importancia en la textura. \n" +#~ "\n" +#~ "Si no estás seguro, déjalo marcado." + #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#, fuzzy +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula los valores de profundidad de los gráficos 3D por píxel en lugar " +#~ "de por vértice.\n" +#~ "En contraste con la iluminación de píxeles (que no es más que una " +#~ "mejora), los cálculos por profundidad de píxel son necesarios para emular " +#~ "correctamente un pequeño número de juegos.\n" +#~ "\n" +#~ "Si no estás seguro, déjala marcada." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6120,6 +6122,21 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "No se pudo obtener información sobre el plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Caché DList" @@ -6130,9 +6147,27 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danés" +#~ msgid "Disable Lighting" +#~ msgstr "Deshabilitar iluminación" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desactivar profundidad por píxel" + +#~ msgid "Disable Textures" +#~ msgstr "Deshabilitar texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar altavoz del Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar texturas.\n" +#~ "\n" +#~ "Si no estás seguro, déjalo sin marcar." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6196,6 +6231,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Habilitar aceleración de audio" +#~ msgid "Enable BAT" +#~ msgstr "Habilitar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" @@ -6220,6 +6258,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Habilitar salvapantallas (reducción del burn-in)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Habilitar la traducción de dirección de bloques (BAT); una función de la " +#~ "unidad de administración de memoria (MMU). Es preciso al hardware " +#~ "original, pero es lento para emular. (ON = compatible, OFF = rápido)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6275,6 +6322,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Error al abrir el archivo %s para grabación." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Cerrar Dolphin con el emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6287,6 +6337,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fallo al cargar ROM DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6336,6 +6389,16 @@ msgstr "| OR" #~ "Si un juego se tilda, y anda sólamente en el Intérprete, o Dolphin tiene " #~ "errores, esta opción puede arreglar el juego." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Mejora el rendimiento, pero causa que desaparezca la iluminación en " +#~ "juegos que la utilicen.\n" +#~ "\n" +#~ "Si no estás seguro, déjala sin marcar." + #~ msgid "Input Source" #~ msgstr "Fuente de entrada" @@ -6378,6 +6441,16 @@ msgstr "| OR" #~ "Cargar los mipmaps nativos es la emulación mas precisa, pero puede " #~ "empeorar el rendimiento(los resultados pueden variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Fijar procesos en núcleos" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "" +#~ "Especifica emulación de audio de bajo nivel (LLE) o alto nivel (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Consola de scripts LUA" @@ -6410,6 +6483,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Abre el depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Abre el registro" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6444,6 +6523,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Frecuencia del sonido:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6491,6 +6573,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostrar el número de frames renderizados por segundo." +#~ msgid "Show this help message" +#~ msgstr "Mostrar este mensaje de ayuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6532,6 +6617,9 @@ msgstr "| OR" #~ "Las otras opciones son resoluciones fijas para elegir una calidad visual " #~ "independiente del tamaño del Display." +#~ msgid "Specify a video backend" +#~ msgstr "Especifica un motor de vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifica un plugin de audio" @@ -6544,6 +6632,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "Theme selection went wrong" +#~ msgstr "Hubo un error al seleccionar el tema" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index 1d861175d7..f8bb93f256 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,30 +7,28 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-24 09:01-0500\n" -"Last-Translator: Hamed Khakbiz \n" -"Language-Team: Hamed Khakbiz \n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" +"Last-Translator: H.Khakbiz\n" +"Language-Team: H.Khakbiz\n" "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:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" -msgstr "(بسیار زیاد است برای نمایش دادن)" +msgstr "(برای نمایش دادن بسیار زیاد است)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "بازی :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" -msgstr "! خیر" +msgstr "! نه" #: Source/Core/Core/Src/HW/GCMemcard.cpp:70 #, c-format @@ -38,44 +36,41 @@ msgid "" "\"%s\" does not exist.\n" " Create a new 16MB Memcard?" msgstr "" +"\"%s\" وجود ندارد.\n" +"یک کارت حاÙظه Û±Û¶ مگا بایتی جدید ساخته شود؟" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" +"\"%s\" این یک Ùایل گیم کیوب/ÙˆÛŒ Ùاقد اعتبار است، یا این Ùایل آیزو گیم کیوب/ÙˆÛŒ " +"نیست." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" -msgstr "" +msgstr "%1$sÚ©Ù¾ÛŒ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format msgid "%i connected" -msgstr "Wiimote متصل شد" +msgstr "%i ارتباط برقرار شده" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 #, c-format msgid "%s already exists, overwrite?" -msgstr "" +msgstr "%s وجود دارد، بازنویسی شود؟" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "" +msgstr "%s تمیز کارى آیزو با شکست مواجه شد. شاید Ùایل آیزو خراب است." #: Source/Core/Core/Src/HW/GCMemcard.cpp:95 #, c-format @@ -83,6 +78,8 @@ msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"حجم Ùایل کارت نامعتبر است (0x%x بایت)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:110 #, c-format @@ -90,6 +87,8 @@ msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"حجم کارت حاÙظه نامعتبر است (0x%x بایت)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:90 #, c-format @@ -97,11 +96,13 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"Ùایل به اندازه کاÙÛŒ بزرگ نیست Ú©Ù‡ یک Ùایل کارت حاÙظه معتبر باشد (0x%x بایت)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format msgid "%s failed to open" -msgstr "" +msgstr "%s بازکردن با شکست مواجه شد" #: Source/Core/Core/Src/DSP/DSPCore.cpp:97 #, c-format @@ -110,223 +111,226 @@ msgid "" "Would you like to stop now to fix the problem?\n" "If you select \"No\", audio will be garbled." msgstr "" +"%s دارای یک درهم‌ساز نا درست است.\n" +"آیا مایل هستید برابرسازی حالا متوق٠شود تا مشکل را اصلاح کنید؟اگر شما \"نه\" " +"را انتخاب کنید، صدا مغشوش خواهد شد." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 #, c-format msgid "%s is a 0 byte file" -msgstr "" +msgstr "%s یک Ùایل با حجم Û° بایت است" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:159 #, c-format msgid "%s is already compressed! Cannot compress it further." -msgstr "" +msgstr "%s Ùشرده شده است! توان Ùشرده سازی بیشتر را ندارد." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "" +msgstr "%s برای اسم Ùایل بسیار دراز است، حداکثر تعداد کاراکترها Û´Ûµ است" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format msgid "%sDelete%s" -msgstr "%sپاک کردن%s" +msgstr "%sحذÙ%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:198 #, c-format msgid "%sExport GCI%s" -msgstr "%sصادر کردن GCI%s" +msgstr "%sصادر کردن جی سی Ø¢ÛŒ%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:196 #, c-format msgid "%sImport GCI%s" -msgstr "%sوارد کردن GCI%s" +msgstr "%sوارد کردن جی سی Ø¢ÛŒ%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" -msgstr "" +msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&درباره..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." -msgstr "&بوت شدن از دی ÙˆÛŒ دی" +msgstr "&بوت شدن از درایو دی ÙˆÛŒ دی..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" -msgstr "&نقاط وقÙÙ‡" +msgstr "&نقاط انÙصال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." -msgstr "&جوستوجو برای Ùایلهای ISO" +msgstr "&مرور برای Ùایل های آیزو..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" -msgstr "&مدریت کدهای تقلب" +msgstr "مدیریت کدهای &تقلب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" -msgstr "&تنظیمات صدا DSP" +msgstr "تنظیمات پردازشگر &صدای دلÙین" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." -msgstr "&پاک کردن Ùایل ISO" +msgstr "&حذ٠آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." -msgstr "&پاک کردن Ùایل ISO انطخاب شده" +msgstr "&حذ٠آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" -msgstr "&شبیه سازی" +msgstr "&برابرسازی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Ùایل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" -msgstr "&Ùریم پیشرÙته" +msgstr "&پيشروى Ùریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&تمام صÙحه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" -msgstr "&تنظیمات گراÙیک" +msgstr "تنظیمات &گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" -msgstr "&تنظیم شرت کاتها" +msgstr "تنظیم &شرت کاتها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" -msgstr "&JIT" +msgstr "&جیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" -msgstr "&بارگیری حالت" +msgstr "&بارگذاری وضعیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" -msgstr "&مدریت کارت حاÙظه (GC)" +msgstr "مدیر &کارت حاÙظه (گیم کیوب)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&حاÙظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&باز کردن..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" -msgstr "&اختیارات" +msgstr "&گزینه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "ثبت کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" -msgstr "&شروع دوباره" +msgstr "شروع &دوباره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&صدا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&توقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ابزارها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&ویدیو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" -msgstr "&دیدن" +msgstr "&دیدگاه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" -msgstr "&تنظیمات Wiimote" +msgstr "تنظیمات &ویموت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&ویکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" -msgstr "" +msgstr "دورz+(-)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 msgid "(-)+zNear" -msgstr "" +msgstr "نزدیکz+(-)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 msgid "(UNKNOWN)" msgstr "(ناشناخته)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(خاموش)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" -msgstr "" +msgstr "Û°xÛ´Û´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "Û±Û¶ بیت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "Û³Û² بیت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "نمایش سه بعدی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "Û¸ بیت" @@ -334,44 +338,48 @@ msgstr "Û¸ بیت" msgid "" msgstr "<اسم را اینجا وارد کنید>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<هیچ>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" -msgstr "<Ùشار کلید>" +msgstr "<تکمه Ùشارى>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<سیستم>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" -msgstr "" +msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" -msgstr "صÙحه NetPlay باز است!!" +msgstr "پنجره نت پلی از قبل باز است!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." -msgstr "بازی اجرا نشده است." +msgstr "بازی در حال حاضر اجرا نشده است." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" +"دستگاه بلوتوث مورد پشتیبانی پیدا نشد!\n" +"(Ùقط نرم اÙزار پیاده سازی بلوتوث ماکروساÙت پشتیبانی میشود.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -389,14 +397,30 @@ msgid "" "\n" "You must forward TCP port to host!!" msgstr "" +"اخطار:\n" +"\n" +"در حال حاضر نت پلی تنها زمانی به درستی کار خواهد کرد Ú©Ù‡ از تنظیمات زیر " +"استÙاده Ù…ÛŒ کند:\n" +"- پردازنده با دو هسته یا بیشتر [خاموش]\n" +"- دریچه صدا [خاموش]\n" +"- برابرسازی سطح بالای پردازشگر صدای دلÙین با \"Null Audio\" یا برابرسازی سطح " +"پائین پردازشگر صدای دلÙین\n" +"- تعداد دقیق کنترولر هایی Ú©Ù‡ استÙاده خواهند شد را به صورت دستی تنظیم کنید " +"[کنترولر استاندارد]\n" +"تمام بازیکنان باید سعی کنند Ú©Ù‡ از همان تنظیمات Ùˆ نسخه دلÙین استÙاده کنند.\n" +"تمام کارت های حاÙظه را از کار بیاندازید یا پیش از شروع آنها را به تمام " +"بازیکنان بÙرستید.\n" +"پشتیبانی ویموت اجرا نشده است.\n" +"\n" +"شما باید درگاه TCP را به میزبان ارسال کنید!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" -msgstr "" +msgstr "بÙرد٠مادر ای ام" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -404,19 +428,19 @@ msgstr "کدهای اکشن ریپلی" msgid "About Dolphin" msgstr "درباره دلÙین" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" -msgstr "شتاب دهنده" +msgstr "شتاب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" -msgstr "دقت" +msgstr "دقت:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" -msgstr "شبیه سازی دقیق ÙˆÛŒ-بیم" +msgstr "برابرسازی دقیق ÙˆÛŒ بیم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -424,9 +448,14 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" +"دقیقا Ú©Ù¾ÛŒ های ای ا٠بی را برابرسازی Ù…ÛŒ کند.\n" +"برخی از بازی ها برای اÙکت های گراÙیکی معین یا کارکرد بازی متکی به Ú©Ù¾ÛŒ های ای " +"ا٠بی اند.\n" +"اگر در این مورد اطمینان ندارید، به جای آن گزینه ای ا٠بی به باÙت اشیاء را " +"انتخاب کنید." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "اکشن" @@ -439,84 +468,95 @@ msgid "" "Culprit Code:\n" "%s" msgstr "" +"خطای کدگشایی کد اکشن ریپلی:\n" +"بررسی بیت توازن (پریتی) با شکست مواجه شد\n" +"\n" +"کد خراب:\n" +"%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در اضاÙÙ‡ کردن کد (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر Ùˆ اسلاید کردن (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر کردن Ùˆ نوشتن حاÙظه " +"(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در نوشتن به اشاره گر (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: مقدار نامعتبر (%08x) در Ú©Ù¾ÛŒ حاÙظه (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." +msgstr "خطای اکشن ریپلی: کد مستر Ùˆ نوشتن در CCXXXXXX تکمیل نشده است (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" -msgstr "" +msgstr "خطای اکشن ریپلی: خط کد نامعتبر اکشن ریپلی: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد نامعلوم: سایز نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: الگوی کد عادی نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد عادی %i: کد Ùرعی نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد عادی Û°: کد Ùرعی نامعتبر %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" -msgstr "آداپتور" +msgstr "آداپتور:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:76 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -524,13 +564,13 @@ msgstr "اضاÙÙ‡ کردن وصله" msgid "Add new pane" msgstr "اضاÙÙ‡ کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "آدرس :" @@ -544,6 +584,13 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" +"اضاÙÙ‡ کنید مقدار مشخص شده را به پارامتر zدور.\n" +"دو راه ابراز مقادیر ممیز شناور.\n" +"نمونه: مستقیما وارد کنید \"Û²Û°Û°\" یا \"Û°.Û°Û°Û°Û²\"ØŒ اثر تولید شده یکسان است، " +"مقدار بدست آمده \"Û°.Û°Û°Û°Û²\" خواهد بود.\n" +"مقادیر: (Û°-<+/-انتیجر) یا (Û°-<+/-FP [Û¶ شماره دقیق])\n" +"\n" +"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:52 msgid "" @@ -555,191 +602,208 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" +"اضاÙÙ‡ کنید مقدار مشخص شده را به پارامتر zنزدیک.\n" +"دو راه ابراز مقادیر ممیز شناور.\n" +"نمونه: مستقیما وارد کنید \"Û²Û°Û°\" یا \"Û°.Û°Û°Û°Û²\"ØŒ اثر تولید شده یکسان است، " +"مقدار بدست آمده \"Û°.Û°Û°Û°Û²\" خواهد بود.\n" +"مقادیر: (Û°-<+/-انتیجر) یا (Û°-<+/-FP [Û¶ شماره دقیق])\n" +"\n" +"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" +msgstr "تنظیم Ùشار کنترل آنالوگ برای Ùعال کردن دکمه ها لازم است." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "پیشرÙته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "تنظیمات پیشرÙته" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "" +msgstr "همه Ùایل های گیم کیوب/ÙˆÛŒ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "" +msgstr "همه ایمیجهای گیم کیوب/ÙˆÛŒ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" -msgstr "" +msgstr "همه Ùایل های گیم کیوب جی سی ام (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" -msgstr "" +msgstr "همه وضعیت های ذخیره (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" -msgstr "تمام اسناد Wii ISO" +msgstr "همه Ùایل های آیزو ÙˆÛŒ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" -msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" +msgstr "همه Ùایل های آیزو Ùشرده شده گیم کیوب/ÙˆÛŒ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" -msgstr "تمام اسناد (*.*)|*.*" +msgstr "همه Ùایل ها (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"اجازه کنترل برخی گزینه ها توسط کلیدهای میانبر ۳، Û´ØŒ Ûµ Ùˆ Û¶ در داخل پنجره " +"برابرساز را میدهد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "زمان بندی جایگزین برای ویموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "تحلیل کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Ùیلتر ناهمسانگر:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" -msgstr "آنتی الیاسینگ:" +msgstr "آنتی آلیاسینگ:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:309 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "" +msgstr "سایز بارگذار برنامه اشتباه است...آیا این واقعا بارگذار برنامه است؟" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:303 msgid "Apploader unable to load from file" -msgstr "" +msgstr "بارگذار برنامه ناتوان در بارگذاری از Ùایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" -msgstr "بار گزار برنامه" +msgstr "بار گذار برنامه:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "اعمال کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" +"اعمال کردن یک اÙکت پس پردازی بعد از اتمام یک Ùریم.\n" +"\n" +"اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "عربی" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "" +msgstr "آیا شما مطمئن هستید Ú©Ù‡ میخواهید \"%s\" را حذ٠کنید؟" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" +"آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایلها را حذ٠کنید؟\n" +"این Ùایل ها برای همیشه از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +"آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایل را حذ٠کنید؟ این Ùایل برای همیشه " +"از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" -msgstr "نصبت طول به عرض تصویر:" +msgstr "نسبت طول به عرض تصویر:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:69 msgid "At least one pane must remain open." -msgstr "" +msgstr "حداقل یک قطه Ù…ÛŒ بایست باز بماند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" -msgstr "پشتوانه صدا" +msgstr "پشتوانه صدا:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" -msgstr "" +msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "اتوماتیک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "اتوماتیک (ضریب Û¶Û´Û°xÛµÛ²Û¸)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "اتوماتیک (سایز پنجره)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "تنظیم اتوماتیک سایز پنجره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" +"تنظیم اتوماتیک سایز پنجره با توجه به وضوح داخلی.\n" "\n" -"If unsure, leave this checked." -msgstr "" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" -msgstr "" +msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "ثبت کردن" +msgstr "ثبت اشاره گر پایه" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" -msgstr "تنضیمات پشتوانه" +msgstr "تنظیمات پشتوانه" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "پشتوانه:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ورودی پس زمینه" @@ -750,18 +814,18 @@ msgstr "به عقب" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" -msgstr "" +msgstr "سرخط ناصحیح Ùایل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "جزئیات نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "نشان:" @@ -769,23 +833,23 @@ msgstr "نشان:" msgid "Bar" msgstr "نوار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "بنیانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "تنظیمات بنیانی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Bass" -msgstr "" +msgstr "بم" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "" +msgstr "Ú†Ú© سام جدول تخصیص بلوک با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "بلوک ها" @@ -795,87 +859,83 @@ msgstr "آبی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Blue Left" -msgstr "" +msgstr "آبی Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Blue Right" -msgstr "" +msgstr "آبی راست" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "پائین" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" -msgstr "" +msgstr "کنترل های محدودیت: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "خراب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" -msgstr "جوستجو" +msgstr "مرور" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" -msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" +msgstr "مرور برای پوشه جهت اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." -msgstr "جوستجو برای پوشه ISO..." +msgstr "مرور برای پوشه آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" -msgstr "جوستجو برای پوشه خروجی" +msgstr "مرور برای پوشه خروجی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" -msgstr "" +msgstr "حاÙظه موقت:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "دکمه ها" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 -msgid "C" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." msgstr "" +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +msgid "C" +msgstr "C" + #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" -msgstr "" +msgstr "استیک سی" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" -msgstr "" +msgstr "استیک سی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" -msgstr "" +msgstr "ثبت سی Ù¾ÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" -msgstr "موتور جوستجو پردازشگر" +msgstr "موتور پردازشگر برابرساز" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" -msgstr "" +msgstr "لیست های حاÙظه ميانى تصویر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -883,8 +943,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"محاسبه نورپردازی هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" +"سرعت برابرسازی را چند درصد Ú©Ù… میکند (بسته به قدرت پردازشگر گراÙیک شما).\n" +"معمولا این یک بهبود بی خطر است، اما گاه امکان بروز مسائلی وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "لغو کردن" @@ -894,69 +959,75 @@ msgstr "لغو کردن" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 #, c-format msgid "Cannot open %s" -msgstr "قادر به باز گشایی نمی باشد %s" +msgstr "قادر به باز گشایی نیست %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "" +msgstr "رویدادهایی را Ú©Ù‡ معوق اند نمی تواند از ثبت درآورد." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, 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:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" +"قادر به استÙاده از این Ùایل به عنوان کارت حاÙظه نیست.\n" +"آیا شما سعی دارید از یک Ùایل برای هر دو شکا٠استÙاده کنید؟" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" +"قادر به یاÙتن ویموت بواسطه دستگاه بلوتوث نیست: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" -msgstr "" +msgstr "قادر به یاÙتن ویموت بواسطه دستگذار اتصال %02x نیست" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "قادر به خواندن از پلاگ-این دی ÙˆÛŒ دی نیست - واسط دی ÙˆÛŒ دی: خطای مهلک" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" -msgstr "" +msgstr "کپس لاک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "کاتالان" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "مرکز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" -msgstr "تغییر" +msgstr "تعویض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." -msgstr "تغییر &دیسک..." +msgstr "تعویض &دیسک..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" -msgstr "تغییر دیسک" +msgstr "تعویض دیسک" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" -msgstr "تغییر بازی" +msgstr "تعویض بازی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" @@ -968,18 +1039,18 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "" +msgstr "تغییرات علامت به پارامتر z-دور (بعد از تصحیح)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "" +msgstr "تغییرات علامت به پارامتر z-نزدیک (بعد از تصحیح)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" -msgstr "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" +msgstr "" +"تغییر دادن این مورد در حالی Ú©Ù‡ برابرساز در حال اجراست اثری نخواهد داشت!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Ú¯Ù¾ زدن" @@ -987,68 +1058,70 @@ msgstr "Ú¯Ù¾ زدن" msgid "Cheat Code" msgstr "کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" -msgstr "جوستجو برای کد تقلب" +msgstr "جستجوی کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" -msgstr "مدریت کدهای تقلب" +msgstr "مدیر کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "برسی عدم نقص پارتیشن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "برسی عدم نقص..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" -msgstr "انتخاب پوشه برای دی ÙˆÛŒ دی:" +msgstr "انتخاب یک پوشه ریشه برای دی ÙˆÛŒ دی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" -msgstr "انتخاب پوشه برای NAND:" +msgstr "انتخاب یک پوشه ریشه برای نند:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" -msgstr "انتخاب ISO پیش Ùرز:" +msgstr "انتخاب آیزو پیش Ùرض:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" -msgstr "انتخاب سند برای باز کردن" +msgstr "انتخاب Ùایل برای باز کردن" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" +"انتخاب Ùایل برای استÙاده بعنوان بارگذار برنامه: (به دیسک هایی Ú©Ù‡ Ùقط از پوشه " +"ها ساخته شده اند اعمال Ù…ÛŒ کند)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" -msgstr "انتخاب پوشه برای استخراج در آن" +msgstr "انتخاب پوشه برای استخراج به آن" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" -msgstr "" +msgstr "استیک دایره" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52 msgid "Classic" @@ -1056,8 +1129,8 @@ msgstr "کلاسیک" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "پاک کردن" @@ -1066,23 +1139,25 @@ msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." msgstr "" +"ارتباط مشتری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی از کار اÙتاد. شما " +"باید بازی را دستی متوق٠کنید." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "بستن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ù¾ÛŒ&کربندی..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "مشخصات کد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "کد:" @@ -1090,101 +1165,101 @@ msgstr "کد:" msgid "Command" msgstr "دستور" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." -msgstr "Ùشرده کردن ISO..." +msgstr "Ùشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." -msgstr "Ùشرده کردن ISO انتخاب شده..." +msgstr "Ùشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" -msgstr "در حال Ùشرده کردن ISO" +msgstr "در حال Ùشرده کردن آیزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "پیکربندی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "پیکربندی" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "کنترل پیکربندی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "پیکربندی گیم پدها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" -msgstr "تائید بازنویسی سند" +msgstr "تائید بازنویسی Ùایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "تائید برای توقÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" -msgstr "اتصال Wiimote %i" +msgstr "اتصال ویموت %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" -msgstr "اتصال Wiimote Û±" +msgstr "اتصال ویموت Û±" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" -msgstr "اتصال Wiimote Û²" +msgstr "اتصال ویموت Û²" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" -msgstr "اتصال Wiimote Û³" +msgstr "اتصال ویموت Û³" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" -msgstr "اتصال Wiimote Û´" +msgstr "اتصال ویموت Û´" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "در حال اتصال..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:154 msgid "Console" -msgstr "ميز Ùرمان" +msgstr "میز Ùرمان" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 msgid "Control" @@ -1192,30 +1267,30 @@ msgstr "کنترل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:187 msgid "Convert to GCI" -msgstr "تبدیل به GCI" +msgstr "تبدیل به جی سی Ø¢ÛŒ" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "هسته" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:152 #, c-format msgid "Could not create %s" -msgstr "قادر به ساخت نمی باشد %s" +msgstr "قادر به ساخت نیست %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." -msgstr "قادر به نصب بخش مدیریت نمی باشد %s" +msgstr "قادر به نصب پشتوانه نیست %s" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1224,30 +1299,30 @@ msgid "" "backup. Please note that original Gamecube and Wii discs cannot be read by " "most PC DVD drives." msgstr "" -"قادر به خواندن نمی باشد \"%s\". درایو خالی است. Ùˆ یا دیسک شامل اطلاعات Wii/" -"GC نمی باشد. توجه داشته باشید دیسک های Wii/GC توسط اکثر دی ÙˆÛŒ دی درایوها " -"قابل خواندن نمی باشد." +"قادر به خواندن \"%s\" نیست. دیسک در درایو نیست، یا این یک بکاپ گیم کیوب/ÙˆÛŒ " +"نیست. لطÙا توجه داشته باشید Ú©Ù‡ دیسک های اصلی گیم کیوب/ÙˆÛŒ توسط اکثر دی ÙˆÛŒ دی " +"درایوهای کامپیوتر قابل خواندن نیستند." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" -msgstr "قادر به تشخیص Ùایل ISO نمی باشد %s" +msgstr "قادر به تشخیص Ùایل آیزو %s نبود" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" -msgstr "قادر به ذخیره کردن نمی باشد %s" +msgstr "قادر به ذخیره کردن نیست %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"قادر به نصب گیم پدها نمی باشد. بازی Ú©Ù† بازی را ترک کرده Ùˆ یا بازی در حال " -"اجرا Ù…ÛŒ باشد!\n" -"(نصب گیم پدها در حالی Ú©Ù‡ بازی در حال اجرا است Ùعلا امکان پذیر نمی باشد)" +"قادر به ست کردن گیم پدها نیست. بازی Ú©Ù† بازی را ترک کرده Ùˆ یا بازی در حال " +"اجرا است!\n" +"(ست کردن گیم پدها در حالی Ú©Ù‡ بازی در حال اجرا است Ùعلا پشتیبانی نمی شود)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1255,34 +1330,34 @@ msgid "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" msgstr "" -"قادر به نوشتن یر روی کارت حاÙطه نمی باشد %s.\n" +"قادر به نوشتن Ùایل کارت حاÙظه نیست %s.\n" "\n" -"شما بازی را از روی سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید؟ Ùˆ یا شاید Ùایل سیو " -"رایت پوروتکت Ù…ÛŒ باشد." +"آیا شما بازی را از روی یک سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید، Ùˆ یا شاید Ùایل " +"ذخیره محاÙظت شده (Write Protect) است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" -msgstr "قادر به یاÙتن دستور برای توسعه نمی باشد 'ini'!" +msgstr "قادر به یاÙتن دستور باز برای پسوند 'ini' نیست!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -"قادر به init کردن هسته نمی باشد.\n" -"تنظیمات را Ú†Ú© کنید." +"قادر به اينيت کردن هسته نیست.\n" +"تنظیمات خود را Ú†Ú© کنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "کشور:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "ساخت کد اکشن ریپلی" @@ -1291,24 +1366,7 @@ msgstr "ساخت کد اکشن ریپلی" 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:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "سازنده:" @@ -1316,103 +1374,109 @@ msgstr "سازنده:" msgid "Critical" msgstr "بحرانی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" -msgstr "حذ٠قسمتى تصوير" +msgstr "حذ٠قسمتی از تصوير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"حذ٠قسمتی از تصویر از Û´:Û³ به Ûµ:Û´ یا از Û±Û¶:Û¹ به Û±Û¶:Û±Û°.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" msgstr "ضرب دری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" -msgstr "" +msgstr "بعد از انتخابگر Ùایل wx پوشه Ùعلی از %s به %s تغییر کرد!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" -msgstr "" +msgstr "Ù‡Ú© کردن دستی تصویر" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "" +msgstr "تنظیمات مربوط به Ù‡Ú© کردن دستی تصویر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." -msgstr "" +msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "چکوسلواکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" -msgstr "" +msgstr "پد هدایتی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" -msgstr "صدا DSP" +msgstr "پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" -msgstr "موتور شبیه ساز صدا DSP" +msgstr "موتور برابرساز پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" -msgstr "" +msgstr "برابرسازی سطح بالای پردازشگر صدای دلÙین (سریع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" -msgstr "" +msgstr "Ù…Ùسر سطح پائین پردازشگر صدای دلÙین (کند)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" -msgstr "" +msgstr "قرار دادن برابرساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" -msgstr "" +msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" -msgstr "تنظیمات صدا DSP" +msgstr "تنظیمات پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 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 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" -msgstr "سایزه داده" +msgstr "اندازه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "تاریخ:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" -msgstr "" +msgstr "Ùایل های داتل مکس درایو/حرÙÙ‡ ای (*,sav)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:259 @@ -1422,62 +1486,62 @@ msgstr "" msgid "Dead Zone" msgstr "منطقه مرده" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" -msgstr "" +msgstr "اشکال زدائی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" -msgstr "" +msgstr "اشکال زدائی کردن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:79 msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." -msgstr "ناهمÙشرده کردن ISO..." +msgstr "ناهمÙشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." -msgstr "ناهمÙشرده کردن ISO انتخاب شده..." +msgstr "ناهمÙشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" -msgstr "در حال ناهمÙشرده کردن ISO" +msgstr "در حال ناهمÙشرده کردن آیزو" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" -msgstr "پیش Ùرز ISO:" +msgstr "آیزو پیش Ùرز:" #: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Default font" msgstr "دست خط پیش Ùرز" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" -msgstr "پاک کردن" +msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" -msgstr "پاک کردن Save" +msgstr "حذ٠ذخیره" #: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" -msgstr "آیا سند موجود پاک شود '%s'ØŸ" +msgstr "Ùایل موجود '%s' حذ٠شود؟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "شرح" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "شناسایی" @@ -1487,14 +1551,16 @@ 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 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1504,40 +1570,30 @@ msgstr "شماره گیری" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" -msgstr "" +msgstr "Direct3D Û±Û±" #: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" -msgstr "" +msgstr "Direct3D Û¹" #: Source/Core/Core/Src/HW/GCMemcard.cpp:167 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" +"Ú†Ú© سام پوشه با شکست مواجه شد\n" +" Ùˆ Ú†Ú© سام بکاپ پوشه با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" -msgstr "غیر Ùعال" +msgstr "از کارانداختن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" -msgstr "غیر Ùعال کردن مه" +msgstr "از کارانداختن مه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "غیر Ùعال کردن روشنایی" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "غیر Ùعال کردن Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "غیر Ùعال کردن باÙت اشیاء" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1545,8 +1601,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"از کار انداختن تمام برابرسازی های اکس ا٠بی (XFB).\n" +"سرعت برابرسازی را بسیار بالا میبرد اما سبب خرابی های سنگینی در بسیاری از " +"بازی هایی Ú©Ù‡ به برابرسازی اکس ا٠بی وابسته اند Ù…ÛŒ گردد (بویژه برنامه های " +"خانگی).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1555,15 +1617,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" +"از کارانداختن برابرسازی Ú©Ù¾ÛŒ های ای ا٠بی (EFB).\n" +"Ú©Ù¾ÛŒ های ای ا٠بی اغلب برای اÙکت های اعمال شده به باÙت اشیاء یا پس پردازی " +"استÙاده Ù…ÛŒ شوند، بنابراین در حالیکه بررسی کردن این تنظیمات اÙزایش سرعت " +"بالایی Ù…ÛŒ دهد تقریبا همیشه سبب مشکلاتی نیز Ù…ÛŒ شود.\n" "\n" -"If unsure, leave this unchecked." -msgstr "" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "دیسک" @@ -1572,195 +1633,223 @@ msgstr "دیسک" msgid "Disc Read Error" msgstr "خواندن دیسک با مشکل مواجه گردید" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "نمایش" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش ورودی های خوانده شده توسط برابرساز.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:80 msgid "Divide" msgstr "تقسیم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" +msgstr "آیا Ù…ÛŒ خواهید برابرسازی Ùعلی را متوق٠کنید؟" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "دلÙین" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" -msgstr "دلÙین %s پیکردی بندی گرÙیک" +msgstr "دلÙین %s پیکربندی گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" -msgstr "دلÙین &وب سایت" +msgstr "&وب سایت دلÙین" #: Source/Core/DolphinWX/Src/ConfigMain.h:37 msgid "Dolphin Configuration" msgstr "پیکر بندی دلÙین" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" +msgstr "پیکربندی ویمیوت برابرسازی شده دلÙین" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" -msgstr "دلÙین FIFO" +msgstr "دلÙین ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" -msgstr "پیکربندی GCPad دلÙین" +msgstr "پیکربندی گیم پد گیم کیوب دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" -msgstr "دلÙین TAS Movies (*.dtm)" +msgstr "Ùیلم های تاس دلÙین (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" -msgstr "پیکربندی Wiimote دلÙین" +msgstr "پیکربندی ویموت دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" -msgstr "دلÙین در &Google Code" +msgstr "دلÙین در &Ú¯ÙˆÚ¯Ù„ کد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"دلÙین قادر به پیدا کردن ISOهای GC/Wii نمی باشد. برای جستجو اسناد دو بار " +"دلÙین قادر به پیدا کردن آیزو های گیم کیوب/ÙˆÛŒ نیست. برای مرور Ùایل ها دو بار " "اینجا کلیک کنید..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -"دلÙین در حال حاضر طوری ست شده است Ú©Ù‡ تمامی بازی ها را مخÙÛŒ کند. برای نمایش " -"بازی ها دو بار اینجا کلیک کنید..." +"دلÙین در حال حاضر ست شده است Ú©Ù‡ همه بازی ها را مخÙÛŒ کند. برای نمایش بازی ها " +"دو بار اینجا کلیک کنید..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "پائین" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" -msgstr "دانلود کدها (WiiRD Database)" +msgstr "دانلود کدها (WiiRD بانک اطلاعاتی)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" -msgstr "کدهای %lu دانلود شده. (added %lu)" +msgstr "%lu کد دانلود شد. (%lu عدد اضاÙÙ‡ شد)" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31 msgid "Drums" -msgstr "" +msgstr "طبل ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" -msgstr "" +msgstr "مصنوعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" -msgstr "نسخه بردارى صدا" +msgstr "نسخه برداری صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" -msgstr "" +msgstr "نسخه برداری نشان حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" -msgstr "نسخه بردارى Ùریم" +msgstr "نسخه برداری Ùریم ها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" -msgstr "" +msgstr "نسخه برداری باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری از همه Ùریم های نمایش داده شده در قالب Ùایل AVI در پوشه User/" +"Dump/Frames/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری باÙت اشیاء کدبرداری شده بازی در پوشه User/Dump/Textures/" +"game_id/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری محتوی Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB) در پوشه User/" +"Dump/Textures/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "هلندی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Ø®&روج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" -msgstr "" +msgstr "Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" +"خطا: این نسخه دلÙین نیازمند درایور با حداقل نسخه %d برای TAP-Win32 Ù…ÛŒ باشد." +"%d -- اگر شما بتازگى نسخه توزیع کننده دلÙین را بالا برده اید، شاید راه " +"اندازی مجدد در این مرحله برای اینکه ویندوز درایور جدید را شناسایی کند لازم " +"باشد." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" -msgstr "اوروپا" +msgstr "اروپا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" -msgstr "" +msgstr "به روز شدن های اولیه حاÙظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "ویرایش" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30 msgid "Edit ActionReplay Code" -msgstr "ویریش کدهای اکشن ریپلی" +msgstr "ویرایش کدهای اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" -msgstr "ویرایش پيکربندى" +msgstr "ویرایش پیکربندی" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:30 msgid "Edit Patch" msgstr "ویرایش وصله" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" -msgstr "" +msgstr "ویرایش چشم انداز جاری" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "ویرایش..." @@ -1768,15 +1857,15 @@ msgstr "ویرایش..." msgid "Effect" msgstr "اÙکت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" -msgstr "" +msgstr "حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" -msgstr "" +msgstr "ریسمان شبیه ساز قبلا اجرا شده است" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1784,8 +1873,13 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" +"برابرسازی دقیق اکس ا٠بی ها.\n" +"سرعت برابرسازی را بسیار پائین Ù…ÛŒ آورد Ùˆ رندر کردن با تÙکیک پذیری بالا را " +"قدغن Ù…ÛŒ کند اما برای اجرای درست تعدادی از بازی ها لازم است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، گزینه اکس ا٠بی مجازی را Ùعال کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1794,20 +1888,27 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"برابرسازی اکس ا٠بی ها توسط باÙت اشیای پردازشگر گراÙیک.\n" +"درست کردن تعداد زیادی از بازی هایی Ú©Ù‡ بدون برابرسازی اکس ا٠بی کار نمی کنند " +"در حالی Ú©Ù‡ به اندازه اکس ا٠بی واقعی کند نخواهد بود. بهر حال، این ممکن است " +"برای تعداد زیادی از بازی های دیگر با شکست مواجه شود (بویژه برای برنامه ای " +"خانگی).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" -msgstr "ویموت شبیه سازی شده" +msgstr "ویموت برابرسازی شده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " -msgstr "" +msgstr "وضعیت برابرساز:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ùراهم کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1816,73 +1917,74 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùعال کردن برجسته سازی سه بعدی توسط تکنولوژی Nvidia 3D Vision با توجه به این " +"Ú©Ù‡ پردازشگر گراÙیک شما از این امر پشتیبانی کند.\n" +"امکان بروز خطا وجود دارد.\n" +"پیش نیاز این امر حالت تمام صÙحه میباشد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" -msgstr "" +msgstr "Ùعال کردن واقعه نگاری اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" -msgstr "" +msgstr "Ùعال کردن ادغام بلوک" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "Ùعال کردن محاسبه حد جعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" -msgstr "" +msgstr "Ùعال کردن حاÙظه ميانى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Ùعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" -msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" +msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" -msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" +msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Ùعال کردن شرت کاتها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" -msgstr "" +msgstr "Ùعال کردن جهش بیکاری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" -msgstr "" +msgstr "Ùعال کردن جهش بیکاری (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" -msgstr "" +msgstr "Ùعال کردن واحد مدیریت حاÙظه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" -msgstr "" +msgstr "Ùعال کردن پويش تصاعدی (Progressive Scan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" -msgstr "" +msgstr "Ùعال کردن اسکیرین سیور" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" -msgstr "" +msgstr "Ùعال کردن صÙحه عریض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" -msgstr "" +msgstr "Ùعال کردن خطوط Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1890,113 +1992,150 @@ msgid "" "\n" "If unsure, select 1x." msgstr "" +"Ùعال کردن Ùیلتر ناهمسانگرد.\n" +"ارتقا Ú©ÛŒÙیت باÙت اشیاء Ú©Ù‡ در زوایای مورب قرار دارند.\n" +"امکان بروز مشکل در تعداد Ú©Ù…ÛŒ از بازی ها وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" +"Ùعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها " +"لازم است. (ON=سریع، OFF=سازگار)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" -msgstr "" +msgstr "Ùعال کردن صÙحات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"این گزینه به شما اجازه میدهد تا از تمام صÙحه برای نمایش تصویر استÙاده کنید.\n" +"اگر این گزینه غیر Ùعال باشد پنجره صÙحه نمایش به جای آن ساخته میشود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"اگر میخواهید به جای پنجره جداگانه از پنجره اصلی دلÙین برای نمایش بازی " +"استÙاده کنید این گزینه را Ùعال کنید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" +"برای بالا بردن سرعت بازی اÙسانه زلدا: شاهدخت سپیده دم این گزینه را Ùعال " +"کنید. غیرÙعال برای هر بازی دیگر." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" +msgstr "Ùعال کردن پروژه Ù‡Ú© دستی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùعال کردن پويش تصاعدی اگر توسط نرم اÙزار برابرسازی شده پشتیبانی شود.\n" +"اکثر بازی به این موضوع اهمیت نمی دهند.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" +"Ùعال کردن واحد مدیریت حاÙظه، برای بعضی از بازی ها لازم است. (روشن = سازگار، " +"خاموش = سریع)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"کدگذاری Ùریم نسخه برداری شده توسط کدک FFV1.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "انگلیسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" -msgstr "بالا بردن" +msgstr "بهسازی" #: Source/Core/DolphinWX/Src/FrameAui.cpp:606 msgid "Enter a name for the new perspective:" -msgstr "" +msgstr "یک اسم برای چشم انداز جدید وارد کنید:" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:190 #, c-format msgid "Entry %d/%d" -msgstr "" +msgstr "ورودی %d/%d" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:84 #, c-format msgid "Entry 1/%d" -msgstr "" +msgstr "ورودی 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "همگن" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "خطا" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" +"بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش Ùرض سیستم." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format @@ -2004,6 +2143,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +"خطا: بعد از \"%s\"ØŒ %d (0x%X) به جای نشان ذخیره %d (0x%X) پیدا شد. خاتمه " +"بارگذاری وضعیت ذخیره..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format @@ -2011,6 +2152,8 @@ msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" +"خطا: تلاش برای دسترسی به Ùونت های %s اما آنها بارگذاری نشده اند. ممکن است " +"بازی ها Ùونت ها را به درستی نمایش ندهند، یا خرابی به بار آورند." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2018,147 +2161,143 @@ msgstr "گریختن" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26 msgid "Euphoria" -msgstr "" +msgstr "خوشی" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" +msgstr "دستگذار استثناء - دسترسی Ùضای پایینی حاÙظه. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" msgstr "اجرا کردن" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "خروج دلÙین با شبیه ساز" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" -msgstr "صادر کردن سند" +msgstr "صادر کردن Ùایل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "صادر کردن ضبط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" -msgstr "صادر کردن Save" +msgstr "صادر کردن ذخیره" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" -msgstr "صادر کردن Wii save (آزمایشی)" +msgstr "صادر کردن Ùایل ذخیره ÙˆÛŒ (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" -msgstr "صادر کردن تمام Save ها" +msgstr "صادر کردن همه ذخیره ها" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80 msgid "Export failed, try again?" -msgstr "صادر کردن با شکست مواجه شد, سعی دوباره؟" +msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." -msgstr "صادر کردن Save با عنوان..." +msgstr "صادر کردن ذخیره بعنوان..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" -msgstr "توسعه" +msgstr "پسوند" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" -msgstr "" +msgstr "حاÙظه میانجی خارجی Ùریم" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" -msgstr "" +msgstr "پارامتر اضاÙÛŒ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "" +msgstr "پارامترهای یدکی Ù…Ùید تنها برای \"Metroid Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." -msgstr "استخراج کردن تمامی اسناد..." +msgstr "استخراج همه Ùایل ها..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." -msgstr "استخراج کردن Apploader..." +msgstr "استخراج بارگذار برنامه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." -msgstr "استخراج کردن DOL..." +msgstr "استخراج دال..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." -msgstr "استخراج کردن پوشه..." +msgstr "استخراج پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." -msgstr "استخراج کردن سند..." +msgstr "استخراج Ùایل..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." -msgstr "استخراج کردن پارتیشن..." +msgstr "استخراج پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" -msgstr "استخراج کردن تمامی اسناد" +msgstr "استخراج کردن همه Ùایل ها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "استخراج کردن..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" -msgstr "" +msgstr "بایت ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" -msgstr "" +msgstr "پخش کننده ÙÛŒÙÙˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 msgid "FRANCE" msgstr "Ùرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" -msgstr "" +msgstr "اندازه ا٠اس تی:" #: Source/Core/Core/Src/NetPlayClient.cpp:77 msgid "Failed to Connect!" msgstr "اتصال با شکست مواجه شد!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" -msgstr "" +msgstr "پذیرÙتن با شکست مواجه شد!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" -msgstr "" +msgstr "استخراج به %s با شکست مواجه شد!" #: Source/Core/Core/Src/DSP/DSPCore.cpp:66 #, c-format @@ -2172,20 +2311,34 @@ msgid "" "You may use the DSP HLE engine which does not require ROM dumps.\n" "(Choose it from the \"Audio\" tab of the configuration dialog.)" msgstr "" +"بارگذاری حاÙظه Ùقط خواندنی پردازشگر صدای دلÙین با شکست مواجه شد:\t%s\n" +"\n" +"این Ùایل برای استÙاده از برابرساز سطح پائین پردازشگر صدای دلÙین لازم است.\n" +"دلÙین به دلیل حق انتشار شامل این Ùایل نیست.\n" +"از نرم اÙزار DSPSpy برای نسخه برداری از کنسول واقعی خود استÙاده کنید.\n" +"\n" +"شما Ù…ÛŒ توانید از موتور برابر ساز سطح بالای پردازشگر صدای دلÙین استÙاده کنید " +"Ú©Ù‡ نیازی به Ùایل حاÙظه Ùقط خواندنی ندارد.\n" +"(نوع پردازشگر را از تب \"صدا\" در پنجره پیکر بندی انتخاب کنید.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "" +msgstr "بارگذاری bthprops.cpl با شکست مواجه شد" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "" +msgstr "بارگذاری hid.dll با شکست مواجه شد" + +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "نوشتن سرخط برای %s با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" -msgstr "" +msgstr "خواندن banner.bin با شکست مواجه شد" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 #, c-format @@ -2194,107 +2347,119 @@ msgid "" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" +"خواندن بلوک %d داده ذخیره با شکست مواجه شد\n" +"امکان ناقص بودن کارت حاÙظه وجود دارد\n" +"موقعیت Ùایل:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" +"خواندن صحیح بکاپ جدول تخصیص بلوک با شکست مواجه شد\n" +"(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:142 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" msgstr "" +"خواندن صحیح جدول تخصیص بلوک با شکست مواجه شد\n" +"(0x6000-0x7FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286 #, c-format msgid "Failed to read data from file %d" -msgstr "" +msgstr "خواندن داده از Ùایل با شکست مواجه شد %d" #: Source/Core/Core/Src/HW/GCMemcard.cpp:136 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" +"خواندن صحیح بکاپ پوشه با شکست مواجه شد\n" +"(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:130 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" +"خواندن صحیح پوشه با شکست مواجه شد\n" +"(0x2000-0x3FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:119 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" +"خواندن سرخط با شکست مواجه شد\n" +"(0x0000-0x1FFF)" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "" +msgstr "خواندن Ø¢ÛŒ دی یگانه از ایمیج دیسک با شکست مواجه شد" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "" +msgstr "نوشتن BT.DINF به SYSCONF با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 msgid "Failed to write bkhdr" -msgstr "" +msgstr "نوشتن bkhdr با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 #, c-format msgid "Failed to write header for %s" -msgstr "" +msgstr "نوشتن سرخط برای %s با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 #, c-format msgid "Failed to write header for file %d" -msgstr "" +msgstr "نوشتن سرخط برای Ùایل %d با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "پارسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." -msgstr "" +msgstr "نسخه سریع واحد مدیریت حاÙظه. برای همه بازی ها عمل نمی کند." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"همگاه سازی مجدد مهلک. خروج نمایش. (خطا در ویموت پخش: %u !=%u, بایت %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" -msgstr "" +msgstr "پخش کننده ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" -msgstr "مشخصات سند" +msgstr "مشخصات Ùایل" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." -msgstr "" +msgstr "Ùایل شامل کدی نیست." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" -msgstr "" +msgstr "Ùایل تبدیل شده است به .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" msgstr "" +"Ùایل قادر به باز شدن نیست\n" +"یا دارای پسوند معتبر نیست" #: Source/Core/Core/Src/HW/GCMemcard.cpp:84 #, c-format @@ -2302,224 +2467,242 @@ msgid "" "File has the extension \"%s\"\n" "valid extensions are (.raw/.gcp)" msgstr "" +"Ùایل پسوند \"%s\" دارد\n" +"پسوند های معتبر عبارتند از (.raw/,gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" -msgstr "" +msgstr "Ùایل به عنوان کارت حاÙظه شناخته نشده است" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:294 msgid "File not compressed" -msgstr "" +msgstr "Ùایل Ùشرده نیست" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:171 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" -msgstr "" +msgstr "ورودی/خروجی Ùایل: حالت گشودن ناشناس : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" -msgstr "" +msgstr "Ùایل سیستم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" -msgstr "" +msgstr "نوع Ùایل 'ini' ناشناس است! باز نخواهد شد!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "پیدا کردن بعدی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "پیدا کردن قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" -msgstr "" +msgstr "بلوک اول" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" -msgstr "" +msgstr "درست کردن Ú†Ú© سام ها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" -msgstr "" +msgstr "Û±Û¶:Û¹ اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" -msgstr "" +msgstr "Û´:Û³ اجباری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" -msgstr "" +msgstr "کنسول به عنوان NTSC-J اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" -msgstr "" +msgstr "Ùیلتر کردن باÙت اشیاء اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùیلتر کردن باÙت اشیاء اجباری حتی اگر بازی برابرسازی شده صریحا آنرا غیرÙعال " +"کرده باشد.\n" +"بهبود ناچیز Ú©ÛŒÙیت باÙت اشیاء Ú©Ù‡ باعث بروز اشکال در بعضی از بازی ها Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"اجباری کردن خروجی گراÙیک بازی برای وضوح صÙحه عریض.\n" +"سبب خرابی های گراÙیکی در برخی از بازی ها Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " "setting when playing Japanese games." msgstr "" +"حالت NTSC-J اجباری برای استÙاده Ùونت رام ژاپنی.\n" +"این گزینه را رها کنید، حالت پیش Ùرض دلÙین NTSC-U Ù…ÛŒ باشد, دلÙین به طور " +"خودکار این گزینه را برای بازی های ژاپنی Ùعال Ù…ÛŒ کند." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" msgstr "" +"قالب بندی بعنوان اسکی (NTSC\\PAL)?\n" +"انتخاب پاسخ منÙÛŒ برای SJIS (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 msgid "Forward" msgstr "جلو" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "پیدا کردن نتایج %d برای '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Ùریم" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Ùریم" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" -msgstr "" +msgstr "پيشروى Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "نسخه برداری Ùریم از FFV1 استÙاده Ù…ÛŒ کند" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" -msgstr "مشخصات سند" +msgstr "مشخصات Ùریم" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "محدوده Ùریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" -msgstr "" +msgstr "پری&دن از روی Ùریم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "حد Ùریم:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" -msgstr "" +msgstr "Ùریم ها برای ضبط شدن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" -msgstr "نگاه آذاد" +msgstr "نگاه آزاد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Ùرانسوی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38 msgid "Frets" -msgstr "" +msgstr "تحریک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "از" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "تمام صÙحه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" -msgstr "سایز برای حالت تمام صÙحه:" +msgstr "وضوح حالت تمام صÙحه:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" -msgstr "" +msgstr "Ùایل جی سی Ø¢ÛŒ(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "تنضیمات ثبت وقايع" +msgstr "پیکربندی میکروÙÙ† گیم کیوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" -msgstr "" +msgstr "گیم پد گیم کیوب" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" -msgstr "Ø¢ÛŒ دی بازی" +msgstr "Ø¢ÛŒ دی بازی:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" -msgstr "بازی در حال اجراست!" +msgstr "بازی قبلا اجرا شده است!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "بازی اجرا نشده است!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "بازی پیدا نشد!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" -msgstr "" +msgstr "تنظیمات مشخصات بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" -msgstr "" +msgstr "پیکربندی بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Ùایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" -msgstr "" +msgstr "گیم کیوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" -msgstr "" +msgstr "تنظیمات &دسته گیم کیوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" -msgstr "" +msgstr "کارت های حاÙظه گیم کیوب (*.raw.*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" -msgstr "" +msgstr "تنظیمات دسته گیم کیوب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "کدهای گیکو" @@ -2531,42 +2714,46 @@ msgid "" "native code handler by placing the codehandler.bin file into the Sys " "directory and restarting Dolphin.)" msgstr "" +"اجرای کد گیکو با شکست مواجه شد (CT%i CST%i) (%s)\n" +"(Ú†Ù‡ یک کد بد Ú†Ù‡ نوع کد هنوز پشتیبانی نشده است. سعی کنید از دستگذار کد محلی " +"توسط قرار دادن Ùایل codehandler.bin در داخل پوشه Sys Ùˆ شروع مجدد دلÙین " +"استÙاده کنید.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Ú©Ù„ÛŒ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" -msgstr "تنظیمات Ú©Ù„ÛŒ" +msgstr "تنظیمات جامع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "آلمانی" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" +msgstr "گرÙتن کد اکشن ریپلی: Ùهرست بزرگتر از سایز لیست است %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" -msgstr "گرÙیک" +msgstr "گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "تنظیمات گراÙیک" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "بزرگتر از" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2576,8 +2763,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Ú©ÛŒÙیت باÙت اشیائی را Ú©Ù‡ تولید شده است به شدت اÙزایش Ù…ÛŒ دهد در حالی Ú©Ù‡ از " +"رندر برای اÙکت های باÙت اشیا استÙاده Ù…ÛŒ کند.\n" +"بالا بردن وضوح داخلی تاثیر این تنظیم را بهبود خواهد بخشید.\n" +"کارآئی را اندکی کاهش Ù…ÛŒ دهد Ùˆ شاید مشکلاتی را سبب شود (گرچه غیر ممکن است).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "یونانی" @@ -2587,33 +2780,33 @@ msgstr "سبز" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Green Left" -msgstr "" +msgstr "سبز Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Green Right" -msgstr "" +msgstr "سبز راست" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35 msgid "Guitar" msgstr "گیتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" -msgstr "" +msgstr "HCI_CMD_INQUIY Ùرا خوانده شد، لطÙا گزارش دهید!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" -msgstr "" +msgstr "Ù‡Ú©" #: Source/Core/Core/Src/HW/GCMemcard.cpp:158 msgid "Header checksum failed" -msgstr "" +msgstr "Ú†Ú© کردن سر خط برای یاÙتن خطا با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "عبری" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "ارتÙاع" @@ -2621,7 +2814,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2630,55 +2823,67 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"درود،\n" +"\n" +"دلÙین برای اجرا شدن نیاز دارد Ú©Ù‡ پردازنده شما از پسوند های SSE2 پشتیبانی " +"کند.\n" +"متاسÙانه پردازنده شما از پسوند های SSE2 پشتیبانی نمی کند, بنابراین دلÙین " +"اجرا نخواهد شد.\n" +"\n" +"سایونارا!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "مخÙÛŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "مخÙÛŒ کردن نشانگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" "If unsure, leave this checked." msgstr "" +"مخÙÛŒ کردن نشانه گر ماوس اگر بر روی پنجره برابرساز باشد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Home" msgstr "خانه" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "میزبان" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:44 msgid "Hotkey Configuration" -msgstr "پیگربندی شرت کات" +msgstr "پیکربندی شرت کات" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" -msgstr "کاتها" +msgstr "شرت کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "مجارستانی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ویموت مخلوط" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" +"IOCTL_ES_GETVIEWS: آزمایش برای گرÙتن داده از یک بلیط ناشناخته: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2686,66 +2891,77 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" +"IOCTL_ES_LAUNCH: بازی بارگذاری آیزوها یا یک عنوان Ú©Ù‡ در نند نسخه برداری شده " +"شماست را آزمایش کرد\n" +"Ø¢ÛŒ دی عنوان %016llx.\n" +" احتمالا اینک دلÙین هنگ خواهد کرد" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" -msgstr "" +msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" -msgstr "" +msgstr "تنظیمات Ø¢ÛŒ Ù¾ÛŒ ال" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" -msgstr "" +msgstr "Ùروسرخ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" -msgstr "" +msgstr "اشاره گر Ùروسرخ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" -msgstr "" +msgstr "میزان حساسیت Ùروسرخ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" -msgstr "جزئیات ISO" +msgstr "جزئیات آیزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" -msgstr "پوشه های ISO" +msgstr "پوشه های آیزو" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:177 msgid "ITALY" -msgstr "ايتاليا" +msgstr "ایتالیا" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" -msgstr "" +msgstr "تندیس" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"اگر انتخاب شود، ثبت حد جعبه به روز خواهد شد. از سوی بازی های پیپر ماریو " +"استÙاده Ù…ÛŒ شود." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" +"اگر تعداد Ùریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به رÙع " +"آن Ú©Ù…Ú© کند. (روشن = سازگار، خاموش = سریع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" +"اگر شما حد Ùریم را بالاتر از سرعت کامل بازی تنظیم کنید (NTSC:Û¶Û°ØŒ PAL:ÛµÛ°). " +"استÙاده کنید از دریچه صدا با استÙاده از پردازشگر صدای دلÙین (شاید صدا های " +"تیک را درست کند اما همچنین Ù…ÛŒ تواند موجب نویز ثابت بسته به بازی شود)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" -msgstr "" +msgstr "تغییرات قالب بندی نادیده گرÙته شود" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2753,8 +2969,13 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"همه تغییرات قالب بندی حاÙظه میانجی Ùریم جاساز شده (EFB) را نادیده بگیر.\n" +"کارآئى را در بسیاری از بازی ها بدون اثری منÙÛŒ بالا Ù…ÛŒ برد. گرچه سبب نقص های " +"گراÙیکی در تعداد Ú©Ù…ÛŒ از بازی های دیگر Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2762,56 +2983,63 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نادیده گرÙتن هر درخواستی از پردازنده برای خواندن Ùˆ یا نوشتن به حاÙظه میانجی " +"Ùریم جاساز شده (EFB).\n" +"کارآئى را در بعضی از بازی ها را بالا Ù…ÛŒ برد، اما سبب از کار اÙتادن برخی " +"امکانات بازی Ùˆ یا نقص های گراÙیکی Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" -msgstr " وارد کردن Save" +msgstr "وارد کردن ذخیره" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59 msgid "Import failed, try again?" -msgstr "وارد کردن با شکست مواجه شد, سعی دوباره؟" +msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" +"پسوند Ùایل وارد شده جی اس سی است\n" +"اما دارای سرخط صحیح نمی باشد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" -msgstr "" +msgstr "طول Ùایل وارد شده نامعتبر Ù…ÛŒ باشد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" +"پسوند Ùایل وارد شده اس ای ÙˆÛŒ Ù…ÛŒ باشد\n" +"اما دارای سرخط صحیح نمی باشد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" +"کارآئى را بالا Ù…ÛŒ برد اما سبب نقص های گراÙیکی در اکثر بازی هایی Ú©Ù‡ بر " +"برابرسازی مه تکیه Ù…ÛŒ کنند Ù…ÛŒ شود.\n" "\n" -"If unsure, leave this unchecked." -msgstr "" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "در بازی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" -msgstr "در-بازی" +msgstr "در بازی" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "مشخصات" @@ -2819,7 +3047,7 @@ msgstr "مشخصات" msgid "Information" msgstr "مشخصات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "ورودی" @@ -2829,108 +3057,114 @@ msgstr "درج" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 msgid "Insert Encrypted or Decrypted code here..." -msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." +msgstr "درج کد رمز شده Ùˆ یا کش٠شده..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" -msgstr "درج کارت SD" +msgstr "درج کارت اس دی" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:33 msgid "Insert name here.." msgstr "درج اسم..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" -msgstr "نصب WAD" +msgstr "نصب واد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" -msgstr "نصب به منوی Wii" +msgstr "نصب به Ùهرست انتخاب ÙˆÛŒ" #: Source/Core/Core/Src/MemTools.cpp:248 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +"نصب دستگذار استثناء Ùراخوانده شد، اما این پلتÙورم هنوز از این امکان پشتیبانی " +"نمی کند." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." -msgstr "در حال نصب WAD..." +msgstr "در حال نصب واد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "خطای بررسی درست بودن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "بررسی درست بودن به پایان رسید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد " +"خراب یا نادرست وصله خورده است." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" -msgstr "" +msgstr "واسط گراÙیک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" -msgstr "" +msgstr "تنظیمات واسط گراÙیک" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" -msgstr "" +msgstr "خطای داخلی LZO - Ùشرده سازی با شکست مواجه شد" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" +"خطای داخلی LZO - ناهمÙشرده سازی با شکست مواجه شد (%d) (%li, %li) \n" +"سعی مجدد برای بار گذاری وضعیت" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" -msgstr "" +msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" -msgstr "سایز داخلی:" +msgstr "وضوح داخلی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr "Ù…Ùسر (بسیار کند)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" -msgstr "" +msgstr "صÙحه نخست" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" -msgstr "سایز نا معتبر (%x) یا Magic word (%x)" +msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" -msgstr "مقدار نا معتبر" +msgstr "مقدار نامعتبر!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" -msgstr "bat.map نا معتبر یا ورودی پوشه" +msgstr "bat.map نامعتبر یا ورودی پوشه" #: Source/Core/Core/Src/CoreTiming.cpp:548 #, c-format msgid "Invalid event type %i" -msgstr "واقعه نا معتبر %i" +msgstr "نوع واقعه نامعتبر %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" -msgstr "سند نا معتبر" +msgstr "Ùایل نامعتبر" #: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:40 #, c-format @@ -2939,47 +3173,50 @@ msgid "" "%s\n" " You may need to redump this game." msgstr "" +"در gcm زیر opening.bnr نامعتبر پیدا شد:\n" +"%s\n" +"شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" -msgstr "سند ضبط نا معتبر" +msgstr "Ùایل ضبط نامعتبر" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "پارامتر های جستجوی نامعتبر (هیچ شیئ انتخاب نشده)" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 +msgid "Invalid search string (couldn't convert to number)" +msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عدد نیست)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 -msgid "Invalid search string (couldn't convert to number)" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "رشته جستجوی نامعتبر (Ùقط رشته های با طول زوج پشتیبانی Ù…ÛŒ شود)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" -msgstr "وضیعت نا معتبر" +msgstr "وضعیت نامعتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" -msgstr "ایتالیائی" +msgstr "ایتالیایی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:188 msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" -msgstr "" +msgstr "ری کامپایلر جیت (تایید شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" -msgstr "" +msgstr "ری کامپایلر آزمایشی جیتیل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "ژاپنی" @@ -2987,53 +3224,60 @@ msgstr "ژاپنی" msgid "KOREA" msgstr "کره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Ù†Ú¯Ù‡ داشتن پنجره بازی بر روی پنجره های دیگر.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "پنجره را بر راس Ù†Ú¯Ù‡ دار" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "کره ای" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" -msgstr "" +msgstr "ال" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "L Button" -msgstr "" +msgstr "دکمه ال" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "" +msgstr "ال آنالوگ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" -msgstr "آخرین State بازنویسی شده" +msgstr "آخرین وضعیت بازنویسی شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" -msgstr "آخرین State ذخیره شده" +msgstr "آخرین وضعیت ذخیره شده" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -3042,152 +3286,166 @@ msgstr "Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60 msgid "Left Stick" -msgstr "" +msgstr "استیک Ú†Ù¾" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" +"کلیک Ú†Ù¾ برای کش٠کلیدهای Ùوری.\n" +"کلید Ùاصله برای پاک کردن." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" +"کلیک Ú†Ù¾ برای کش٠ورودی.\n" +"کلیک وسط برای پاک کردن.\n" +"کلیک راست برای گزینه های بیشتر." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" +"کلیک Ú†Ù¾/راست برای گزینه های بیشتر.\n" +"کلیک وسط برای پاک کردن." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" -msgstr "" +msgstr "کمتر از" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" -msgstr "" +msgstr "محدود کردن توسط تعداد Ùریم ها بر ثانیه" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" -msgstr "بارگیری" +msgstr "بارگذاری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" -msgstr "بارگیری باÙت اشیاء دلخواه" +msgstr "بارگذاری باÙت اشیاء دلخواه" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "بارگذاری وضعیت - شکا٠۱" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "بارگذاری وضعیت - شکا٠۲" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "بارگذاری وضعیت - شکا٠۳" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "بارگذاری وضعیت - شکا٠۴" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" -msgstr "بارگیری State شکا٠۱" +msgid "Load State Slot 5" +msgstr "بارگذاری وضعیت - شکا٠۵" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" -msgstr "بارگیری State شکا٠۲" +msgid "Load State Slot 6" +msgstr "بارگذاری وضعیت - شکا٠۶" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" -msgstr "بارگیری State شکا٠۳" +msgid "Load State Slot 7" +msgstr "بارگذاری وضعیت - شکا٠۷" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "بارگیری 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 شکا٠۸" +msgstr "بارگذاری وضعیت - شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." -msgstr "بارگیری State..." +msgstr "بارگذاری وضعیت..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" -msgstr "" +msgstr "بارگذاری منوی سیستم ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" -msgstr "" +msgstr "بارگذاری منوی سیستم ÙˆÛŒ %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" +"بارگذاری باÙت اشیاء دستی از User/Load/Textures/game_id/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "" +msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای Ù‡Ú© موجود است." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" -msgstr "ثبت وقايع" +msgstr "ثبت وقایع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" -msgstr "تنضیمات ثبت وقايع" +msgstr "پیکر بندی ثبت وقایع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "ثبت Ùریم بر ثانیه به Ùایل" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" -msgstr "نوع ثبت وقايع" +msgstr "انواع ثبت وقایع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ثبت تعداد Ùریم های پردازش شده در هر ثانیه به User/Logs/fps.txt. زمانی از این " +"ویژگی استÙاده کنید Ú©Ù‡ میخواهید کارائى دلÙین را بسنجید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" -msgstr "خروجی ثبت وقايع" +msgstr "خروجی های واقعه نگار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" -msgstr "در حال ثبت وقايع" +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 "" +msgstr "ارتباط با سرور قطع شد!" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" -msgstr "" +msgstr "دکمه ام" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 #, c-format @@ -3195,48 +3453,50 @@ msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" +"Ú†Ú© سام MD5 ناهمسان است\n" +" %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" -msgstr "" +msgstr "Ù‡Ú© کردن سرعت واحد مدیریت حاÙظه" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" -msgstr "" +msgstr "Ùایل های گیم شارک مد کتذ (*.gcs)" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51 msgid "Main Stick" -msgstr "" +msgstr "استیک اصلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Ø¢ÛŒ دی سازنده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "سازنده" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "حداکثر" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" -msgstr "" +msgstr "کارت حاÙظه Ùایل ذخیره برای این عنوان را دارد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" -msgstr "" +msgstr "کارت حاÙظه قبلا باز شده است" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" -msgstr "" +msgstr "بایت حاÙظه" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "کارت حاÙظه" @@ -3245,8 +3505,10 @@ msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" msgstr "" +"اخطار: قبل از استÙاده از کارت حاÙظه بک آپ بگیرید، شاید درست شود اما اطلاعات " +"از بین خواهد رÙت!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3256,59 +3518,69 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" +"اسم کارت حاÙظه در شکا٠%c ناقص است\n" +"منطقه مشخص نشده است\n" +"\n" +"مسیر شکا٠%c تغییر کرده است به\n" +"%s\n" +"آیا مایل هستید Ùایل قبلی را به مکان جدید Ú©Ù¾ÛŒ کنید؟\n" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "سایز کارت حاÙظه با سرخط تطابق ندارد" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" msgstr "Ùهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "میکروÙÙ†" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:240 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:294 msgid "Modifier" -msgstr "" +msgstr "پیراینده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"تغییر باÙت اشیاء برای نمایش قالبی Ú©Ù‡ در آن کدگشایی شده اند. شروع دوباره " +"برابرسازی در اکثر موارد لازم است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Monospaced font" -msgstr "" +msgstr "Ùونت هم عرض" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" -msgstr "" +msgstr "موشن پلاس" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3318,210 +3590,220 @@ msgid "" "\n" "\n" msgstr "" +"اشاره گر ماوس را بر روی گزینه ها حرکت دهید تا تشریح با جزئیات نمایش داده " +"شود.\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:75 msgid "Multiply" msgstr "ضریب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" +"Ø®ÙÙ‡ کردن اسپیکر ویموت. درست کردن قطعی های تصادÙÛŒ ویموت های واقعی. هیچ تاثیری " +"بر ویموت های برابرسازی شده ندارد." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" -msgstr "" +msgstr "ناپ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "توجه: سایز مسیل با طول حقیقی داده برابر نیست\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" -msgstr "" +msgstr "اضاÙÙ‡ کردن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:124 msgid "NP Begin" -msgstr "" +msgstr "شروع ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:132 msgid "NP Decimal" -msgstr "" +msgstr "دسیمال ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Delete" -msgstr "" +msgstr "حذ٠ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:133 msgid "NP Divide" -msgstr "" +msgstr "جداکردن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:120 msgid "NP Down" -msgstr "" +msgstr "پایین ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:123 msgid "NP End" -msgstr "" +msgstr "پایان ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:111 msgid "NP Enter" -msgstr "" +msgstr "وارد شدن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:127 msgid "NP Equal" -msgstr "" +msgstr "یکسان ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:116 msgid "NP Home" -msgstr "" +msgstr "خانه ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:125 msgid "NP Insert" -msgstr "" +msgstr "درج ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 msgid "NP Left" -msgstr "" +msgstr "Ú†Ù¾ ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:128 msgid "NP Multiply" -msgstr "" +msgstr "تکثیر ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:122 msgid "NP Page Down" -msgstr "" +msgstr "صÙحه پایین ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 msgid "NP Page Up" -msgstr "" +msgstr "صÙحه بالا ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:119 msgid "NP Right" -msgstr "" +msgstr "راست ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:130 msgid "NP Separator" -msgstr "" +msgstr "جدا ساز ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:109 msgid "NP Space" -msgstr "" +msgstr "Ùاصله ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 msgid "NP Subtract" -msgstr "" +msgstr "کاستن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:110 msgid "NP Tab" -msgstr "" +msgstr "تب ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:118 msgid "NP Up" -msgstr "" +msgstr "بالا ان Ù¾ÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "اسم:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "اسم:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" -msgstr "" +msgstr "Ùایل های جی سی Ø¢ÛŒ محلی(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" -msgstr "" +msgstr "پویش جدید" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "صÙحه بعد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" -msgstr "" +msgstr "پویش بعدی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" -msgstr "اسم مستعار" +msgstr "اسم مستعار :" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:201 msgid "No Country (SDK)" -msgstr "" +msgstr "بدون کشور (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" -msgstr "هیچ ISO Ùˆ یا WAD یاÙت نشده است" +msgstr "هیچ آیزو یا وادی پیدا نشد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508 #, c-format msgid "No banner file found for title %s" -msgstr "" +msgstr "Ùایل نشان برای عنوان %s پیدا نشد" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" -msgstr "" +msgstr "تشریحی دردسترس نیست" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" -msgstr "" +msgstr "بدون جاخالی کردن" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" -msgstr "هیچ سندی بارگیری نشده است" +msgstr "هیچ Ùایلی بارگذاری نشده" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" -msgstr "" +msgstr "بدون مقادیر اطلاعاتی Ùهرست پوشه آزاد" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" -msgstr "" +msgstr "بدون Ùایل ضبط شده" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 #, c-format msgid "No save folder found for title %s" -msgstr "" +msgstr "پوشه Ùایل ذخیره برای عنوان %s پیدا نشد" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" -msgstr "هیچکدام" +msgstr "هیچ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" -msgstr "بوکمال" +msgstr "بوکمال نروژی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" -msgstr "" +msgstr "برابر نیست" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" -msgstr "" +msgstr "ست نشده است" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" -msgstr "" +msgstr "متصل نشده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "یادداشت ها" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "یادداشت ها:" @@ -3530,114 +3812,113 @@ msgstr "یادداشت ها:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "توجه" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:105 msgid "Num Lock" -msgstr "" +msgstr "Ù‚ÙÙ„ کلید نام لاک" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " -msgstr "" +msgstr "تعداد کدها:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" -msgstr "" +msgstr "ننچاک" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" -msgstr "" +msgstr "شتاب دهنده ننچاک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "شیی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" -msgstr "" +msgstr "محدوده شیی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "خاموش" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:61 msgid "Offset:" -msgstr "" +msgstr "اÙست:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "پیام های روی صÙحه نمایش" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" -msgstr "" +msgstr "Ùقط بلوک های %d موجود است" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" -msgstr "" +msgstr "باز کردن پوشه &شامل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" -msgstr "" +msgstr "باز کردن پوشه &ذخیره ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." -msgstr "گشودن سند" +msgstr "گشودن Ùایل..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در ساخت زمینه برای دستگاه %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در پیدا کردن دستگاهای صدا" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در باز کردن دستگاه صدا %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" -msgstr "" +msgstr "کدبرداری باÙت اشیاء توسط OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" -msgstr "" +msgstr "کدبرداری باÙت اشیاء توسط OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" -msgstr "اختیارات" +msgstr "گزینه ها" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Orange" msgstr "نارنجی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" +"ترتیب Ùایل ها در پوشه Ùایل با ترتیب بلوک یکسان نیست\n" +"کلیک راست کنید Ùˆ تمام ذخیره ها را صادر کنید،\n" +"Ùˆ ذخیره ها را به کارت حاÙظه ای جدید وارد کنید\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "غیره" @@ -3646,20 +3927,22 @@ msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." msgstr "" +"مشتری دیگری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی غیر Ùعال است. بازی " +"را دستی متوق٠کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "خروجی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." -msgstr "" +msgstr "ض&بط کردن بازی..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "گیم پد" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "گیم پد" @@ -3669,162 +3952,166 @@ msgstr "گیم پد ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:108 msgid "Page Down" -msgstr "صÙحه پائینی" +msgstr "صÙحه پايينی" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:107 msgid "Page Up" msgstr "صÙحه بالایی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" -msgstr "" +msgstr "جÙت شدن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:35 msgid "Paragraph" -msgstr "" +msgstr "پاراگراÙ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:63 msgid "Parameters" -msgstr "" +msgstr "پارامترها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" -msgstr "" +msgstr "پارتیشن %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 -msgid "Per-Pixel Lighting" -msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Ù…Ú©Ø« در پایان Ùیلم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +msgid "Per-Pixel Lighting" +msgstr "نورپردازی به ازای هر پیکسل" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "کامل" #: Source/Core/DolphinWX/Src/FrameAui.cpp:608 #, c-format msgid "Perspective %d" -msgstr "" +msgstr "چشم انداز %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "شروع بازی" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "شروع ضبط" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "شروع بازی/Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "قابل بازی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" -msgstr "" +msgstr "گزینه های بازنواخت" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:578 msgid "Please create a perspective before saving" -msgstr "" +msgstr "لطÙا قبل از ذخیره کردن یک چشم انداز بسازید" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 msgid "Plus-Minus" -msgstr "" +msgstr "مینوس پلاس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "درگاه Û´" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" -msgstr "پرتقال" +msgstr "پرتقالی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" -msgstr "پرتقال" +msgstr "پرتقالی (برزیلی)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "اÙکت ها:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در کنترل کننده پخش. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " -msgstr "حالت های از پيش تنظيم شده" +msgstr "حالت های از پیش تنظیم شده:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 msgid "Prev Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "مقدار قبلی" @@ -3832,91 +4119,91 @@ msgstr "مقدار قبلی" msgid "Print" msgstr "چاپ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" -msgstr "" +msgstr "پروÙایل" #: Source/Core/DolphinWX/Src/ISOProperties.h:55 msgid "Properties" -msgstr "" +msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" -msgstr "" +msgstr "پاکسازی حاÙظه ميانى" #: Source/Core/Common/Src/MsgHandler.cpp:66 msgid "Question" msgstr "سوال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "خارج شدن" #. i18n: Right #: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" -msgstr "" +msgstr "آر" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "R Button" -msgstr "" +msgstr "دکمه آر" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "" +msgstr "آر آنالوگ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" -msgstr "" +msgstr "حاÙطه رم" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:180 msgid "RUSSIA" msgstr "روسیه" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "محدوده" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "واقعی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" -msgstr "Wiimote واقعی" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -msgid "Real Wiimotes" msgstr "ویموت واقعی" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 +msgid "Real Wiimotes" +msgstr "ویموت های واقعی" + +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" -msgstr "" +msgstr "تایید اتصال ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" -msgstr "" +msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" -msgstr "" +msgstr "اطلاعات ضبط" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" -msgstr "" +msgstr "گزینه های ضبط" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Red" @@ -3924,13 +4211,13 @@ msgstr "قرمز" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Red Left" -msgstr "" +msgstr "قرمز Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Red Right" -msgstr "" +msgstr "قرمز راست" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3938,47 +4225,56 @@ msgid "" "\n" "If unsure, select None." msgstr "" +"مقدار بدنمایی تصویر (آلیاسینگ) ایجاد شده از طریق بیت مپ ساختن تصاویر گراÙیک " +"سه بعدی را کاهش Ù…ÛŒ دهد.\n" +"این امر سبب Ù…ÛŒ شود لبه های تصویر پردازش شده هموارتر به نظر برسد.\n" +"سرعت برابرسازی را به شدت کاهش میدهد Ùˆ گاهی اوقات مسائلی را سبب Ù…ÛŒ شود.\n" +"\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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "به روز کردن" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش صحنه به صورت Ùریم سیمی.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" -msgstr "نمایش در صÙحه اصلی" +msgstr "نمایش در پنجره اصلی" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "شروع دوباره" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "نتایج" @@ -3993,9 +4289,9 @@ msgstr "راست" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61 msgid "Right Stick" -msgstr "" +msgstr "استیک راست" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "شوک" @@ -4003,197 +4299,197 @@ msgstr "شوک" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" +"اجرای شبیه ساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه (توصیه " +"نمی شود)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "روسی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" -msgstr "ذخ&یره State" +msgstr "ذخ&یره وضعیت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "نرخ نمونه برداری صدا" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ذخیره" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." -msgstr "ذخیره GCI با عنوان" +msgstr "ذخیره جی سی Ø¢ÛŒ بعنوان..." + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "ذخیره وضعیت - شکا٠۱" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "ذخیره وضعیت - شکا٠۲" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "ذخیره وضعیت - شکا٠۳" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "ذخیره وضعیت - شکا٠۴" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" -msgstr "ذخیره State شکا٠۱" +msgid "Save State Slot 5" +msgstr "ذخیره وضعیت - شکا٠۵" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" -msgstr "ذخیره State شکا٠۲" +msgid "Save State Slot 6" +msgstr "ذخیره وضعیت - شکا٠۶" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" -msgstr "ذخیره State شکا٠۳" +msgid "Save State Slot 7" +msgstr "ذخیره وضعیت - شکا٠۷" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "ذخیره 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 شکا٠۸" +msgstr "ذخیره وضعیت - شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." -msgstr "ذخیره State..." +msgstr "ذخیره وضعیت..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." -msgstr "ذخیره با عنوان" +msgstr "ذخیره بعنوان..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" -msgstr "ذخیره GCM/ISO Ùشرده" +msgstr "ذخیره جی سی ام/آیزو Ùشرده شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" -msgstr "" +msgstr "دخیره چشم انداز Ùعلی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" -msgstr "ذخیره GCM/ISO ناهمÙشرده" +msgstr "ذخیره جی سی ام/آیزو ناهمÙشرده شده" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" +msgstr "ذخیره وضعیت Ùیلم %s خراب است، ضبط Ùیلم میایستد..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" -msgstr "" +msgstr "Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB) تغییر سایز یاÙته" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" -msgstr "" +msgstr "در حال پویش %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" -msgstr "" +msgstr "پویش برای Ùایل های آیزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." -msgstr "" +msgstr "در حال پویش..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" -msgstr "" +msgstr "عکس Ùوری" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:106 msgid "Scroll Lock" -msgstr "" +msgstr "اسکرول لاک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" -msgstr "جوستجو برای کد تقلب" +msgstr "جستجو" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" -msgstr "" +msgstr "Ùیلتر جستجو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" -msgstr "" +msgstr "جستجوی پوشه های Ùرعی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" -msgstr "" +msgstr "جستجوی موضوع Ùعلی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "جستجو برای مقدار هگزا:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" -msgstr "" +msgstr "بخش %s در SYSCONF پیدا نشد" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" -msgstr "انتخاب سند ضبط شده" +msgstr "انتخاب Ùایل ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" -msgstr "انتخاب سند Wii WAD برای نصب" +msgstr "انتخاب Ùایل ÙˆÛŒ واد برای نصب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" "If unsure, use the first one." -msgstr "انتخاب آداپتور سخت اÙزاری" +msgstr "" +"یک آداپتور سخت اÙزاری برای استÙاده انتخاب کنید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، گزینه اول را انتخاب کنید." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:518 msgid "Select a save file to import" -msgstr "انتخاب سند Save برای وارد کردن" +msgstr "یک Ùایل ذخیره برای وارد کردن انتخاب کنید" #: Source/Core/DolphinWX/Src/FrameAui.cpp:362 msgid "Select floating windows" -msgstr "انتخاب پنجره شناور" +msgstr "انتخاب پنجره های شناور" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" -msgstr "انتخاب سند برای بارگیری" +msgstr "انتخاب Ùایل برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" -msgstr "انتخاب سند Save" +msgstr "انتخاب Ùایل ذخیره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" -msgstr "انتخاب State برای بارگیری" +msgstr "انتخاب وضعیت برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" -msgstr "انتخاب State برای ذخیره" +msgstr "انتخاب وضعیت برای ذخیره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4203,12 +4499,25 @@ msgid "" "\n" "If unsure, select Auto." msgstr "" +"انتخاب کنید زمانی Ú©Ù‡ پردازش تصویر انجام Ù…ÛŒ شود کدام نسبت طول به عرض استÙاده " +"شود:\n" +"اتوماتیک: نسبت طول به عرض معین استÙاده Ù…ÛŒ شود\n" +"Û±Û¶:Û¹ به اجبار: کشیدن تصویر به نسبت طول به عرض Û±Û¶:Û¹.\n" +"Û´:Û³ به اجبار: کشیدن تصویر به نسبت طول به عرض Û´:Û³.\n" +"کشیدن به پنجره: کشیدن تصویر به اندازه پنجره.\n" +"\n" +"اگر در این مورد اطمینان ندارید، اتوماتیک را انتخاب کنید." + +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "دست خط انتخاب شده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4217,8 +4526,15 @@ msgid "" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" +"انتخاب Ù…ÛŒ کند وضوح تصویری را Ú©Ù‡ در حالت تمام صÙحه استÙاده شده است.\n" +"این اندازه باید همیشه بزرگ تر یا برابر با وضوح داخلی باشد. تاثیر این بر " +"کارائى ناچیز است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از وضوح میز کارتان استÙاده کنید.\n" +"اگر همچنان اطمینان ندارید، از بالاترین وضوحی Ú©Ù‡ برای شما کار Ù…ÛŒ کند استÙاده " +"کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4227,246 +4543,290 @@ msgid "" "\n" "If unsure, use Direct3D 9." msgstr "" +"انتخاب کنید Ú©Ù‡ Ú†Ù‡ رابط گراÙیکی به طور داخلی بکار گرÙته شود.\n" +"معمولا Direct3D Û¹ سریع ترین است. گرچه OpenGL دقیق تر است. Direct3D Û±Û± چیزی " +"است بین این دو.\n" +"توجه داشته باشید Ú©Ù‡ پشتوانه Direct3D Ùقط در ویندوز موجود است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از Direct3D Û¹ برای ویندوز Ùˆ از OpenGL برای " +"گینو لینوکس/مکینتاش استÙاده کنید." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Ùرستادن" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" -msgstr "" +msgstr "موقعیت سنسور بار:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" +"درگاه سریال Û± - این درگاهی است Ú©Ù‡ دستگاه هایی مانند آداپتور شبکه از آن " +"استÙاده Ù…ÛŒ کنند" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" -msgstr "نصب" +msgstr "ست" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" -msgstr "" +msgstr "ست کردن بعنوان آیزو &پیش Ùرض" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" -msgstr "" +msgstr "ست کردن بعنوان کارت حاÙظه پیش Ùرض %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" +"ست کردن کد اکشن ریپلی_Ùعال است: Ùهرست بزرگتر از سایز لیست کد اکشن ریپلی است " +"%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 -msgid "Settings..." -msgstr "تنظیمات" - -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +msgid "Settings..." +msgstr "تنظیمات..." + +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 +msgid "SetupWiiMem: Cant find setting file" +msgstr "برپاکردن حاÙظه ÙˆÛŒ: ناتوان در پیدا کردن Ùایل تنظیم" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "اسم کوتاه:" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103 -#, fuzzy msgid "Shoulder Buttons" -msgstr "دکمه ها" +msgstr "دکمه های شانه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "نمایش &میز Ùرمان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" -msgstr "نمایش &ثبت وقايع" +msgstr "نمایش &ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" -msgstr "نمایش &نوار وضیعت" +msgstr "نمایش نوار &وضعیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" -msgstr "نمایش &نوار ابزار" +msgstr "نمایش نوار &ابزار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" -msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" +msgstr "نمایش مناطق Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" -msgstr "نمایش Ùریم بر سانیه" +msgstr "نمایش Ùریم بر ثانیه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "نمایش Ùرانسه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" -msgstr "نمایش GameCube" +msgstr "نمایش گیم کیوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "نمایش ایتالیا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "نمایش ژاپن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "نمایش زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" -msgstr "نمایش ثبت وقايع" +msgstr "نمایش &پیکربندی ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" -msgstr "نمایش PAL" +msgstr "نمایش پال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" -msgstr "نمایش پایگاه" +msgstr "نمایش پایگاه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" -msgstr "نمایش منطقه" +msgstr "نمایش مناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "نمایش آمار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 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 USA" +msgstr "نمایش ایالات متحده آمریکا" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 +msgid "Show Wad" +msgstr "نمایش واد" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" -msgstr "نمایش Wii" +msgstr "نمایش ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." -msgstr "نمایش پنجره تعید قبل از متوق٠کردن بازی" +msgstr "نمایش پنجره تایید قبل از متوق٠کردن بازی." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" +"نمایش یک پنجره پیام زمانی Ú©Ù‡ خطای جدی رخ داده است.\n" +"غیر Ùعال کردن این گزینه شاید از نمایش پیام های غیر ضروری Ùˆ آزار دهنده پیش " +"گیری کند، اما همچنین بدان معناست Ú©Ù‡ دلÙین بدون هیچ توضیحی بطور ناگهانی خراب " +"Ù…ÛŒ شود." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 +msgid "Show first block" +msgstr "نمایش بلوک اول" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "نمایش شمارنده تاخیر" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"نمایش پیام ها روی مناطق صÙحه برابرساز.\n" +"این پیام ها شامل نوشتن کارت حاÙظه، پشتوانه ویدیویی Ùˆ اطلاعات پردازشگر Ùˆ " +"پاکسازی حاÙظه نهانگاه جیت Ù…ÛŒ شود." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 +msgid "Show save blocks" +msgstr "نمایش بلوک های ذخیره" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +msgid "Show save comment" +msgstr "نمایش توضیح ذخیره" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 +msgid "Show save icon" +msgstr "نمایش تندیس ذخیره" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 -msgid "Show first block" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 -msgid "Show save blocks" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 -msgid "Show save comment" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 -msgid "Show save icon" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save title" -msgstr "" +msgstr "نمایش عنوان ذخیره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش تعداد Ùریم های پردازش شده بر ثانیه به عنوان سنجش سرعت برابرساز.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" -msgstr "" +msgstr "نمایش ناشناخته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش آمار های متÙرقه.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" -msgstr "" +msgstr "ویموت Ùرعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "چینی ساده شده" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" +msgstr "جهش از روی بایوس" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" -msgstr "" +msgstr "از قلم انداختن مقصد آلÙا پاس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" -msgstr "" +msgstr "از قلم انداختن دسترسی حاÙظه میانجی Ùریم جاساز شده (EFB) به پردازنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"از قلم انداختن مقصد آلÙا پاس در بسیاری از بازی ها برای اÙکت های متÙرقه " +"گراÙیک استÙاده Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4475,26 +4835,33 @@ msgid "" "\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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" -msgstr "شکا٠A" +msgstr "شکا٠ای" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" -msgstr "شکا٠B" +msgstr "شکا٠بی" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:62 msgid "Snapshot" -msgstr "عکس Ùورى" +msgstr "عکس Ùوری" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "ارائه دهنده نرم اÙزاری" @@ -4505,36 +4872,41 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" +"پشتوانه پردازش تصویر نرم اÙزار دستوری است Ú©Ù‡ کندتر از استÙاده کردن دیگر " +"پشتوانه ها است.\n" +"این گزینه تنها برای اهدا٠نسخه برداری Ù…Ùید است.\n" +"آیا شما واقعا قصد Ùعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان " +"ندارید، 'نه' را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" -msgstr "تنضیمات صدا" +msgstr "تنظیمات صدا" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." -msgstr "" +msgstr "پشتوانه صدا %s معتبر نیست." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format msgid "Sound buffer creation failed: %s" -msgstr "" +msgstr "ایجاد حاÙظه میانجی صدا با شکست مواجه شد: %s" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:31 msgid "Space" msgstr "Ùضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" -msgstr "اسپانیائی" +msgstr "اسپانیایی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" -msgstr "حجم صدای اسپیکر" +msgstr "حجم صدای اسپیکر:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4545,64 +4917,71 @@ msgid "" "\n" "If unsure, select 640x528." msgstr "" +"مشخص کردن وضوح تصویر Ú©Ù‡ پردازش تصویر در آن انجام Ù…ÛŒ شود. وضوح تصویر بالا " +"Ú©ÛŒÙیت تصویر را بسیار زیاد بالا خواهد برد اما برای بازده بسیار سنگین است Ùˆ " +"ممکن است باعث اختلالاتی در برخی از بازی ها شود.\n" +"\"ضریب Û¶Û´Û°xÛµÛ²Û¸\" Ú©Ù…ÛŒ کندتر از \"سایز پنجره\" است اما حاصل مسائل کمتری است. " +"بطور کلی، هر چقدر وضوح داخلی پایین تر باشد، کارائى بهتر خواهد بود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه \"Û¶Û´Û°xÛµÛ²Û¸\" را انتخاب کنید." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" -msgstr "" +msgstr "بالا بردن نرخ نقل Ùˆ انتقال دادهای دیسک" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "" +msgstr "استیک مربع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" -msgstr "" +msgstr "کنترولر استاندارد" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "شروع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" -msgstr "" +msgstr "شروع &نت پلی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" -msgstr "" +msgstr "شروع &ضبط" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" -msgstr "" +msgstr "شروع ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" -msgstr "" +msgstr "وضعیت" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" +msgstr "ذخیره های وضعیت" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" -msgstr "" +msgstr "استیک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "توقÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4610,14 +4989,19 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"نگهداری Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده در باÙت اشیاء پردازشگر گراÙیک.\n" +"این گزینه دقیق نیست، اما برای اکثر بازی ها به خوبی کار Ù…ÛŒ کند Ùˆ نسبت به Ú©Ù¾ÛŒ " +"ای ا٠بی به رم سرعت را به شدت اÙزایش Ù…ÛŒ دهد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" -msgstr "" +msgstr "کشیدن تصویر به سایز Ùعلی پنجره" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43 msgid "Strum" -msgstr "" +msgstr "مرتعش کردن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:78 msgid "Subtract" @@ -4626,77 +5010,76 @@ msgstr "کاستن" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77 #, c-format msgid "Successfully exported file to %s" -msgstr "" +msgstr "صادر کردن Ùایل به %s با موÙقیت انجام شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56 msgid "Successfully imported save files" -msgstr "" +msgstr "Ùایل های ذخیره با موÙقیت وارد شدند" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" -msgstr "" +msgstr "نوسان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "زبان سیستم:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:196 msgid "TAIWAN" -msgstr "" +msgstr "تایوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -#, fuzzy msgid "TAS Input" -msgstr "ورودی" +msgstr "ورودی تاس" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 msgid "Tab" -msgstr "" +msgstr "تب" #: Source/Core/DolphinWX/Src/FrameAui.cpp:509 msgid "Tab split" -msgstr "" +msgstr "جدا کردن تب" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37 msgid "Table Left" -msgstr "" +msgstr "جدول Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38 msgid "Table Right" -msgstr "" +msgstr "جدول راست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" -msgstr "" +msgstr "گرÙتن عکس Ùوری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "تارو کونگا (بنگوس)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" -msgstr "محک زدن" +msgstr "آزمودن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" -msgstr "ذخیره گاه باÙت اشیاء" +msgstr "حاÙظه ميانى باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "قالب بندی باÙت اشیاء" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" -msgstr "" +msgstr "واد با موÙقیت نصب شد" #: Source/Core/Core/Src/ActionReplay.cpp:197 msgid "The address is invalid" @@ -4704,20 +5087,22 @@ msgstr "آدرس بی اعتبار است" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:507 msgid "The checksum was successfully fixed" -msgstr "" +msgstr "Ú†Ú© سام با موÙقیت درست شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" -msgstr "" +msgstr "پوشه برگزیده قبلا در لیست بوده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" "Do you wish to replace it?" msgstr "" +"Ùایل %s قبلا به وجود آمده.\n" +"آیا مایل هستید این Ùایل را جایگزین کنید؟" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format @@ -4725,182 +5110,207 @@ msgid "" "The file %s could not be opened for writing. Please check if it's already " "opened by another program." msgstr "" +"Ùایل %s نمی تواند برای نوشتن باز شود. لطÙا بررسی کنید Ú©Ù‡ این Ùایل قبلا توسط " +"برنامه دیگری باز نشده باشد." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." -msgstr "" +msgstr "Ùایل %s قبلا باز بود، سرخط Ùایل نوشته نخواهد شد." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" -msgstr "" +msgstr "Ùایلی Ú©Ù‡ شما مشخص (%s) کرده اید وجود ندارد" #: Source/Core/DolphinWX/Src/FrameAui.cpp:627 msgid "The name can not be empty" -msgstr "" +msgstr "اسم نمی تواند خالی باشد" #: Source/Core/DolphinWX/Src/FrameAui.cpp:619 msgid "The name can not contain the character ','" -msgstr "" +msgstr "اسم نمی تواند شامل کاراکتر 'ØŒ' باشد" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "" +msgstr "نتیجه کد رمزگشایی شده اکشن ریپلی شامل هیچ خطی نیست." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" "If unsure, use the rightmost value." msgstr "" +"هر Ú†Ù‡ قدر شما این گزینه را ایمن تر میزان کنید، برابرساز باÙت اشیاء به روز " +"شده Ú©Ù… تری را از رم از دست خواهد داد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از Ú†Ù¾ ترین مقدار استÙاده کنید." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" -msgstr "" +msgstr "سایز Ùایل ذخیره ای Ú©Ù‡ سعی در Ú©Ù¾ÛŒ کردن آن دارید بی اعتبار است" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" +"زبان انتخاب شده توسط سیستم شما پشتیبانی نمی شود. برگشت به زبان پیش Ùرض سیستم." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" -msgstr "" +msgstr "نسخه سرور Ùˆ نت پلی مشتری نا سازگار است!" #: Source/Core/Core/Src/NetPlayClient.cpp:40 msgid "The server is full!" -msgstr "" +msgstr "سرور پر شده است!" #: Source/Core/Core/Src/NetPlayClient.cpp:46 msgid "The server responded: the game is currently running!" -msgstr "" +msgstr "سرور پاسخ داد: بازی در حال اجراست!" #: Source/Core/Core/Src/NetPlayClient.cpp:49 msgid "The server sent an unknown error message!" -msgstr "" +msgstr "سرور یک پیغام خطای ناشناخته Ùرستاد!" #: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" -msgstr "" +msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" #: Source/Core/Core/Src/ActionReplay.cpp:198 msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" +"باید بلیطی برای Û°Û°Û°Û°Û°Û°Û°Û±/Û°Û°Û°Û°Û°Û°Û°Û² وجود داشته باشد. نسخه برداری نند شما " +"احتمالا ناقص است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" +"این تنظیمات تنظیمات هسته دلÙین را خنثی Ù…ÛŒ کند.\n" +"نامعین یعنی بازی از تنظیمات دلÙین استÙاده Ù…ÛŒ کند." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" +"این شبیه ساز اکشن ریپلی از کدهایی Ú©Ù‡ توسط خود اکشن ریپلی پیراسته شده باشد " +"پشتیبانی نمی کند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." -msgstr "" +msgstr "این مورد میتواند سبب کند شدن منوی ÙˆÛŒ Ùˆ تعدادی از بازی ها شود." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"این امکان به شما اجاز Ù…ÛŒ دهد تا جای دوربین در بازی را تغيير دهید.\n" +"کلید سمت راست ماوس را Ù†Ú¯Ù‡ دارید Ùˆ با حرکت ماوس دوربین را بگردانید. کلید Ø´ÛŒÙت " +"را Ù†Ú¯Ù‡ دارید Ùˆ با Ùشار یکی از کلید های ص/Ø´/س/ÛŒ دوربین را پله پله حرکت دهید " +"(Ø´ÛŒÙت+Û° برای حرکت سریع تر Ùˆ Ø´ÛŒÙت+Û¹ برای حرکت کندتر) Ùشار کلید Ø´ÛŒÙت+Ù‚ برای " +"بازنشاندن دوربین.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." msgstr "" +"این گزینه ریسمان های ویدیو Ùˆ پردازنده را جدا Ù…ÛŒ کند، بنابراین این ریسمان ها " +"Ù…ÛŒ توانند بر روی هسته های جداگانه اجرا شوند.\n" +"سبب اÙزایش چشم گیر سرعت روی کامپیوترهایی با بیش از یک هسته Ù…ÛŒ شود، اما " +"همچنین Ù…ÛŒ تواند خرابی های گاه Ùˆ بی گاه را سبب شود." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" -msgstr "" +msgstr "این مورد به شما اجازه خواهد داد تا Ùایل پیکربندی INI را ویرایش کنید" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 msgid "Threshold" -msgstr "" +msgstr "سرحد" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" -msgstr "" +msgstr "لرزیدن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "عنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "به" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" -msgstr "" +msgstr "تبدیل انواع ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" -msgstr "" +msgstr "تبدیل حالت تمام صÙحه" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" -msgstr "اوج" +msgstr "بالا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "چینی سنتی" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." -msgstr "" +msgstr "آزمایش برای بارگذاری Ùایل ناشناخته." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" -msgstr "" +msgstr "دکمه ها" #: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" -msgstr "" +msgstr "تلاش برای خواندن از روی SYSCONF نامعتبر" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44 msgid "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" msgstr "" +"تلاش برای خواندن از SYSCONF نامعتبر\n" +"Ø¢ÛŒ دی های بلوتوث ویموت موجود نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "ترکی" @@ -4912,33 +5322,35 @@ msgstr "ديسک" msgid "Type" msgstr "نوع" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" -msgstr "" +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:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" -msgstr "" +msgstr "ویموت UDP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:204 msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#, c-format msgid "UNKNOWN_%02X" -msgstr "ناشناخته" +msgstr "ناشناخته_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" -msgstr "آمریکا" +msgstr "ایالات متحده آمریکا" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:224 msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"قادر به ساختن وصله از مقادیر داده شده نیست.\n" +"ورودی اصلاح نشد." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -4947,83 +5359,91 @@ msgid "" "decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" +"ناتوان در تجزیه خط %lu از کد اکشن ریپلی به عنوان کد رمز شده یا رمز گشایی شده " +"معتبر. وارسی کنید Ú©Ù‡ کد را درست وارد کرده باشید.\n" +"آیا مایل هستید Ú©Ù‡ این خط را نادیده بگیرید Ùˆ به تجزیه ادامه دهید؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" -msgstr "" +msgstr "تعری٠نشده %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" -msgstr "" +msgstr "خنثی کردن وضعیت بارگذاری" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Ùرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوق٠می شود..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "ناشناخته" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" -msgstr "" +msgstr "دستور دی ÙˆÛŒ دی ناشناخته %08x - خطای مهلک" #: Source/Core/Common/Src/SysConf.cpp:145 #, c-format msgid "Unknown entry type %i in SYSCONF (%s@%x)!" -msgstr "" +msgstr "نوع ورودی ناشناخته %i در SYSCONF (%s@%x)!" #: Source/Core/Core/Src/NetPlayClient.cpp:228 #, c-format msgid "Unknown message received with id : %d" -msgstr "" +msgstr "پیام ناشناخته با Ø¢ÛŒ دی %d دریاÙت شد" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" +msgstr "پیام ناشناخته با Ø¢ÛŒ دی:%d از بازیکن:%d بیرون انداختن بازیکن!" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Up" msgstr "بالا" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "به روز کردن" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" -msgstr "" +msgstr "ویموت عمودی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" -msgstr "" +msgstr "استÙاده از حالت پال Û¶Û° هرتز (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" -msgstr "" +msgstr "استÙاده از حالت تمام صÙحه" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" -msgstr "" +msgstr "استÙاده از حالت شانزده شانزدهی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" -msgstr "" +msgstr "استÙاده از دستگذار پنیک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" "\n" "If unsure, leave this unchecked." msgstr "" +"استÙاده از ریسمان های چندگانه برای کدبرداری باÙت اشیاء.\n" +"در نتیجه بالا رÙتن سرعت ممکن است (مخصوصا بر روی پردازندهایی با بیش از دو " +"هسته).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5031,16 +5451,21 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"معمولا اگر کامپایل سایه اÙÚ©Ù† با شکست مواجه شود، یک پیغام خطا نمایش داده Ù…ÛŒ " +"شود.\n" +"اگرچه, این گزینه ممکن است سبب عدم نمایش پنجره های خطا شود تا بازی بدون " +"مزاحمت را از طریق Ùعال کردن این گزینه امکان پذیر سازد.\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "کاربردی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" -msgstr "" +msgstr "هماهنگ کردن Ùرکانس عمودی بازی با صÙحه نمایش" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "مقدار" @@ -5048,23 +5473,23 @@ msgstr "مقدار" msgid "Value:" msgstr "مقدار:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "مقدار:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" -msgstr "" +msgstr "دراز نویسی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "حجم صدا" @@ -5072,37 +5497,40 @@ msgstr "حجم صدا" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "" +msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 msgid "WAD installation failed: error creating ticket" -msgstr "" +msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"هماهنگ کننده Ùرکانس عمودی برای Ú©Ù… کردن پارگی تصویر.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" -msgstr "اختار" +msgstr "اخطار" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع دال در حالت کنسول اشتباه!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع ای ال ا٠در حالت کنسول اشتباه!" #: Source/Core/Core/Src/Boot/Boot.cpp:221 msgid "Warning - starting ISO in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع آیزو در حالت کنسول اشتباه!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 #, c-format @@ -5111,8 +5539,11 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" +"اخطار! این خردمندانه است Ú©Ù‡ از همه Ùایل های درون پوشه بکاپ بگیرید:\n" +"%s\n" +"آیا مایل به ادامه هستید؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5120,24 +5551,35 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" +"اخطار: این هر ذخیره موجودی Ú©Ù‡ در پوشه است را بازنویسی خواهد کرد:\n" +"%s\n" +"Ùˆ داشتن اسم یکسان مانند یک Ùایل در کارت حاÙظه شما\n" +"ادامه Ù…ÛŒ دهید؟" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +"اخطار: شما Ùایل دخیره ای را بارگذاری کرده‌اید Ú©Ù‡ پس از پایان Ùیلم در حال " +"نمایش است. (بایت %u > %u) (Ùریم %u > %u). پیش از ادامه شما باید Ùایل ذخیره " +"دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط خواندنی خاموش بارگذاری " +"کنید." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +"اخطار: شما ذخیره Ùیلمی را بارگذاری کرده اید Ú©Ù‡ با بایت %d (0x%X) مطابقت " +"ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را " +"با حالت Ùقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5155,59 +5597,73 @@ msgid "" "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +"اخطار: شما ذخیره Ùیلمی را بارگذاری کرده اید Ú©Ù‡ با Ùریم %d مطابقت ندارد. قبل " +"از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط " +"خواندنی خاموش بارگذاری کنید. وگرنه شاید شما.\n" +"\n" +"اطلاعات بیشتر: طول Ùریم های Ùیلم Ùعلی %d است Ùˆ طول Ùریم های Ùیلم ذخیره شده " +"%d است.\n" +"\n" +"روی Ùریم %dØŒ Ùیلم Ùعلی چاپ شده است:\n" +"شروع=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"روی Ùریم %dØŒ Ùیلم Ùعلی ذخیره شده چاپ شده است:\n" +"شروع=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." -msgstr "" +msgstr "نویسنده Ùایل ویو - Ùایل باز نیست." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" -msgstr "" +msgstr "بد شانسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" -msgstr "" +msgstr "Ù‡Ú© کردن صÙحه عریض" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" -msgstr "" +msgstr "ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" -msgstr "ميز Ùرمان Wii" +msgstr "میز Ùرمان ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" -msgstr "ریشه Wii NAND:" +msgstr "ریشه ÙˆÛŒ نند:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" -msgstr "وارد کردن Wii Save" +msgstr "وارد کردن Ùایل ذخیره ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" -msgstr "سند Wii save (*.bin)|*.bin" +msgstr "Ùایل های ذخیره ÙˆÛŒ (*.bin)|*.bin" #: Source/Core/DiscIO/Src/WiiWad.cpp:81 msgid "WiiWAD: Could not read from file" -msgstr "WiiWAD: قادر به خواندن از سند نیست" +msgstr "ÙˆÛŒ واد: ناتوان در خواندن از Ùایل" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 +#, c-format msgid "Wiimote %i" -msgstr "اتصال Wiimote %i" +msgstr "ویموت %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5215,81 +5671,84 @@ msgid "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" msgstr "" +"ویموت %i توسط سیستم قطع شد.\n" +"شاید این بازی از مولتی ویموت پشتیبانی نمی کند،\n" +"یا شاید این قطعی ناشی از وقÙÙ‡ بیهوده یا دلیلی دیگر باشد.\n" +"آیا Ù…ÛŒ خواهید بی درنگ از نو متصل شوید؟" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" -msgstr "Wiimote متصل شد" +msgstr "ویموت متصل شد" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" -msgstr "موتور Wiimote" +msgstr "موتور ویموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" -msgstr "تنضیمات Wiimote" +msgstr "تنظیمات ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" -msgstr "Wiimote واقعی" +msgstr "ویموت ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:134 msgid "Windows Left" -msgstr "" +msgstr "پنجره ها Ú†Ù¾" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:136 msgid "Windows Menu" -msgstr "" +msgstr "Ùهرست پنجره ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:135 msgid "Windows Right" -msgstr "" +msgstr "پنجره ها راست" #: Source/Core/DolphinWX/Src/LogWindow.cpp:147 msgid "Word Wrap" -msgstr "" +msgstr "پیچیدن کلمه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." -msgstr "در حال کار کردن..." +msgstr "در حال کار..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" -msgstr "" +msgstr "نوشتن در میز Ùرمان" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" -msgstr "" +msgstr "نوشتن به صورت اشکال زدایی" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" -msgstr "" +msgstr "نوشتن به Ùایل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" -msgstr "" +msgstr "نوشتن در پنجره" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60 #, c-format msgid "XAudio2 CreateSourceVoice failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - ساخت آوای منبع با شکست مواجه شد: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114 #, c-format msgid "XAudio2 init failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - اينيت با شکست مواجه شد: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124 #, c-format msgid "XAudio2 master voice creation failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - ساخت آوای مستر منبع با شکست مواجه شد: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" -msgstr "" +msgstr "ثبت اکس اÙ" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5300,36 +5759,41 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"شما از رام های پردازشگر صدای دلÙین مجانی Ú©Ù‡ توسط تیم دلÙین ساخته شده استÙاده " +"Ù…ÛŒ کنید.\n" +"Ùقط بازی های ماکرو کد زلدا درست با این رام ها کار Ù…ÛŒ کنند.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." -msgstr "" +msgstr "شما نمی توانید قطعاتی Ú©Ù‡ حاوی صÙحات Ù…ÛŒ باشند را ببندید." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" -msgstr "شما باید بازی را انتخاب کنید!!" +msgstr "شما باید یک بازی انتخاب کنید!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" -msgstr "شما باید اسم را وارد کنید!" +msgstr "شما باید یک اسم وارد کنید!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" +msgstr "شما باید یک مقدار صحیح برای دسیمال، هگزادسیمال یا اکتال وارد کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." -msgstr "" +msgstr "شما باید یک اسم معتبر برای پروÙایل وارد کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" +msgstr "برای اعمال تغییرات شما باید دلÙین را از نو اجرا کنید." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" msgstr "" +"به نظر Ù…ÛŒ رسد Ùایل آیزو/جی سی ام شما نامعتبر Ù…ÛŒ باشد (کشور نامعتبر).\n" +"ادامه با ناحیه پال؟" #: Source/Core/Common/Src/SysConf.cpp:58 #, c-format @@ -5338,38 +5802,45 @@ msgid "" "It should be 0x%04x (but is 0x%04llx)\n" "Do you want to generate a new one?" msgstr "" +"سایز Ùایل SYSCONF شما اشتباه است.\n" +"سایز Ùایل باید 0x%04x باشد (اما سایز این Ùایل 0x%04llx است)\n" +"آیا میخواهید یک Ùایل جدید تولید شود؟" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" -msgstr "" +msgstr "Ù‡Ú© اÙسانه زلدا: شاهدخت سپیده دم" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" -msgstr "" +msgstr "کد صÙر Û³ پشتیبانی نمی شود" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" -msgstr "" +msgstr "کد ناشناخته صÙر به دلÙین: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" -msgstr "[انتظار]" +msgstr "[ منتظر بمانید ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"[خراب]\n" +"مشخص کردن مناطقی Ú©Ù‡ حاÙظه میانجی Ùریم جاساز شده از آن Ú©Ù¾ÛŒ شده است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 msgid "[Custom]" msgstr "[دستی]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5379,8 +5850,16 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[آزمایشی]\n" +"با هد٠بالا بردن سرعت برابرسازی از طریق بارگذاری کردن کدگشایی باÙت اشیاء به " +"پردازشگر گراÙیکی Ú©Ù‡ استÙاده Ù…ÛŒ کند از چهارچوب OpenCL .\n" +"اگر چه، درحال حاضر این شناخته شده است Ú©Ù‡ کاستی های باÙت اشیاء را در بازی های " +"گوناگون سبب Ù…ÛŒ شود. همچنین این در اکثر موارد کندتر از کدگشایی باÙت اشیاء " +"توسط پردازنده عادی است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5388,87 +5867,237 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[آزمایشی]\n" +"سرعت برابرسازی را با ذخیره کردن Ùهرست های نمایش اندکی بالا Ù…ÛŒ برد.\n" +"گرچه امکان بروز مشکل وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" -msgstr "" +msgstr "بارگذار برنامه (.img)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 msgid "failed to read bk header" -msgstr "" +msgstr "خواندن سرخط بی Ú©ÛŒ با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375 #, c-format msgid "failed to read data from file: %s" -msgstr "" +msgstr "خواندن دادها از Ùایل با شکست مواجه شد: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97 msgid "failed to read header" -msgstr "" +msgstr "خواندن سرخط با شکست مواجه شد" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." -msgstr "" +msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطÙا گزارش دهید." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" +msgstr "یک ذخیره ÙˆÛŒ نیست یا شکست برای خواندن سایز سرخط Ùایل %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:456 #, c-format msgid "unknown cmd 0x%08x" -msgstr "" +msgstr "Ùرمان ناشناخته 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" -msgstr "" +msgstr "خطای 1- wxExecute در اجرای برنامه!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 msgid "zFar Correction: " -msgstr "" +msgstr "اصلاح z دور:" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 msgid "zNear Correction: " -msgstr "" +msgstr "اصلاح z نزدیک:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" -msgstr "" +msgstr "| یا" + +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "تولید میپ مپ بطور خودکار نسبت به کدگشایی آنها از حاÙظه.\n" +#~ "کارائى را اندکی اÙزایش Ù…ÛŒ دهد اما ممکن است سبب نقص باÙت اشیاء شود.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." + +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "محاسبه مقادیر عمق هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" +#~ "در تضاد با نورپردازی پیکسل (Ú©Ù‡ صرÙا یک بهبود است)ØŒ محاسبات عمق هر پیکسل " +#~ "برای به طور صحیح برابرسازی کردن تعداد Ú©Ù…ÛŒ از بازی ها لازم است.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #~ msgid "Clear failed." #~ msgstr "پاک کردن با شکست مواجه شد." #~ msgid "Connected to %i Wiimotes" -#~ msgstr "اتصال به Wiimotes %i" +#~ msgstr "اتصال به ویموت ها %i" + +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ساخته شده توسط KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ساخته شده توسط Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." +#~ "com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ساخته شده توسط VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "ساخته شده توسط black_rider Ùˆ منتشر شده در ForumW.org > Web Developments" #~ msgid "Danish" #~ msgstr "دانمارکی" +#~ msgid "Disable Lighting" +#~ msgstr "از کارانداختن روشنایی" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "از کارانداختن Per-Pixel Depth" + +#~ msgid "Disable Textures" +#~ msgstr "از کارانداختن باÙت اشیاء" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "از کارانداختن باÙت اشیاء.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." + #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" #~ "Keep Dolphin portable?" #~ msgstr "" #~ "دلÙین با مکان نصب شده پيکربندى نشده است.\n" -#~ "دلÙین را Portable نگاه دارم؟" +#~ "دلÙین را سبک نگاه دارم؟" + +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ùعال کردن دریچه صدا" + +#~ msgid "Enable BAT" +#~ msgstr "Ùعال کردن انتقال آدرس بلوک" #~ msgid "Enable DTK Music" -#~ msgstr "Ùعال کردن موزیک DTK" +#~ msgstr "Ùعال کردن موزیک دی تی Ú©ÛŒ" + +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "انتقال آدرس بلوک را Ùعال Ù…ÛŒ کند; کارایی واحد مدیریت حاÙظه. بالا بردن دقت " +#~ "سخت اÙزار، اما سبب کند شدن برابرسازی میگردد. (روشن = سازگار، خاموش = سریع)" + +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "خطا در ویموت پخش. %u != %uØŒ بایت %d.\n" +#~ "ببخشید، ضبط ÙˆÛŒ بطور موقتی خراب است." + +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "خروج دلÙین با برابرساز" + +#~ msgid "Fast Mipmaps" +#~ msgstr "میپ مپ های سریع" #~ msgid "Hide Shader Errors" -#~ msgstr "مخÙÛŒ کردن خطاهای Shader" +#~ msgstr "مخÙÛŒ کردن خطاهای سایه زن" + +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "کارآئى را بالا Ù…ÛŒ برد اما سبب از بین رÙتن روشنایی در اکثر بازی ها Ù…ÛŒ " +#~ "شود.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #~ msgid "Input Source" #~ msgstr "منبع ورودی" #~ msgid "Install directory could not be saved" #~ msgstr "نصب پوشه قابل ذخیره شدن نیست" + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "بارگذاری Ùایل مشخص شده (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Ù‚ÙÙ„ کردن ریسمان ها به هسته های پردازنده (اینتل اچ تی)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "صدای سطح پائین (ال ال ای) Ùˆ یا سطح بالا (اچ ال ای)" + +#~ msgid "Opens the debugger" +#~ msgstr "باز کردن اشکال یاب" + +#~ msgid "Opens the logger" +#~ msgstr "باز کردن واقعه نگار" + +#~ msgid "Sample Rate:" +#~ msgstr "نرخ نمونه برداری:" + +#~ msgid "Show this help message" +#~ msgstr "نمایش این پیام Ú©Ù…Ú©ÛŒ" + +#~ msgid "Specify a video backend" +#~ msgstr "مشخص کردن یک پشتوانه ویدیو" + +#~ msgid "Theme selection went wrong" +#~ msgstr "انتخاب تم اشتباه شد" + +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "این گزینه استÙاده Ù…ÛŒ شود برای کنترل سرعت بازی توسط دریچه صدا.\n" +#~ "از کار انداختن این گزینه سبب سرعت نابهنجار بازی میگردد، از قبیل سرعت خیلی " +#~ "زیاد.\n" +#~ "اما گاهی اوقات Ùعال کردن این گزینه سبب بروز نویز ثابت Ù…ÛŒ شود.\n" +#~ "\n" +#~ "میان بر کیبورد : Ùشار دهید برای از کار انداختن Ùوری دریچه صدا." + +#~ msgid "This is used to play music tracks, like BGM." +#~ msgstr "" +#~ "این گزینه استÙاده Ù…ÛŒ شود برای پخش ترک های موزیک، مانند موزیک پس زمینه." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index ab87e4864d..61f6c4e660 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-13 10:37+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-21 11:57+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(trop nombreux pour être affichés)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Jeu :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -45,7 +45,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i connectée(s)" @@ -152,156 +145,156 @@ msgstr "%sExporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&A propos..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Démarrer à partir du lecteur..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Points d'arrêt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Rechercher des ISOs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestionnaire de &cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fichier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Avancement d'image" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Paramètres &Graphiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Aide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Paramètres des &Raccouris clavier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Charger l'état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Gestionnaire de cartes &mémoires (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ouvrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Options" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Mode &Lecture seule" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "Rafraîchir la &liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Son" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vidéo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Affichage" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -317,27 +310,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(aucun)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,46 +338,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Une fenêtre Netplay est déjà ouverte !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Il n'y a pas de jeu en cours d'émulation." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Aucun périphérique Bluetooth prise en charge n'a été détecté !\n" -"(Seule la pile Bluetooth de Microsoft est prise en charge)." +"Si vous n'utilisez pas la pile Bluetooth de Microsoft, vous pouvez jumeler " +"manuellement vos Wiimotes et utiliser uniquement le bouton \"Rafraîchir\"." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codes AR" @@ -433,19 +428,19 @@ msgstr "Codes AR" msgid "About Dolphin" msgstr "A propos de Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Précision :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Dans le doute, cochez plutôt EFB vers texture." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Action" @@ -479,7 +474,7 @@ msgstr "" "Culprit Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +482,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " "code Ajout (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +491,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " "code Remplir et déplacer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +500,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " "l'écriture de la RAM et Remplir (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,45 +509,48 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " "vers Pointeur (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés " +"(%s)\n" +"Les Master codes ne sont pas requis. Ne les utilisez pas." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erreur Action Replay : code AR non valide à la ligne %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay : Code Conditionnel : Taille non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay : Type de Code Normal non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay ; Code Normal %i : Sous-type non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay : Code Normal 0 : Sous-type non valide %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Carte :" @@ -561,11 +559,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Ajouter un patch" @@ -573,13 +571,13 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Ajouter..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse :" @@ -619,75 +617,78 @@ msgstr "" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajuste le contrôle analogique de pression requise pour activer les boutons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Paramètres avancés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " -"7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 " +"dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analyser" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrage anisotropique :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing :" @@ -699,15 +700,15 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Appliquer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,16 +719,16 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -750,12 +751,12 @@ msgstr "Format d'écran :" msgid "At least one pane must remain open." msgstr "Au moins un panneau doit rester ouvert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -763,24 +764,24 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (taille de la fenêtre)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajuster auto. la taille de la fenêtre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,25 +791,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " -"mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de " -"texture.\n" -"\n" -"Dans le doute, cochez cette case." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registres BP" @@ -816,16 +803,16 @@ msgstr "Registres BP" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Moteur :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -838,16 +825,16 @@ msgstr "Arrière" msgid "Bad File Header" msgstr "Mauvaise entête de fichier" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Bannière :" @@ -855,11 +842,11 @@ msgstr "Bannière :" msgid "Bar" msgstr "Barre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Paramètres de base" @@ -873,7 +860,7 @@ msgstr "" "Echec de la vérification de la somme de contrôle de la Table d'Allocation de " "Blocs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocs" @@ -889,47 +876,53 @@ msgstr "Bleu Gauche" msgid "Blue Right" msgstr "Bleu Droite" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Bas" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Corrompu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer :" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Boutons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -941,36 +934,19 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " -"vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " -"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " -"petit nombre de jeux.\n" -"\n" -"Dans le doute, cochez cette case." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -986,7 +962,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuler" @@ -1003,7 +979,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1014,7 +990,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1022,19 +998,19 @@ msgstr "" "Impossible d'utiliser ce fichier comme carte mémoire.\n" "Essayez-vous d'utiliser le même fichier sur les 2 slots ?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" @@ -1043,28 +1019,28 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalan" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Changer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "&Changer de disque..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Changer de disque" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Changer de Jeu" @@ -1085,11 +1061,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Change le signe du paramètre zNear (après correction)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1097,47 +1072,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Rechercher un cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Vérifier l'intégrité de la partition" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Vérification de l'intégrité..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1145,7 +1120,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1153,8 +1128,8 @@ msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1168,8 +1143,8 @@ msgstr "Classique" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Effacer" @@ -1181,22 +1156,22 @@ msgstr "" "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " "désactivé. Vous devez arrêter le jeu manuellement." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fermer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info du code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code :" @@ -1204,95 +1179,95 @@ msgstr "Code :" msgid "Command" msgstr "Commande" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Compression de l'ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurer le contrôle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurer les manettes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connexion..." @@ -1308,16 +1283,16 @@ msgstr "Contrôle" msgid "Convert to GCI" msgstr "Convertir en GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1326,7 +1301,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossible de créer %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Impossible d'initialiser le moteur %s." @@ -1348,12 +1323,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1363,7 +1338,7 @@ msgstr "" "(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " "pris en charge)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1376,11 +1351,11 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1388,17 +1363,17 @@ msgstr "" "Impossible d'initialiser les composants de base.\n" "Vérifiez votre configuration." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Pays :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Créer un code AR" @@ -1407,25 +1382,7 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Créé par VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Créateur :" @@ -1433,11 +1390,11 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Couper" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1451,12 +1408,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1464,15 +1421,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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tchèque" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1480,36 +1437,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad numérique" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1521,16 +1478,16 @@ msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Date :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Fichiers Datel MaxDrive/Pro (*.sav)" @@ -1542,11 +1499,11 @@ msgstr "Fichiers Datel MaxDrive/Pro (*.sav)" msgid "Dead Zone" msgstr "Zone morte" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Débug" @@ -1554,24 +1511,24 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1580,11 +1537,11 @@ msgid "Default font" msgstr "Police par défaut" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1593,11 +1550,11 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Description" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Détecter" @@ -1610,13 +1567,13 @@ msgstr "" "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " "le buffer de sortie." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1640,28 +1597,16 @@ msgstr "" "La vérification de la somme de contrôle du dossier a échoué\n" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Désactiver l'éclairage" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Désactiver la profondeur / pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Désactiver les textures" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1675,7 +1620,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1691,17 +1636,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Désactive l'application de textures.\n" -"\n" -"Dans le doute, décochez cette case." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disque" @@ -1710,11 +1645,11 @@ msgstr "Disque" msgid "Disc Read Error" msgstr "Erreur de lecture du disque" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1728,20 +1663,24 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "Décodeur Dolby Pro Logic II" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuration des graphismes %s pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Site &web de Dolphin" @@ -1749,32 +1688,32 @@ msgstr "Site &web de Dolphin" msgid "Dolphin Configuration" msgstr "Configuration de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1782,7 +1721,7 @@ msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1790,16 +1729,21 @@ msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "Dolphin n'a pas pu exécuter l'action demandée." + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Bas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Télécharger des codes (sur WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" @@ -1808,27 +1752,27 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Copier les textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1839,7 +1783,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1849,7 +1793,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1859,24 +1803,24 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Néerlandais" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Quitter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Copies de l'EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1890,11 +1834,11 @@ msgstr "" msgid "EUROPE" msgstr "Europe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Premières mises à jour de mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editer" @@ -1902,7 +1846,7 @@ msgstr "Editer" msgid "Edit ActionReplay Code" msgstr "Editer le code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editer la configuration" @@ -1910,12 +1854,12 @@ msgstr "Editer la configuration" msgid "Edit Patch" msgstr "Editer le patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editer..." @@ -1923,15 +1867,15 @@ msgstr "Editer..." msgid "Effect" msgstr "Effets" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1945,7 +1889,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez plutôt Virtuel." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1961,19 +1905,19 @@ msgstr "" "applications homebrew).\n" "Dans le doute, sélectionnez cette case." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Etat de l'émulation :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1989,72 +1933,67 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Activer BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Active le calcul de la boîte liée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Activer le cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2069,7 +2008,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2077,11 +2016,11 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activer les appels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2094,7 +2033,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2106,7 +2045,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2114,21 +2053,35 @@ msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non " +"disponible sur OS X." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " +"Uniquement avec le moteur OpenAL." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " +"Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le " +"fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2140,7 +2093,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2148,7 +2101,7 @@ msgstr "" "Activer le Memory Management Unit (unité de gestion de la mémoire), requis " "pour certains jeux. (ON = Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2162,14 +2115,14 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Anglais" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Améliorations" @@ -2187,17 +2140,17 @@ msgstr "Entrée %d/%d" msgid "Entry 1/%d" msgstr "Entrée 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Egal" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erreur" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " @@ -2239,36 +2192,32 @@ msgstr "" msgid "Execute" msgstr "Exécuter" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Quitter Dolphin avec l'émulateur" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exporter un fichier" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2276,15 +2225,15 @@ msgstr "Exporter toutes les sauvegardes" msgid "Export failed, try again?" msgstr "L'exportation a échoué. Essayer de nouveau ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exporter l'enregistrement sous..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2296,52 +2245,52 @@ msgstr "Paramètres supplémentaires" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraction..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Octet FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Lecteur FIFO" @@ -2349,7 +2298,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Taille FST :" @@ -2357,15 +2306,15 @@ msgstr "Taille FST :" msgid "Failed to Connect!" msgstr "Connexion impossible !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Ecoute impossible !" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2402,12 +2351,17 @@ msgstr "Impossible de charger bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Impossible de charger hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Impossible d'écrire l'entête de %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Impossible de lire banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2485,23 +2439,19 @@ msgstr "Impossible d'écrire l'entête de %s" msgid "Failed to write header for file %d" msgstr "Impossible d'écire l'entête du fichier %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Perse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rapides" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2509,23 +2459,23 @@ msgstr "" "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Infos du fichier" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Le fichier ne contient pas de code." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fichier converti en .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2542,7 +2492,7 @@ msgstr "" "Le fichier a l'extension \"%s\"\n" "Les extensions valides sont (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Le fichier n'est pas reconnu comme une carte mémoire" @@ -2555,47 +2505,47 @@ msgstr "Fichier non compressé" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Trouver le suivant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Trouver le précédent" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forcer 16/9è" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forcer le filtrage de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2608,7 +2558,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2621,7 +2571,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2643,56 +2593,56 @@ msgstr "" msgid "Forward" msgstr "Avant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Trouvé %d résultats pour '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Image " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Info image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Plage d'images :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Image/s max :" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vue libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Français" @@ -2700,20 +2650,20 @@ msgstr "Français" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Plein écran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Résolution en Plein écran :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" @@ -2721,57 +2671,61 @@ msgstr "Fichier GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuration du micro GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID du jeu :" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Le jeu est déjà en cours d'émulation !" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Le jeu n'est pas en cours d'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codes Gecko" @@ -2788,42 +2742,42 @@ msgstr "" "avec le code natif en plaçant le fichier codehandler.bin dans le répertoire " "Sys, puis redémarrez Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Général" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Paramètres généraux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Allemand" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Graphismes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Paramètres graphiques" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Plus grand que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2842,7 +2796,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grèque" @@ -2862,11 +2816,11 @@ msgstr "Vert Droite" msgid "Guitar" msgstr "Guitare" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2874,11 +2828,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hébreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Hauteur" @@ -2886,7 +2840,7 @@ msgstr "Hauteur" msgid "Help" msgstr "Aide" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2904,15 +2858,15 @@ msgstr "" "\n" "Sayonara !\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Cacher" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Masquer le curseur de la souris" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2927,8 +2881,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hôte" @@ -2936,28 +2890,28 @@ msgstr "Hôte" msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongrois" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " "inconnu : %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2970,31 +2924,31 @@ msgstr "" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Paramètres IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Pointeur IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3002,11 +2956,11 @@ msgstr "Dossiers des ISO" msgid "ITALY" msgstr "Italie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icône" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3014,14 +2968,14 @@ msgstr "" "Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les " "jeux Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3032,11 +2986,11 @@ msgstr "" "pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " "selon les jeux)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorer les changements de formats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3050,7 +3004,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3064,7 +3018,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3072,7 +3026,7 @@ msgstr "Importer une sauvegarde" msgid "Import failed, try again?" msgstr "L'importation a échoué. Essayer de nouveau ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3080,11 +3034,11 @@ msgstr "" "Le fichier importé a l'extension GSC\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Le fichier importé a une longueur non valide" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3092,7 +3046,7 @@ msgstr "" "Le fichier importé a l'extension SAV\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3104,27 +3058,16 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" -"\n" -"Dans le doute, décochez cette case." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3132,7 +3075,7 @@ msgstr "Info" msgid "Information" msgstr "Information" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrée" @@ -3144,7 +3087,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3152,11 +3095,11 @@ msgstr "Insérer une carte SD" msgid "Insert name here.." msgstr "Indiquer un nom ici..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3167,23 +3110,23 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Erreur lors de la vérification de l'intégrité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Vérification de l'intégrité terminée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3192,19 +3135,19 @@ msgstr "" "Echec de la vérification de l'intégrité pour la partition %d. Votre copie " "est certainement corrompue ou a été incorrectement patchée." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3213,19 +3156,19 @@ msgstr "" "Erreur interne LZO - échec de la décompression (%d) (%li, %li) \n" "Essayez de charger à nouveau l'état" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3234,11 +3177,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Taille invalide (%x) ou mot Magique (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valeur non valide !" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" @@ -3247,7 +3190,7 @@ msgstr "bar.map ou entrée dir non valide" msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Fichier non valide" @@ -3262,31 +3205,31 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Paramètres de recherche non valide (aucun objet sélectionné)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Texte de recherche non valide (impossible à convertir en nombre)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "Texte de recherche non valide (seules les longueurs de chaînes de caractères " "sont prises en charge)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Etat non valide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italien" @@ -3294,16 +3237,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonais" @@ -3311,7 +3254,7 @@ msgstr "Japonais" msgid "KOREA" msgstr "Corée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3321,17 +3264,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Toujours au premier plan" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coréen" @@ -3349,19 +3292,23 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Dernier état écrasé" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Dernier état sauvegardé" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "Latence :" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3371,8 +3318,8 @@ msgstr "Gauche" msgid "Left Stick" msgstr "Stick Gauche" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3380,7 +3327,7 @@ msgstr "" "Clic gauche pour détecter le raccourci clavier.\n" "Touche Espace pour effacer." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3390,7 +3337,7 @@ msgstr "" "Clic du milieu pour effacer.\n" "Clic droit pour plus d'options." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3398,76 +3345,76 @@ msgstr "" "Clic gauche/droit pour plus d'options.\n" "Clic sur molette pour effacer." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Charger l'état du Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Charger l'état du Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Charger l'état du Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Charger l'état du Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Charger l'état du Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Charger l'état du Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3483,36 +3430,45 @@ msgstr "" "Charger les valeurs de pré-réglage à partir de la palette de hack " "disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Verrouiller les threads aux coeurs" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Journal" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuration de la journalisation" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "Enregistrer le nombre de FPS" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Types de journaux" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/" +"fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de " +"Dolphin.\n" +"\n" +"Dans le doute, décochez cette case." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Sorties des journalisations" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Journalisation" @@ -3520,10 +3476,6 @@ msgstr "Journalisation" msgid "Lost connection to server!" msgstr "Connexion au serveur perdue !" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Emulation audio en bas niveau (LLE) ou en haut niveau (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Bouton M" @@ -3537,12 +3489,12 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" @@ -3551,33 +3503,33 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Concepteur :" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La carte mémoire contient déjà une sauvegarde pour ce titre" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Carte mémoire déjà chargée" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Carte mémoire" @@ -3589,7 +3541,7 @@ msgstr "" "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " "utilisation, devrait être OK mais corruption possible de données !" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3616,20 +3568,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Micro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3638,7 +3590,7 @@ msgstr "Paramètres divers" msgid "Modifier" msgstr "Modif." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3655,16 +3607,16 @@ msgstr "" msgid "Monospaced font" msgstr "Police mono-espacée." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3686,7 +3638,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3694,11 +3646,11 @@ msgstr "" "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " "aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "Note : La taille du flux est différente de la longueur actuelle des données\n" @@ -3787,38 +3739,38 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nom :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nom :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Fichiers natifs GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Page suivante" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Recherche suivante" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Pseudo :" @@ -3826,7 +3778,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3835,8 +3787,8 @@ msgstr "Aucun ISO ou WAD trouvé" msgid "No banner file found for title %s" msgstr "Aucune bannière trouvée pour le titre %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Aucune description disponible" @@ -3844,15 +3796,15 @@ msgstr "Aucune description disponible" msgid "No docking" msgstr "Pas d'attachement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Aucun fichier chargé" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Aucune entrée de dossier d'index libre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Aucun fichier enregistré" @@ -3861,33 +3813,33 @@ msgstr "Aucun fichier enregistré" msgid "No save folder found for title %s" msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notes :" @@ -3896,7 +3848,7 @@ msgstr "Notes :" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Note" @@ -3904,28 +3856,28 @@ msgstr "Note" msgid "Num Lock" msgstr "Verr. Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Nombre de codes :" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuck" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Accéleration du Nunchuck" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Arrêt" @@ -3933,60 +3885,56 @@ msgstr "Arrêt" msgid "Offset:" msgstr "Offset :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "Afficher les messages informatifs" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "%d blocs disponibles seulement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL : impossible de créer le contexte pour le matériel %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL : impossible de trouver des périphériques audio" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL : impossible d'ouvrir le périphérique %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Ouvrir le débuggueur" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Ouvrir le journaliseur" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -3995,7 +3943,7 @@ msgstr "Options" msgid "Orange" msgstr "Orange" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4006,8 +3954,8 @@ msgstr "" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Autres" @@ -4019,19 +3967,19 @@ msgstr "" "Autre client déconnecté pendant que le jeu est en cours d'exécution !! " "NetPlay est désactivé. Vous devez arrêter le jeu manuellement." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Sortie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Jouer l'enregistrement..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Manette" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Manette " @@ -4047,7 +3995,7 @@ msgstr "Défil Bas" msgid "Page Up" msgstr "Défil Haut" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Jumeler" @@ -4059,30 +4007,34 @@ msgstr "Paragraphe" msgid "Parameters" msgstr "Paramètres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Faire une pause à la fin du film" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Parfait" @@ -4091,36 +4043,36 @@ msgstr "Parfait" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Démarrer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Jouer l'enregistrement..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jouable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Options de lecture" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4132,54 +4084,54 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)" @@ -4192,11 +4144,11 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Page précédente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valeur précédente" @@ -4204,7 +4156,7 @@ msgstr "Valeur précédente" msgid "Print" msgstr "Imprimer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4212,7 +4164,7 @@ msgstr "Profil" msgid "Properties" msgstr "Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Vider le cache" @@ -4220,8 +4172,8 @@ msgstr "Vider le cache" msgid "Question" msgstr "Question" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Quitter" @@ -4239,7 +4191,7 @@ msgstr "Bouton R" msgid "R-Analog" msgstr "R Analog." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4247,46 +4199,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Russie" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Etendue" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Réel" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote physique" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimote physique" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmation de reconnexion de la Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconnecter la Wiimote lors du chargement d'un état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Enregistrer" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Infos sur l'enregistrement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Options d'enregistrement" @@ -4302,7 +4254,7 @@ msgstr "Rouge Gauche" msgid "Red Right" msgstr "Rouge Droite" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4317,29 +4269,29 @@ msgstr "" "\n" "Dans le doute, sélectionnez Aucune." -#: 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Rafraîchir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Rafraîchir la liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Retirer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4349,17 +4301,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Résultats" @@ -4376,7 +4328,7 @@ msgstr "Droite" msgid "Right Stick" msgstr "Stick Droit" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4385,118 +4337,114 @@ msgstr "Rumble" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sûr " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Echantillonnage :" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Sauver" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Sauvegarder l'état vers le Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Sauvegarder l'état vers le Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Sauvegarder l'état vers le Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Sauvegarder l'état vers le Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Sauvegarder l'état vers le Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Sauvegarder l'état vers le Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " "film..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Recherche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Capt écran" @@ -4504,23 +4452,23 @@ msgstr "Capt écran" msgid "Scroll Lock" msgstr "Arrêt défil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Rechercher" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Rechercher l'objet actuel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Rechercher une valeur Hexadécimale :" @@ -4531,20 +4479,20 @@ msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4562,23 +4510,23 @@ msgstr "Sélectionner un fichier de sauvegarde à importer" msgid "Select floating windows" msgstr "Sélectionner les fenêtres flottantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4597,11 +4545,15 @@ msgstr "" "\n" "Dans le doute, choisissez Auto." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "Le profil de controleur sélectionné n'existe pas" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Police sélectionnée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4618,7 +4570,7 @@ msgstr "" "Si vous ne savez toujours pas, sélectionnez la plus haute résolution " "affichée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4634,11 +4586,11 @@ msgstr "" "\n" "Dans le doute, sélectionnez Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Envoyer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Position de la Sensor Bar :" @@ -4646,50 +4598,58 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"Configure la latence (en ms). Des valeurs plus élevées peuvent réduire le " +"craquement audio. Uniquement avec le moteur OpenAL." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nom court :" @@ -4697,105 +4657,105 @@ msgstr "Nom court :" msgid "Shoulder Buttons" msgstr "Boutons latéraux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Afficher la &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Afficher le &journal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Afficher la barre d'&état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Afficher la barre d'&outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Afficher les FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Afficher France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Afficher Italie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Afficher Japon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Afficher la langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Afficher la config. de journalisation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Afficher PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Afficher les plateformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Afficher les statistiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Afficher Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Afficher USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Afficher WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4804,27 +4764,41 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Afficher le compteur de lag" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"Affiche les messages par-dessus la zone d'émulation.\n" +"Ces messages incluent les écritures de carte mémoire, la moteur de rendu " +"vidéo et les infos du processeur, et l'effacement du cache JIT." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4836,15 +4810,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Affiche ce message d'aide" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Afficher les inconnus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4854,31 +4824,35 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4890,7 +4864,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4907,17 +4881,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4925,7 +4899,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Capture" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Rendu logiciel" @@ -4942,11 +4916,11 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Paramètres audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Le moteur audio %s n'est pas valide" @@ -4960,17 +4934,17 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espagnol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume du haut-parleur :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4990,11 +4964,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Sélectionner une interface pour les graphismes" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -5002,51 +4972,55 @@ msgstr "Accélerer le taux de transfert du disque" msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Contrôleur standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Démarrer &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Etat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Etats" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "Volant" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Arrêter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5060,7 +5034,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Etirer à la fenêtre" @@ -5081,12 +5055,12 @@ msgstr "Fichier exporté avec succès vers %s" msgid "Successfully imported save files" msgstr "Fichiers de sauvegarde importés avec succès" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Langue du système :" @@ -5094,7 +5068,7 @@ msgstr "Langue du système :" msgid "TAIWAN" msgstr "Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrée TAS" @@ -5115,30 +5089,30 @@ msgstr "Table Gauche" msgid "Table Right" msgstr "Table Droite" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5154,13 +5128,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5183,7 +5157,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -5200,7 +5174,7 @@ msgstr "Le nom ne peut contenir le caractère ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Le code AR décrypté ne contient aucune ligne." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5212,12 +5186,12 @@ msgstr "" "\n" "Dans le doute, utilisez la position la plus à droite." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "La sauvegarde que vous essayez de copier a une taille de fichier non valide" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5250,15 +5224,11 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "Thème" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +msgid "Theme:" +msgstr "Thème :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "La sélection du thème a rencontré un problème" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5266,7 +5236,7 @@ msgstr "" "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " "probablement incomplète." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5274,7 +5244,7 @@ msgstr "" "Ces paramètres écrasent ceux de Dolphin.\n" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5282,14 +5252,16 @@ msgstr "" "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " "l'Action Replay lui-même." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5305,7 +5277,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5318,7 +5290,7 @@ msgstr "" "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " "des plantages." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Ceci vous permettra de modifier manuellement le fichier de configuration INI" @@ -5328,40 +5300,40 @@ msgstr "" msgid "Threshold" msgstr "Seuil" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Activer le plein écran" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -5381,7 +5353,7 @@ msgstr "" "Essai de lecture à partir d'un SYSCONF non valide\n" "Les IDs BT de la Wiimote ne sont pas disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turque" @@ -5393,12 +5365,12 @@ msgstr "Tourne-disque" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP :" @@ -5406,7 +5378,7 @@ msgstr "Wiimote UDP :" msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "Inconnu_%02X" @@ -5434,24 +5406,24 @@ msgstr "" "décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i non défini" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "&Annuler le lancement d'état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Appel 0x80 inattendu. Abandon..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Inconnu" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Commande DVD inconnue %08x - erreur fatale" @@ -5477,32 +5449,32 @@ msgstr "" msgid "Up" msgstr "Haut" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Mettre à jour" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5515,7 +5487,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5530,15 +5502,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitaires" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Synchro verticale" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valeur" @@ -5546,23 +5518,23 @@ msgstr "Valeur" msgid "Value:" msgstr "Valeur :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valeur" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Niveau de détail" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5576,7 +5548,7 @@ msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" msgid "WAD installation failed: error creating ticket" msgstr "Echec de l'installation du WAD : erreur lors de la création du ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5589,16 +5561,16 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attention : démarrage du DOL dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" @@ -5618,7 +5590,7 @@ msgstr "" "%s\n" "Voulez-vous continuer ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5632,7 +5604,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5644,7 +5616,7 @@ msgstr "" "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " "désactivant le mode Lecture seule." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5656,7 +5628,7 @@ msgstr "" "charger cet état en désactivant le mode Lecture seule. Dans le cas " "contraire, il y aura probablement une désynchronisation." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5691,7 +5663,7 @@ msgstr "" "DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fichier non ouvert." @@ -5699,31 +5671,31 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5731,17 +5703,17 @@ msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD : impossible de lire le fichier" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5754,19 +5726,19 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote connectée" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Vibreur de la Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Paramètres de la Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5786,26 +5758,26 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Travail..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Ecrire dans la console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Ecrire dans le débugueur" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Ecrire dans le fichier" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Ecrire dans la fenêtre" @@ -5824,7 +5796,7 @@ msgstr "Echec de l'initialisation de XAudio2 : %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Echec de la création de la voix principale dans XAudio2 : %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5845,23 +5817,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Vous ne pouvez pas fermer des panneaux contenant des appels." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Vous devez choisir un jeu !!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Vous devez entrer un nom !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -5884,25 +5856,25 @@ msgstr "" "Il devrait être de 0x%04x (au lieu de 0x%04llx).\n" "Voulez-vous en générer un nouveau ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Code Zero 3 non pris en charge" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code inconnu pour Dolphin : %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ attente ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5918,7 +5890,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personnalisé]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5937,7 +5909,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5951,11 +5923,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5972,7 +5944,7 @@ msgstr "Impossible de lire les données du fichier %s" msgid "failed to read header" msgstr "Impossible de lire l'entête" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5984,7 +5956,7 @@ msgstr "" "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " "l'entête du fichier %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5993,7 +5965,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6005,13 +5977,16 @@ msgstr "Correction zFar :" msgid "zNear Correction: " msgstr "Correction zNear :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "Image par image" @@ -6078,12 +6053,41 @@ 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" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que " +#~ "par vertex.\n" +#~ "Contrairement à l'éclairage par pixel (qui est une bonne amélioration), " +#~ "les calculs de profondeur par pixel sont nécessaires pour émuler " +#~ "correctement un petit nombre de jeux.\n" +#~ "\n" +#~ "Dans le doute, cochez cette case." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6138,6 +6142,21 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Impossible de charger les infos du plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Créé par KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Créé par VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList" @@ -6147,9 +6166,27 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danois" +#~ msgid "Disable Lighting" +#~ msgstr "Désactiver l'éclairage" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Désactiver la profondeur / pixel" + +#~ msgid "Disable Textures" +#~ msgstr "Désactiver les textures" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Désactiver le haut-parleur de la Wiimote." +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Désactive l'application de textures.\n" +#~ "\n" +#~ "Dans le doute, décochez cette case." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6213,6 +6250,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Activer le contrôle audio" +#~ msgid "Enable BAT" +#~ msgstr "Activer BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6237,6 +6277,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activer l'économiseur d'écran" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de " +#~ "l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais " +#~ "lent à émuler. (ON = Compatible, OFF = Rapide)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6286,6 +6335,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Quitter Dolphin avec l'émulateur" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6298,6 +6350,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Impossible de charger la ROM DSP %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rapides" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6347,6 +6402,16 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Améliore les performances, mais peut faire disparaître l'éclairage dans " +#~ "la plupart des jeux.\n" +#~ "\n" +#~ "Dans le doute, décochez cette case." + #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6389,6 +6454,15 @@ msgstr "| OR" #~ "Charger les mipmaps natifs est plus fidèle, mais peut aussi réduire les " #~ "performances (la distance peut varier cependant)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Verrouiller les threads aux coeurs" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Emulation audio en bas niveau (LLE) ou en haut niveau (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Script de console Lua" @@ -6423,6 +6497,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Ouvrir le débuggueur" + +#~ msgid "Opens the logger" +#~ msgstr "Ouvrir le journaliseur" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6463,6 +6543,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Exécution du script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Echantillonnage :" + #~ msgid "Scale:" #~ msgstr "Echelle :" @@ -6510,6 +6593,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Afficher le nombre d'images rendues par seconde" +#~ msgid "Show this help message" +#~ msgstr "Affiche ce message d'aide" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6551,6 +6637,9 @@ msgstr "| OR" #~ "Les autres options sont des résolutions fixes pour choisir une qualité " #~ "visuelle indépendante de la taille de l'affichage." +#~ msgid "Specify a video backend" +#~ msgstr "Sélectionner une interface pour les graphismes" + #~ msgid "Specify an audio plugin" #~ msgstr "Sélectionner un plugin sonore" @@ -6563,6 +6652,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Le fichier " +#~ msgid "Theme selection went wrong" +#~ msgstr "La sélection du thème a rencontré un problème" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/he.po b/Languages/po/he.po index 151dea89ae..e0c1f0b7e8 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(×רוך מידי)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "משחק:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! ל×" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -52,14 +52,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -139,157 +132,157 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשיות" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&×ודות" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&קובץ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&עזרה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 #, fuzzy msgid "&Hotkey Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&עצור" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -305,27 +298,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -333,44 +326,45 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -389,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -403,19 +397,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -424,8 +418,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -439,42 +433,43 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -482,27 +477,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -511,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -523,13 +518,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -555,68 +550,72 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -628,42 +627,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +670,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -684,43 +683,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -728,17 +719,17 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -751,16 +742,16 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -768,11 +759,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -784,7 +775,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -800,47 +791,53 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -852,29 +849,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -883,7 +870,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -899,7 +886,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -907,24 +894,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -932,28 +919,28 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" @@ -972,11 +959,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -984,47 +970,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1032,14 +1018,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1053,8 +1039,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1064,22 +1050,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1087,95 +1073,95 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1191,16 +1177,16 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1209,7 +1195,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1227,18 +1213,18 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1247,27 +1233,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1276,24 +1262,7 @@ msgstr "" 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:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1301,11 +1270,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1316,12 +1285,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1329,15 +1298,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1345,36 +1314,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1386,16 +1355,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1407,11 +1376,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1419,24 +1388,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1445,11 +1414,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1458,11 +1427,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1473,13 +1442,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1501,28 +1470,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1531,7 +1488,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1541,14 +1498,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1557,11 +1507,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1572,20 +1522,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, fuzzy, c-format msgid "Dolphin %s Graphics Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1593,54 +1547,59 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1649,65 +1608,65 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1717,11 +1676,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1729,7 +1688,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1737,12 +1696,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1750,15 +1709,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1767,7 +1726,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1777,19 +1736,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1799,72 +1758,67 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1873,17 +1827,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1891,7 +1845,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1899,24 +1853,34 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1924,13 +1888,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1941,14 +1905,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1966,17 +1930,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2011,36 +1975,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2048,15 +2008,15 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2068,52 +2028,52 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2121,7 +2081,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2129,15 +2089,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2165,6 +2125,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2234,45 +2199,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2285,7 +2246,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2298,47 +2259,47 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2346,7 +2307,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2354,7 +2315,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2371,56 +2332,56 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2428,21 +2389,21 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2451,58 +2412,62 @@ msgstr "" msgid "GCMic Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2515,42 +2480,42 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2561,7 +2526,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2581,11 +2546,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2593,11 +2558,11 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2605,7 +2570,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2615,15 +2580,15 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2634,8 +2599,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2643,26 +2608,26 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2671,31 +2636,31 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2703,33 +2668,33 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2738,7 +2703,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2747,7 +2712,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2755,23 +2720,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2779,23 +2744,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2803,7 +2761,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2815,7 +2773,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2823,11 +2781,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2836,61 +2794,61 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2899,11 +2857,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2912,7 +2870,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2924,29 +2882,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2954,16 +2912,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2971,24 +2929,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -3006,19 +2964,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3028,96 +2990,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3128,37 +3090,41 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3166,10 +3132,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3181,12 +3143,12 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3195,33 +3157,33 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3231,7 +3193,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3250,20 +3212,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3272,7 +3234,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3284,16 +3246,16 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3308,17 +3270,17 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3406,38 +3368,38 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3445,7 +3407,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3454,8 +3416,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3463,15 +3425,15 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3480,33 +3442,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3515,7 +3477,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3523,28 +3485,28 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3552,60 +3514,56 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3614,15 +3572,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3632,19 +3590,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3660,7 +3618,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3672,30 +3630,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3704,36 +3666,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3745,54 +3707,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3805,11 +3767,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3817,7 +3779,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3825,7 +3787,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3833,8 +3795,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3852,7 +3814,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3860,46 +3822,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3915,7 +3877,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3924,46 +3886,46 @@ msgid "" "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 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3980,7 +3942,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -3989,116 +3951,112 @@ msgstr "" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4106,23 +4064,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4133,20 +4091,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4161,23 +4119,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4188,11 +4146,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4202,7 +4164,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4212,11 +4174,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4224,47 +4186,53 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4272,131 +4240,142 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4404,46 +4383,46 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4451,7 +4430,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4461,17 +4440,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4479,7 +4458,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4491,11 +4470,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4509,17 +4488,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4531,11 +4510,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4543,51 +4518,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4596,7 +4575,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4617,12 +4596,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4630,7 +4609,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4651,30 +4630,30 @@ msgstr "" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4690,13 +4669,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4715,7 +4694,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4732,7 +4711,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4740,11 +4719,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4775,40 +4754,37 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4816,7 +4792,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4824,7 +4800,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4833,40 +4809,40 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4884,7 +4860,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4896,12 +4872,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4909,7 +4885,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4932,24 +4908,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4974,33 +4950,33 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5008,7 +4984,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5017,15 +4993,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5033,23 +5009,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5063,7 +5039,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5072,16 +5048,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5097,7 +5073,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5106,7 +5082,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5114,7 +5090,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5122,7 +5098,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5142,7 +5118,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5150,31 +5126,31 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5182,17 +5158,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5201,19 +5177,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5233,26 +5209,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5271,7 +5247,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5289,23 +5265,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5323,25 +5299,25 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5353,7 +5329,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5364,7 +5340,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5373,11 +5349,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5394,7 +5370,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5404,7 +5380,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5413,7 +5389,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5425,7 +5401,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index e00a7f87ae..ecd7361ad3 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-12-28 09:44+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Hungarian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (túl sok kijelzÅ‘)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Játék:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NEM" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -55,14 +55,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i csatlakoztatva" @@ -152,156 +145,156 @@ msgstr "%sGCI exportálás%s" msgid "%sImport GCI%s" msgstr "%sGCI importálás%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& ÉS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Névjegy..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Bootolás DVD meghajtóról..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Töréspontok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ISO fájlok tallózása..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emuláció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fájl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Képkocka léptetés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Teljes nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Súgó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Ãllás betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memóriakártya kezelÅ‘ (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Megnyitás..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Szünet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Regiszterek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Alapra állítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Hang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Leállítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Eszközök" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Kép" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -317,27 +310,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ISMERETLEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ki)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,46 +338,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Már egy NetPlay ablak nyitva van!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "A játék jelenleg nem fut." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nem található támogatott bluetooth eszköz!\n" "(Csak Microsoft rangsorolású bluetooth eszköz támogatott.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM alaplap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR kódok" @@ -433,19 +428,19 @@ msgstr "AR kódok" msgid "About Dolphin" msgstr "A Dolphin névjegye" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Pontosság:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Művelet" @@ -479,7 +474,7 @@ msgstr "" "FelelÅ‘s kód:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +482,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " "hozzáadásban (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +491,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " "és regiszterben (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +500,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " "és kitöltésben (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,15 +509,16 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " "írásában (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -530,27 +526,27 @@ msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (% msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay hiba: érvénytelen AR kód a(z) %s. sorban" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Feltételes kód: Érvénytelen méret %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Érvénytelen szabályszerű kód típus %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód %i: Érvénytelen alfaj %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód 0: Érvénytelen alfaj %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -559,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -571,13 +567,13 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Hozzáadás..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Cím:" @@ -617,55 +613,56 @@ msgstr "" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " "beállítása." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Haladó beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -674,19 +671,23 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotrópikus szűrés:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Élsimítás:" @@ -699,15 +700,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "A betöltÅ‘ program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "BetöltÅ‘ program:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Alkalmaz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -717,16 +718,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arab" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -734,12 +735,12 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -747,12 +748,12 @@ msgstr "Képarány:" msgid "At least one pane must remain open." msgstr "Legalább egy mezÅ‘nek megnyitva kell maradnia." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -760,24 +761,24 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Automatikus (640x528 többszöröse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatikus (ablak méret)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ablak méret automatikus állítása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -787,25 +788,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " -"memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " -"okozhat.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelölve." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Regiszterek" @@ -814,16 +801,16 @@ msgstr "&Regiszterek" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Feldolgozó:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Háttér bemenet" @@ -836,16 +823,16 @@ msgstr "Vissza" msgid "Bad File Header" msgstr "Rossz fájl fejléc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Játék kép:" @@ -853,11 +840,11 @@ msgstr "Játék kép:" msgid "Bar" msgstr "VevÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Alap beállítások" @@ -869,7 +856,7 @@ msgstr "Basszus" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table ellenÅ‘rzÅ‘ összege nem megfelelÅ‘" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokk" @@ -885,47 +872,53 @@ msgstr "Kék balra" msgid "Blue Right" msgstr "Kék jobbra" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Gomb" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Hibás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Tallózás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Puffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Gombok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -937,36 +930,19 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " -"alapú mélység számítás csupán csak néhány játék pontos emulálásához " -"szükséges.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelölve." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -981,7 +957,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Mégse" @@ -997,7 +973,7 @@ msgstr "%s nem nyitható meg" msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1008,7 +984,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1016,18 +992,18 @@ msgstr "" "A fájl nem használható memóriakártyaként.\n" "Azonos fájlt próbálsz használni mindkét kártya helyén?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelÅ‘ szerint" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" @@ -1035,28 +1011,28 @@ msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalán" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Közép" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Váltás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Lemez &váltás..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Lemez váltás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Játék váltás" @@ -1077,11 +1053,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Csevegés" @@ -1089,47 +1064,47 @@ msgstr "Csevegés" msgid "Cheat Code" msgstr "Csalás kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Csalás keresés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1137,7 +1112,7 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1145,8 +1120,8 @@ msgstr "" "Válassz betöltÅ‘ programnak használandó fájlt: (csak könyvtárakból " "létrehozott lemezekre érvényesíthetÅ‘)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp: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" @@ -1160,8 +1135,8 @@ msgstr "Klasszikus" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Törlés" @@ -1173,22 +1148,22 @@ msgstr "" "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " "kell leállítanod a játékot." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Bezárás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Be&állítások..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kód infó" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kód:" @@ -1196,95 +1171,95 @@ msgstr "Kód:" msgid "Command" msgstr "Parancs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO tömörítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Beállítások" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Irányítás beállítás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Irányítók beállítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "%i Wiimote csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1300,16 +1275,16 @@ msgstr "Irányítás" msgid "Convert to GCI" msgstr "Konvertálás: GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Mag" @@ -1318,7 +1293,7 @@ msgstr "Mag" msgid "Could not create %s" msgstr "%s nem hozható létre" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "%s hang feldolgozó iniciálása sikertelen." @@ -1339,12 +1314,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhetÅ‘ fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s nem menthetÅ‘ el" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1352,7 +1327,7 @@ msgstr "" "Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp fut!\n" "(irányítók beállítása még nem támogatott miközben a játék fut)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1364,11 +1339,11 @@ msgstr "" "\n" "CD/DVD lemezrÅ‘l futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1376,17 +1351,17 @@ msgstr "" "A mag nem iniciálható.\n" "EllenÅ‘rizd a beállításokat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Ország:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR kód létrehozása" @@ -1395,26 +1370,7 @@ msgstr "AR kód létrehozása" msgid "Create new perspective" msgstr "Új perspektíva készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -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:496 -msgid "Created by VistaIcons.com" -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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "KészítÅ‘:" @@ -1422,11 +1378,11 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Levágás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1440,12 +1396,12 @@ msgstr "" msgid "Crossfade" msgstr "Kereszthalkítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ez a könyvtár megváltozott errÅ‘l: %s erre: %s a wxFileSelector után!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1453,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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Cseh" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1469,36 +1425,36 @@ msgstr "" msgid "D-Pad" msgstr "Digitális irányok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1510,16 +1466,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Dátum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro fájlok(*.sav)" @@ -1531,11 +1487,11 @@ msgstr "Datel MaxDrive/Pro fájlok(*.sav)" msgid "Dead Zone" msgstr "Holtsáv" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Hibakeresés" @@ -1543,24 +1499,24 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO kitömörítés" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1569,11 +1525,11 @@ msgid "Default font" msgstr "Alap betűtípus" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Mentés törlése" @@ -1582,11 +1538,11 @@ msgstr "Mentés törlése" msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévÅ‘ '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Leírás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Észlelés" @@ -1599,13 +1555,13 @@ msgstr "" "A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás " "észlelve a DVD lemezrÅ‘l. Beszabályozás." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1629,28 +1585,16 @@ msgstr "" "Könyvtár ellenÅ‘rzÅ‘ összeg hibás\n" " és a könyvtár biztonsági mentés ellenÅ‘rzÅ‘ összeg hibás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Fényhatások kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Képpont mélység kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Textúrák kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1665,7 +1609,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1682,17 +1626,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Textúrák kikapcsolása.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelöletlenül." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Lemez" @@ -1701,11 +1635,11 @@ msgstr "Lemez" msgid "Disc Read Error" msgstr "Lemez olvasási hiba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "KijelzÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1719,20 +1653,24 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &weblap" @@ -1740,32 +1678,32 @@ msgstr "Dolphin &weblap" msgid "Dolphin Configuration" msgstr "Dolphin beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin emulált Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1773,7 +1711,7 @@ msgstr "" "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " "kattintás ide..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1781,16 +1719,21 @@ msgstr "" "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " "kattintás ide a játékok megjelenítéséhez..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Le" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Kódok letöltése (WiiRD adatbázis)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Letöltve %lu kód. (hozzáadva %lu)" @@ -1799,27 +1742,27 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Textúrák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1830,7 +1773,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1840,7 +1783,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1850,24 +1793,24 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holland" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "K&ilépés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB másolatok" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1881,11 +1824,11 @@ msgstr "" msgid "EUROPE" msgstr "EURÓPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Korai memória frissítés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Szerkesztés" @@ -1893,7 +1836,7 @@ msgstr "Szerkesztés" msgid "Edit ActionReplay Code" msgstr "ActionReplay kód szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Beállítások szerkesztése" @@ -1901,12 +1844,12 @@ msgstr "Beállítások szerkesztése" msgid "Edit Patch" msgstr "Patch szerkesztése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Szerkesztés..." @@ -1914,15 +1857,15 @@ msgstr "Szerkesztés..." msgid "Effect" msgstr "Effektus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Az emuláció már fut" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1936,7 +1879,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1952,19 +1895,19 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emuláció állapota:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Használat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1980,72 +1923,67 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "BAT használata" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Gyorsítótár használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2059,7 +1997,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2067,11 +2005,11 @@ msgstr "" "Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " "KI = kompatibilis)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Oldalak bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2083,7 +2021,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2095,7 +2033,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2103,21 +2041,28 @@ msgstr "" "Használatával The Legend of Zelda: Twilight Princess játék sebessége " "növekedik. A TÖBBI játéknál legyen kikapcsolva." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2130,7 +2075,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2138,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:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2152,14 +2097,14 @@ msgstr "" msgid "End" msgstr "Vége" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Angol" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Kép javítások" @@ -2177,17 +2122,17 @@ msgstr "%d/%d bejegyzés" msgid "Entry 1/%d" msgstr "1/%d bejegyzés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "EgyenlÅ‘" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Hiba" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " @@ -2229,36 +2174,32 @@ msgstr "Kivétel kezelÅ‘ - memória terület alatti hozzáférés. %08llx%08llx" msgid "Execute" msgstr "Végrehajtás" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Kilépés a Dolphin emulátorból" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Fájl exportálása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Felvétel exportálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2266,15 +2207,15 @@ msgstr "Minden mentés exportálása" msgid "Export failed, try again?" msgstr "Exportálás sikertelen. Újra megpróbálod?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportálás mentése másként..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2286,52 +2227,52 @@ msgstr "Extra paraméter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Az extra paraméter csak a ''Metroid: Other M'' játékban hasznos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "BetöltÅ‘ program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Kitömörítés..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO bájt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO lejátszó" @@ -2339,7 +2280,7 @@ msgstr "FIFO lejátszó" msgid "FRANCE" msgstr "FRANCIAORSZÃG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST méret:" @@ -2347,15 +2288,15 @@ msgstr "FST méret:" msgid "Failed to Connect!" msgstr "Csatlakozás sikertelen!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Meghallgatás sikertelen!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: 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!" @@ -2391,6 +2332,11 @@ msgstr "A bthprops.cpl betöltése sikertelen" msgid "Failed to load hid.dll" msgstr "A hid.dll betöltése sikertelen" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fejléc írása sikertelen a(z) %s számára" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "A banner.bin beolvasása sikertelen" @@ -2474,45 +2420,41 @@ msgstr "Fejléc írása sikertelen a(z) %s számára" msgid "Failed to write header for file %d" msgstr "Fejléc írása sikertelen a(z) %d fájl számára" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Gyors mipmapek" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo lejátszó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Fájl infó" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "A fájl nem tartalmazott kódokat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fájl átkonvertálva .gci formátumba" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2529,7 +2471,7 @@ msgstr "" "A fájl \"%s\" kiterjesztésű\n" "az érvényes kiterjesztések (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "A fájl nem ismerhetÅ‘ fel memóriakártyaként" @@ -2542,47 +2484,47 @@ msgstr "A fájl nincs tömörítve" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ElsÅ‘ blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Kényszerített 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Textúra szűrés kényszerítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2595,7 +2537,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2607,7 +2549,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2629,57 +2571,57 @@ msgstr "" msgid "Forward" msgstr "ElÅ‘re" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Képkocka rendezés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Képkocka korlát:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Szabad nézet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francia" @@ -2687,20 +2629,20 @@ msgstr "Francia" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "EttÅ‘l:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Teljes méret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Teljes kijelzÅ‘s felbontás:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" @@ -2708,57 +2650,61 @@ msgstr "GCI fájl(*.gci)" msgid "GCMic Configuration" msgstr "GCMic beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Játék azonosító:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "A játék már fut!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "A játék nem fut!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 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:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko kódok" @@ -2773,41 +2719,41 @@ msgstr "" "GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Ãltalános" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ãltalános beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Német" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafikai beállítások" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Nagyobb mint" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2825,7 +2771,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Görög" @@ -2845,11 +2791,11 @@ msgstr "Zöld jobbra" msgid "Guitar" msgstr "Gitár" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hackek" @@ -2857,11 +2803,11 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Héber" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Magasság" @@ -2869,7 +2815,7 @@ msgstr "Magasság" msgid "Help" msgstr "Súgó" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2886,15 +2832,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Elrejtés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Egérmutató elrejtése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2908,8 +2854,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2917,28 +2863,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Magyar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegybÅ‘l: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2951,31 +2897,31 @@ msgstr "" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL beállítások" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR mutató" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -2983,11 +2929,11 @@ msgstr "ISO könyvtárak" msgid "ITALY" msgstr "OLASZORSZÃG" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2995,14 +2941,14 @@ msgstr "" "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " "kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3013,11 +2959,11 @@ msgstr "" "PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " "szabályozást is a DSP beállításoknál. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Formátum változások kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3031,7 +2977,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3046,7 +2992,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Mentés importálása" @@ -3054,7 +3000,7 @@ msgstr "Mentés importálása" msgid "Import failed, try again?" msgstr "Importálás sikertelen, megpróbálod újra?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3062,11 +3008,11 @@ msgstr "" "Az importált fájl gsc kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Az importált fájl hossza érvénytelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3074,7 +3020,7 @@ msgstr "" "Az importált fájl sav kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3086,27 +3032,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " -"játékban.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelöletlenül." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Infó" @@ -3114,7 +3049,7 @@ msgstr "Infó" msgid "Information" msgstr "Információk" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Bemenet" @@ -3126,7 +3061,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3134,11 +3069,11 @@ msgstr "SD kártya behelyezése" msgid "Insert name here.." msgstr "Ãrj be ide nevet..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" @@ -3148,42 +3083,42 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Felület beállítások" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "BelsÅ‘ LZO hiba - tömörítés sikertelen" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3192,19 +3127,19 @@ msgstr "" "BelsÅ‘ LZO hiba - kitömörítés sikertelen (%d) (%li, %li) \n" "Próbáld újratölteni a mentést" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intró" @@ -3213,11 +3148,11 @@ msgstr "Intró" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Érvénytelen méret(%x) vagy mágikus szó (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Érvénytelen érték!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" @@ -3226,7 +3161,7 @@ msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Érvénytelen fájl" @@ -3241,29 +3176,29 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Olasz" @@ -3271,16 +3206,16 @@ msgstr "Olasz" msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japán" @@ -3288,7 +3223,7 @@ msgstr "Japán" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3299,17 +3234,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreai" @@ -3327,19 +3262,23 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Nyelv:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Az utolsó felülírt mentés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Utolsó mentett állás" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3349,8 +3288,8 @@ msgstr "Balra" msgid "Left Stick" msgstr "Bal kar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3358,7 +3297,7 @@ msgstr "" "Bal kattintás a gyorsbillentyű megadásához.\n" "Szóköz lenyomásával törlés." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3368,7 +3307,7 @@ msgstr "" "KözépsÅ‘ kattintás a törléshez.\n" "Jobb kattintás további beállításokhoz." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3376,76 +3315,76 @@ msgstr "" "Bal/jobb kattintás további beállításokhoz.\n" "KözépsÅ‘ kattintás a törléshez." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Ãllás betöltése az 1. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Ãllás betöltése a 2. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Ãllás betöltése a 3. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Ãllás betöltése a 4. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Ãllás betöltése az 5. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Ãllás betöltése a 6. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Ãllás betöltése a 7. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Ãllás betöltése a 8. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Ãllás betöltése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3459,36 +3398,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Folyamatágak magokhoz zárolása" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Napló" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Napló beállítások" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Napló típus" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " +"sebességének méréséhez.\n" +"\n" +"Ha bizonytalan vagy, hagyd kijelöletlenül." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Napló kimenetek" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Naplózás" @@ -3496,10 +3444,6 @@ msgstr "Naplózás" msgid "Lost connection to server!" msgstr "Kapcsolat elveszett a szerverrel!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Alacsony szintű (LLE) vagy magas szintű (HLE) hang" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M gomb" @@ -3513,12 +3457,12 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" @@ -3527,33 +3471,33 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "FÅ‘kar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Gyártó:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "A memóriakártyán már van mentés ehhez a játékhoz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "A memóriakártya már meg van nyitva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Memóriakártya" @@ -3565,7 +3509,7 @@ msgstr "" "Memóriakártya kezelÅ‘ FIGYELMEZTETÉS - Készíts biztonsági mentést a " "használata elÅ‘tt, helyreállítható de a meglévÅ‘ adatok sérülhetnek!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3590,20 +3534,20 @@ msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3612,7 +3556,7 @@ msgstr "Egyéb beállítások" msgid "Modifier" msgstr "Változó" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3628,16 +3572,16 @@ msgstr "" msgid "Monospaced font" msgstr "Azonos szélességű betűtípus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3659,7 +3603,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3667,11 +3611,11 @@ msgstr "" "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " "véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3759,38 +3703,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Cím:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Név:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Natív GCI fájlok (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "KövetkezÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "KövetkezÅ‘ keresés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Becenév:" @@ -3798,7 +3742,7 @@ msgstr "Becenév:" msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nem találhatók sem ISO sem WAD fájlok" @@ -3807,8 +3751,8 @@ msgstr "Nem találhatók sem ISO sem WAD fájlok" msgid "No banner file found for title %s" msgstr "Nem található játék kép fájl a(z) %s játékhoz" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3816,15 +3760,15 @@ msgstr "" msgid "No docking" msgstr "Nincs dokkolás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nincs fájl betöltve" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Nincs üres könyvtári jelzÅ‘szám bejegyzés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nincs rögzített fájl" @@ -3833,33 +3777,33 @@ msgstr "Nincs rögzített fájl" msgid "No save folder found for title %s" msgstr "%s játékhoz nem található mentési mappa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvég" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nem egyenlÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nincs csatlakoztatva" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Megjegyzések:" @@ -3868,7 +3812,7 @@ msgstr "Megjegyzések:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Megjegyzés" @@ -3876,28 +3820,28 @@ msgstr "Megjegyzés" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Kódok száma:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk gyorsítás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Elem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Ki" @@ -3905,60 +3849,56 @@ msgstr "Ki" msgid "Offset:" msgstr "Eltolás:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Csak %d blokk szabad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Fájl megnyitása..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: környezet létrehozása sikertelen a(z) %s eszköz számára " -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nem található hang eszköz" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s eszköz nem nyitható meg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Megnyitja a hibakeresÅ‘t" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Megnyitja a naplózót" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "LehetÅ‘ségek" @@ -3967,7 +3907,7 @@ msgstr "LehetÅ‘ségek" msgid "Orange" msgstr "Narancs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3977,8 +3917,8 @@ msgstr "" "Jobb kattintás az összes fájl exportálásához,\n" "és az állásmentések importálásához az új memóriakártyára\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Egyéb" @@ -3990,19 +3930,19 @@ msgstr "" "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " "Kézileg kell leállítanod a játékot." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Kimenet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "F&elvétel visszajátszása..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Irányító" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Irányító" @@ -4018,7 +3958,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Társítás" @@ -4030,30 +3970,34 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Paraméterek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Szünet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Tökéletes" @@ -4062,36 +4006,36 @@ msgstr "Tökéletes" msgid "Perspective %d" msgstr "%d perspektíva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Felvétel visszajátszása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Játszható" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Visszajátszási lehetÅ‘ségek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4103,54 +4047,54 @@ msgstr "Hozz elÅ‘ször létre egy perspektívát mielÅ‘tt mentenél" msgid "Plus-Minus" msgstr "Plusz - minusz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "4. port" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" @@ -4163,11 +4107,11 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ElÅ‘zÅ‘ érték" @@ -4175,7 +4119,7 @@ msgstr "ElÅ‘zÅ‘ érték" msgid "Print" msgstr "Nyomtatás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4183,7 +4127,7 @@ msgstr "Profil" msgid "Properties" msgstr "Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Gyorsítótár ürítése" @@ -4191,8 +4135,8 @@ msgstr "Gyorsítótár ürítése" msgid "Question" msgstr "Kérdés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Kilépés" @@ -4210,7 +4154,7 @@ msgstr "R gomb" msgid "R-Analog" msgstr "Jobb analóg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4218,46 +4162,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "OROSZORSZÃG" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Hatótáv" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Valódi" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Valódi Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Valódi Wiimote-ok" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote újracsatlakoztatás megerÅ‘sítés" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote újracsatlakoztatása állás betöltéskor" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Rögzítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Rögzítési infó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Rögzítési beállítások" @@ -4273,7 +4217,7 @@ msgstr "Vörös balra" msgid "Red Right" msgstr "Vörös jobbra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4287,29 +4231,29 @@ msgstr "" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Frissítés" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Játéklista frissítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4319,17 +4263,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Alapra állítás" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Eredmények" @@ -4346,7 +4290,7 @@ msgstr "Jobbra" msgid "Right Stick" msgstr "Jobb kar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble funkció" @@ -4355,116 +4299,112 @@ msgstr "Rumble funkció" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE futtatása egy dedikált folyamatágon (nem ajánlott)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Orosz" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Ãl&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Biztonságos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Mintavételezési frekvencia:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Mentés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI mentése másként..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Ãllás mentés az 1. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Ãllás mentés a 2. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Ãllás mentés a 3. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Ãllás mentés a 4. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Ãllás mentés az 5. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Ãllás mentés a 6. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Ãllás mentés a 7. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Ãllás mentés a 8. helyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Ãllás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Keresés..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Pillanatkép" @@ -4472,25 +4412,25 @@ msgstr "Pillanatkép" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Csalás keresés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4501,20 +4441,20 @@ msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Választás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4532,23 +4472,23 @@ msgstr "Válassz importálandó mentési fájlt" msgid "Select floating windows" msgstr "Válassz lebegÅ‘ ablakokat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4566,11 +4506,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: Automatikus." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "A megadott \"%s\" fájl nem létezik" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Kiválasztott betűtípus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4586,7 +4531,7 @@ msgstr "" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működÅ‘ felbontást." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4603,11 +4548,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Küldés" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "ÉrzékelÅ‘ helyzete:" @@ -4615,48 +4560,54 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Beállítások..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nem található a beállítási fájl" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Rázás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Rövid cím:" @@ -4664,105 +4615,105 @@ msgstr "Rövid cím:" msgid "Shoulder Buttons" msgstr "Oldalsó gombok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Konzol &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Napló &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Ãllapotsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Eszközsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS kijelzése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Franciaország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Olaszország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "A játék nyelve:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Napló &beállítások megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Platformok mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Tajvan mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "A játék leállítása elÅ‘tt megjelenik egy megerÅ‘sítÅ‘ ablak." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4771,27 +4722,39 @@ msgstr "" "Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de " "ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Az elsÅ‘ blokk megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "MentendÅ‘ megjegyzések megjelenítése" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "MentendÅ‘ blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "MentendÅ‘ ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4803,15 +4766,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "A súgó üzenet megjelenítése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Ismeretlen mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4821,31 +4780,35 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Az EFB processzor hozzáférésének átugrása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4857,7 +4820,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4836,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "B hely" @@ -4891,7 +4854,7 @@ msgstr "B hely" msgid "Snapshot" msgstr "Pillanatkép" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Szoftveres képalkotó" @@ -4908,11 +4871,11 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " "válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Hang beállítások" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Érvénytelen %s hang feldolgozó." @@ -4926,17 +4889,17 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanyol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hangszóró hangerÅ‘:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4956,11 +4919,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Válassz videó feldolgozót" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -4968,51 +4927,55 @@ msgstr "A lemez adatátviteli arány gyorsítása" msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Normál irányító" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&NetPlay indítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Felvétel in&dítása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Felvétel indítása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Ãllap." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ãllás mentések" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Leállítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5027,7 +4990,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ablakhoz igazítás" @@ -5048,12 +5011,12 @@ msgstr "Fájl sikeresen exportálva a(z) %s helyre" msgid "Successfully imported save files" msgstr "Mentés fájlok sikeresen importálva" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -5061,7 +5024,7 @@ msgstr "Rendszer nyelv:" msgid "TAIWAN" msgstr "TAJVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS bemenet" @@ -5082,30 +5045,30 @@ msgstr "Tábla balra" msgid "Table Right" msgstr "Tábla jobbra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Teszt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textúra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5121,13 +5084,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenÅ‘rzÅ‘ összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5150,7 +5113,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -5167,7 +5130,7 @@ msgstr "A név nem tartalmazhatja a ',' karaktert" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5180,11 +5143,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5217,15 +5180,12 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Kinézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Kinézet választáskor hiba történt" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5233,7 +5193,7 @@ msgstr "" "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " "befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5241,7 +5201,7 @@ msgstr "" "Ezek a beállítások felülírják a Dolphin mag beállításait.\n" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5249,14 +5209,16 @@ msgstr "" "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " "magát az Action Replay-t." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5272,7 +5234,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5284,7 +5246,7 @@ msgstr "" "SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, " "ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" @@ -5293,40 +5255,40 @@ msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" msgid "Threshold" msgstr "Küszöbérték" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Billentés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Cím" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "eddig:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5346,7 +5308,7 @@ msgstr "" "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n" "Nem találhatóak Wiimote bt azonosítók " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Török" @@ -5358,12 +5320,12 @@ msgstr "Lemezjátszó" msgid "Type" msgstr "Típus" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5371,7 +5333,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ISMERETLEN" @@ -5399,24 +5361,24 @@ msgstr "" "történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Meghatározatlan %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Ãllás betöltés törlése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Ismeretlen" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Ismeretlen DVD parancs: %08x - végzetes hiba" @@ -5443,32 +5405,32 @@ msgstr "" msgid "Up" msgstr "Fel" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Frissítés" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Teljes nézet használata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "HibakezelÅ‘k használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5481,7 +5443,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5496,15 +5458,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Kellékek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Érték" @@ -5512,23 +5474,23 @@ msgstr "Érték" msgid "Value:" msgstr "Érték:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Érték:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "HangerÅ‘" @@ -5543,7 +5505,7 @@ msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" msgid "WAD installation failed: error creating ticket" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5556,16 +5518,16 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Figyelem - DOL indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelÅ‘ konzol módban!" @@ -5584,7 +5546,7 @@ msgstr "" "%s\n" "Akarod folytatni?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5597,7 +5559,7 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5609,7 +5571,7 @@ msgstr "" "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5621,7 +5583,7 @@ msgstr "" "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5656,7 +5618,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fájl nincs megnyitva." @@ -5664,31 +5626,31 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii mentés importálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5696,17 +5658,17 @@ msgstr "Wii mentés fájlok (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Fájlból olvasás nem sikerült" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5719,19 +5681,19 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimote" @@ -5751,27 +5713,27 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Folyamatban..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Ãrás a konzolba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Ãrás fájlba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Ãrás fájlba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Ãrás az ablakba" @@ -5790,7 +5752,7 @@ msgstr "XAudio2 iniciálási hiba: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 fÅ‘ hang létrehozási hiba: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5810,24 +5772,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nem zárhatod be a lapokat tartalmazó táblákat." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Választanod kell egy játékot!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Meg kell adnod egy nevet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." @@ -5851,25 +5813,25 @@ msgstr "" "0x%04x méretűnek kellene lennie (azonban 0x%04llx méretű)\n" "Akarsz újat létrehozni?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 kód nem támogatott" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero ismeretlen az emulátor számára: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ várakozás ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5885,7 +5847,7 @@ msgstr "" msgid "[Custom]" msgstr "[Egyedi]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5904,7 +5866,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5918,11 +5880,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -5939,7 +5901,7 @@ msgstr "adatok olvasása a következÅ‘ fájlból sikertelen: %s" msgid "failed to read header" msgstr "a fejléc olvasása sikertelen" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." @@ -5949,7 +5911,7 @@ msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." msgid "not a wii save or read failure for file header size %x" msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5958,7 +5920,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -5970,13 +5932,16 @@ msgstr "zFar javítás:" msgid "zNear Correction: " msgstr "zNear javítás: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| VAGY" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Képkocka léptetés" @@ -6044,12 +6009,41 @@ 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" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "A 3D-s grafika mélységének értékét képpont alapon számolja inkább, " +#~ "mintsem csúcspont alapon.\n" +#~ "Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a " +#~ "képpont alapú mélység számítás csupán csak néhány játék pontos " +#~ "emulálásához szükséges.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelölve." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6101,6 +6095,23 @@ msgstr "| VAGY" #~ msgid "Could not get info about plugin %s" #~ msgstr "%s pluginról nem szerezhetÅ‘ be infó" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Készítette: KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Készítette: VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Készítette: black_rider és közzétette ForumW.org > Web Developments " +#~ "oldalon" + #~ msgid "DList Cache" #~ msgstr "DList gyorsítótár" @@ -6110,9 +6121,27 @@ msgstr "| VAGY" #~ msgid "Danish" #~ msgstr "Dán" +#~ msgid "Disable Lighting" +#~ msgstr "Fényhatások kikapcsolása" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Képpont mélység kikapcsolása" + +#~ msgid "Disable Textures" +#~ msgstr "Textúrák kikapcsolása" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Wiimote hangszóró kikapcsolása" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Textúrák kikapcsolása.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6176,6 +6205,9 @@ msgstr "| VAGY" #~ msgid "Enable Audio Throttle" #~ msgstr "Hang szabályozás használata" +#~ msgid "Enable BAT" +#~ msgstr "BAT használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6200,6 +6232,15 @@ msgstr "| VAGY" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "KépernyÅ‘védÅ‘ használata (besülés elleni védelem)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik " +#~ "funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE " +#~ "= kompatibilis, KI = gyors)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6255,6 +6296,9 @@ msgstr "| VAGY" #~ msgid "Error opening file %s for recording" #~ msgstr "Hiba a(z) %s fájl rögzítéshez történÅ‘ megnyitása közben" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Kilépés a Dolphin emulátorból" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6267,6 +6311,9 @@ msgstr "| VAGY" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP ROM betöltése sikertelen: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Gyors mipmapek" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6315,6 +6362,16 @@ msgstr "| VAGY" #~ "Ha a játék leáll, csak Interpreter módban működik vagy ha a Dolphin " #~ "kifagy, akkor ez a beállítás javíthat a játékon." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " +#~ "játékban.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." + #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6357,6 +6414,15 @@ msgstr "| VAGY" #~ "Natív mipmapek betöltése pontosabb eljárás, de teljesítmény csökkenést " #~ "okozhat (azonban adódhatnak eltérÅ‘ tapasztalatok)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Folyamatágak magokhoz zárolása" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Alacsony szintű (LLE) vagy magas szintű (HLE) hang" + #~ msgid "Lua Script Console" #~ msgstr "Lua parancsfájl konzol" @@ -6392,6 +6458,12 @@ msgstr "| VAGY" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Megnyitja a hibakeresÅ‘t" + +#~ msgid "Opens the logger" +#~ msgstr "Megnyitja a naplózót" + #~ msgid "Plugins" #~ msgstr "Pluginok" @@ -6426,6 +6498,9 @@ msgstr "| VAGY" #~ msgid "Running script...\n" #~ msgstr "Parancsfájl futtatása...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Mintavételezési frekvencia:" + #~ msgid "Scale:" #~ msgstr "Arányosítás:" @@ -6474,6 +6549,9 @@ msgstr "| VAGY" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Kijelzi a másodpercenként megjelenített képkockák számát " +#~ msgid "Show this help message" +#~ msgstr "A súgó üzenet megjelenítése" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6514,6 +6592,9 @@ msgstr "| VAGY" #~ "A többi opció rögzített felbontású a vizuális minÅ‘ség választásához " #~ "függetlenül a kijelzÅ‘ méretétÅ‘l." +#~ msgid "Specify a video backend" +#~ msgstr "Válassz videó feldolgozót" + #~ msgid "Specify an audio plugin" #~ msgstr "Válassz hang plugint" @@ -6526,6 +6607,9 @@ msgstr "| VAGY" #~ msgid "The file " #~ msgstr "A fájl" +#~ msgid "Theme selection went wrong" +#~ msgstr "Kinézet választáskor hiba történt" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/it.po b/Languages/po/it.po index a8c56ab9d2..90df8c131e 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-04-08 20:40+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" "Language: Italian\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (troppi per la visualizzazione)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Gioco : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Scollegato" @@ -150,156 +143,156 @@ msgstr "%sEsporta GCI%s" msgid "%sImport GCI%s" msgstr "%sImporta GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&A proposito di..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Avvia da Unità DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Punti di interruzione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Cerca ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestore &Trucchi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&File" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Impostazioni &Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Aiuto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Impostazioni &Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carica Stato di Gioco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Gestore Memcard (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Apri..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opzioni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Modalità in &Sola-lettura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Resetta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Suono" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Arresta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Strumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Visualizza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -315,27 +308,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(SCONOSCIUTO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(nessuno)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -343,46 +336,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Una finestra di Gioco-Online risulta già aperta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Al momento non c'è alcun gioco in esecuzione." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Non è stata trovata nessuna periferica supportata per il bluetooth!\n" "(Soltanto lo stack bluetooth di Microsoft è supportato.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Scheda basata su AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codici AR" @@ -432,19 +427,19 @@ msgstr "Codici AR" msgid "About Dolphin" msgstr "A proposito di Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -453,8 +448,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Azione" @@ -473,7 +468,7 @@ msgstr "" "Codice Incriminato:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -481,7 +476,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Aggiunta Codice (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -490,7 +485,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Riempimento e Scorrimento (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -499,7 +494,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Scrittura Ram e Riempimento (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -508,17 +503,18 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Scrittura Al Puntatore (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Errore Action Replay: Valore non valido (%08x) in operazioni di Copia " "Memoria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Errore Action Replay: Codice Principale a Scrittura in CCXXXXXX non " "implementate (%s)" @@ -528,27 +524,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Errore Action Replay: linea codice AR non valida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay - Codice Condizionale: Dimensioni non Valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo Codice Regolare %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay - Codice Regolare %i: Sottotipo %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay - Codice Regolare 0: Sottotipo %08x (%s) non valido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adattatore:" @@ -557,11 +553,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -569,13 +565,13 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Aggiungi..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Indirizzo:" @@ -617,73 +613,78 @@ msgstr "" "\n" "NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotropico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -697,31 +698,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Applica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabo" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,13 +730,13 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -743,12 +744,12 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Interfaccia Audio:" @@ -756,26 +757,26 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -783,19 +784,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "Registri" @@ -804,17 +797,17 @@ msgstr "Registri" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Interfaccia Audio:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input in Background" @@ -827,16 +820,16 @@ msgstr "all'Indietro" msgid "Bad File Header" msgstr "File di Intestazione (Header) difettoso" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -844,11 +837,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -861,7 +854,7 @@ msgid "Block Allocation Table checksum failed" msgstr "" "Verifica somma di controllo della Tabella di Allocazione Blocchi non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocchi" @@ -877,47 +870,53 @@ msgstr "Blu Sinistro" msgid "Blue Right" msgstr "Blu Destro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Sotto" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Corrotto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Sfoglia" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -930,30 +929,20 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -962,7 +951,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annulla" @@ -978,7 +967,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -988,7 +977,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,19 +985,19 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossibile trovate il WiiMote tramite bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" @@ -1016,28 +1005,28 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Area Centrale" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Cambia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Cambia &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Cambia Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Cambia Gioco" @@ -1058,13 +1047,12 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia segno al Parametro zNear (dopo la correzione)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "La modifica di quest'opzione non avrà alcun effetto finchè l'emulatore " "rimane attivo!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1072,48 +1060,48 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Codice Trucco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cerca Trucco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1121,7 +1109,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1129,8 +1117,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1144,8 +1132,8 @@ msgstr "Controller Classico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Cancella" @@ -1157,22 +1145,22 @@ msgstr "" "Client disconnesso durante l'esecuzione del gioco!! La modalità di Gioco-" "Online è disabilitata. E' necessario arrestare il gioco manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Chiudi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigura..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Codice Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Codice: " @@ -1180,96 +1168,96 @@ msgstr "Codice: " msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Compressione ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurazione" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configura" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configura Controllo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configura Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Collega Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Collega Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Collega Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Collega Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1285,16 +1273,16 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Converti a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1303,7 +1291,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossibile creare %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Impossibile inizializzare l'interfaccia %s." @@ -1324,12 +1312,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1339,7 +1327,7 @@ msgstr "" "(l'impostazione dei pads mentre il gioco è in esecuzione è una funzione al " "momento non supportata)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,11 +1340,11 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1364,17 +1352,17 @@ msgstr "" "Impossibile inizializzare il core.\n" "Verifica la tua configurazione." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Paese:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crea codice AR" @@ -1383,25 +1371,7 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Creata da VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creatore: " @@ -1409,11 +1379,11 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1424,12 +1394,12 @@ msgstr "" msgid "Crossfade" msgstr "Dissolvenza Incrociata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1437,15 +1407,15 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Ceco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1453,37 +1423,37 @@ msgstr "" msgid "D-Pad" msgstr "Croce Direzionale" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Origine DVD:" @@ -1495,16 +1465,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "File Datel MaxDrive/Pro(*.sav)" @@ -1516,11 +1486,11 @@ msgstr "File Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Zona Morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1529,24 +1499,24 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Decompressione ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1555,11 +1525,11 @@ msgid "Default font" msgstr "Carattere predefinito" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Elimina Save" @@ -1568,12 +1538,12 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Rileva" @@ -1586,13 +1556,13 @@ msgstr "" "Individuato tentativo di leggere dal DVD più dati rispetto a quanti il " "buffer in uscita è capace di ospitarne. Bloccato." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1616,30 +1586,17 @@ msgstr "" "Falliti 'checksum' Directory\n" " e 'checksum' Directory di backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Disabilita Illuminazione" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Profondità Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Disabilita Trame" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1648,7 +1605,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1658,14 +1615,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1674,11 +1624,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Errore Lettura Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Aspetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1690,20 +1640,24 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin - Configurazione Video %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Sito &Web Dolphin" @@ -1711,39 +1665,39 @@ msgstr "Sito &Web Dolphin" msgid "Dolphin Configuration" msgstr "Configurazione Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin non trova nessuna ISO GC/Wii. Doppio click qui per cercare i file..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1751,16 +1705,21 @@ msgstr "" "Dolphin è attualmente impostato per nascondere tutti i giochi. Doppio click " "qui per mostrare tutti i giochi..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Giù" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Scarica Codici (Database WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Codici %lu scaricati. (%lu aggiunti)" @@ -1769,34 +1728,34 @@ msgstr "Codici %lu scaricati. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1806,32 +1765,32 @@ msgstr "" "Effettua il trasferimento (dumping) delle trame di gioco in User/Dump/" "Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Olandese" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Esci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "Individua Copie EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1845,11 +1804,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Aggiornamenti di Memoria Preliminari" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Modifica" @@ -1857,7 +1816,7 @@ msgstr "Modifica" msgid "Edit ActionReplay Code" msgstr "Modifica Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modifica Configurazione" @@ -1865,12 +1824,12 @@ msgstr "Modifica Configurazione" msgid "Edit Patch" msgstr "Modifica Pacth" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Modifica..." @@ -1878,16 +1837,16 @@ msgstr "Modifica..." msgid "Effect" msgstr "Effetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 #, fuzzy msgid "Embedded Frame Buffer" msgstr "Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Processo dell'Emulatore già in esecuzione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1896,7 +1855,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1906,19 +1865,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Attiva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1928,74 +1887,69 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Attiva BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -2008,7 +1962,7 @@ msgstr "" "Migliora la qualità visiva delle trame che si trovano sotto un angolo di " "vista obliquo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2016,11 +1970,11 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Attiva pagine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2028,7 +1982,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2036,7 +1990,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2044,22 +1998,28 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Attiva Traduzione Indirizzi dei Blocchi in Memoria (BAT), una funzione " -"dell'Unita di Gestione della Memoria.\n" -"Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " -"= Compatibile, Disattivato = Veloce)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2067,7 +2027,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2075,7 +2035,7 @@ msgstr "" "Attiva l'Unità di Gestione della Memoria (MMU), necessaria per alcuni " "giochi. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2086,14 +2046,14 @@ msgstr "" msgid "End" msgstr "Fine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglese" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Miglioramenti" @@ -2111,17 +2071,17 @@ msgstr "Voce %d/%d" msgid "Entry 1/%d" msgstr "Voce 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Uguale" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Errore/i" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " @@ -2162,36 +2122,32 @@ msgstr "" msgid "Execute" msgstr "Esegui" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Esci dall'Emulatore Dolphin" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Esporta File" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Esporta Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2199,15 +2155,15 @@ msgstr "Esporta tutti i salvataggi" msgid "Export failed, try again?" msgstr "Esportazione non riuscita, riprovare?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Esporta salvataggio come..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2220,52 +2176,52 @@ msgstr "Parametro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametro Extra utile solo in ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Estrazione..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Lettore FIFO" @@ -2273,7 +2229,7 @@ msgstr "Lettore FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2281,15 +2237,15 @@ msgstr "Dimensione FST:" msgid "Failed to Connect!" msgstr "Connessione non riuscita!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Impossibile 'rimanere in ascolto'!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2328,6 +2284,11 @@ msgstr "Caricamento hid.dll non riuscito" msgid "Failed to load hid.dll" msgstr "Caricamento hid.dll non riuscito" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Scrittura intestazione per %s non riuscita" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Accesso al banner.bin non riuscito" @@ -2411,46 +2372,41 @@ msgstr "Scrittura intestazione per %s non riuscita" msgid "Failed to write header for file %d" msgstr "Scrittura intestazione per il file %d non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Carica Mip Maps precalcolate" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Lettore Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Info File" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Il file non conteneva codici." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "File converito in .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2467,7 +2423,7 @@ msgstr "" "Il file possiede l'estensione \"%s\"\n" "le estensioni valide sono (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Il file non è riconosciuto come una memcard" @@ -2480,49 +2436,49 @@ msgstr "File non compresso" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forza 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Forza Filtro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2535,7 +2491,7 @@ msgstr "" "Migliora la qualità delle trame (specialmente quando si utilizza una\n" "risoluzione interna elevata) ma questo provoca anomalie in alcuni giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2546,7 +2502,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2565,58 +2521,58 @@ msgstr "" msgid "Forward" msgstr "in Avanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Fotogramma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Fotogramma " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Fotogramma " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Intervallo Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limite FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Visuale Libera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francese" @@ -2624,21 +2580,21 @@ msgstr "Francese" msgid "Frets" msgstr "Tasti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Schermo Intero" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "File GCI(*.gci)" @@ -2647,57 +2603,61 @@ msgstr "File GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID Gioco:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Il gioco è già in esecuzione!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Il gioco non è avviato" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codici Gecko" @@ -2712,44 +2672,44 @@ msgstr "" "Esecuzione Codice Gecko non riuscita (CT%i CST%i) (%s)\n" "(codice corrotto oppure tipo di codice non ancora supportato.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Generale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Tedesco" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: Indice troppo grande rispetto alla dimensione dell'elenco dei " "codici AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Impostazioni Video" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maggiore di" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2760,7 +2720,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Greco" @@ -2780,11 +2740,11 @@ msgstr "Verde Destro" msgid "Guitar" msgstr "Chitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Chiamata a HCI_CMD_INQUIRY, per favore segnalare!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2792,11 +2752,11 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Ebreo" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altezza" @@ -2804,7 +2764,7 @@ msgstr "Altezza" msgid "Help" msgstr "Aiuto" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2821,15 +2781,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Nascondi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Nascondi il Cursore del Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2841,8 +2801,8 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2850,28 +2810,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungherese" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Tentativo di accesso ai dati da un punto di ingresso " "sconosciuto: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2884,31 +2844,31 @@ msgstr "" "IDTitolo %016llx.\n" " Dolphin, adesso, probabile vada in blocco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Impostazioni IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "Puntamento IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Puntatore a raggi infrarossi (IR)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directory ISO" @@ -2916,24 +2876,24 @@ msgstr "Directory ISO" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2944,12 +2904,12 @@ msgstr "" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " "l'impostazione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Emula i Cambiamenti di Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2958,7 +2918,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2967,7 +2927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Salva Importazione" @@ -2975,7 +2935,7 @@ msgstr "Salva Importazione" msgid "Import failed, try again?" msgstr "Importazione non riuscita, riprovare?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2983,11 +2943,11 @@ msgstr "" "Il file importato possiede l'estensione .gsc\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Il file importato ha una dimensione non valida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2995,7 +2955,7 @@ msgstr "" "Il file importato possiede l'estensione .sav\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -3006,26 +2966,16 @@ msgstr "" "Disabilita nebbia. Migliora le prestazioni ma provoca difetti nei giochi che " "richiedono l'effetto nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Disabilita illuminazione. Migliora le prestazioni ma provoca la scomparasa\n" -"dell'illuminazione stessa nei giochi che la utilizzano" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3033,7 +2983,7 @@ msgstr "Info" msgid "Information" msgstr "Informazioni" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Input" @@ -3045,7 +2995,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3053,11 +3003,11 @@ msgstr "Inserisci SD Card" msgid "Insert name here.." msgstr "Inserire il nome qui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3068,43 +3018,43 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Errore Interno LZO - compressione non riuscita" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3113,20 +3063,20 @@ msgstr "" "Errore Interno LZO - decompressione non riuscita (%d) (%li, %li) \n" "Riprovare a verificare lo stato" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Errore Interno LZO - lzo_init() non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3135,11 +3085,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Dimensione non Valida(%x) o Password (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valore non Valido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" @@ -3148,7 +3098,7 @@ msgstr "bat.map o voce directory non valide" msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "File non valido" @@ -3163,29 +3113,29 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Stato non valido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3193,16 +3143,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Giapponese" @@ -3210,7 +3160,7 @@ msgstr "Giapponese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3218,17 +3168,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3246,19 +3196,23 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Ultimo stato di gioco sovrascritto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Ultimo stato di gioco salvato" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3268,8 +3222,8 @@ msgstr "Sinistra" msgid "Left Stick" msgstr "Levetta Sinistra" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3277,7 +3231,7 @@ msgstr "" "Click sinistro del mouse per rilevare l'identità del tasto premuto.\n" "Premi 'spazio' per cancellare." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3287,7 +3241,7 @@ msgstr "" "Click centrale del mouse per cancellare.\n" "Click destro del mouse per altre opzioni." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3295,78 +3249,78 @@ msgstr "" "Click sinistro/destro per altre opzioni.\n" "Click Centrale del mouse per cancellare." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carica Stato di Gioco dall'Ingresso 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carica Stato di Gioco dall'Ingresso 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carica Stato di Gioco dall'Ingresso 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carica Stato di Gioco dall'Ingresso 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carica Stato di Gioco dall'Ingresso 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carica Stato di Gioco dall'Ingresso 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carica Stato di Gioco dall'Ingresso 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carica Stato di Gioco dall'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3380,37 +3334,40 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carica valori preimpostati dai modelli hack disponibili." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "Blocca processi ai nuclei" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipi di Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Destinazione Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Registrazione Eventi" @@ -3418,10 +3375,6 @@ msgstr "Registrazione Eventi" msgid "Lost connection to server!" msgstr "Connessione al server persa!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Audio LLE (a basso livello) o HLE (ad alto livello)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Pulsante M" @@ -3435,12 +3388,12 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" @@ -3449,33 +3402,33 @@ msgstr "File MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Produttore:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La Memcard possiede già un salvataggio per questo titolo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "La Memcard è già aperta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3487,7 +3440,7 @@ msgstr "" "Gestore Scheda di Memoria - AVVISO: Eseguire una copia di sicurezza prima " "dell'uso!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3512,21 +3465,21 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3535,7 +3488,7 @@ msgstr "Impostazioni Varie" msgid "Modifier" msgstr "Modificatore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3547,16 +3500,16 @@ msgstr "" msgid "Monospaced font" msgstr "Carattere a spaziatura fissa" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3571,17 +3524,17 @@ msgstr "" msgid "Multiply" msgstr "*" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3669,38 +3622,38 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "File GCI nativi(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Pagina Successiva" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Ricerca Successiva" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Pseudonimo:" @@ -3708,7 +3661,7 @@ msgstr "Pseudonimo:" msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nessun ISO o WAD trovata" @@ -3717,8 +3670,8 @@ msgstr "Nessun ISO o WAD trovata" msgid "No banner file found for title %s" msgstr "Nessun file di banner trovato per il titolo %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3726,15 +3679,15 @@ msgstr "" msgid "No docking" msgstr "Nessun aggancio" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nessun file caricato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Nessuna voce di directory libera" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nessun file registrato" @@ -3743,33 +3696,33 @@ msgstr "Nessun file registrato" msgid "No save folder found for title %s" msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvegese" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Non collegato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Note" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Note: " @@ -3778,7 +3731,7 @@ msgstr "Note: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Avviso/i" @@ -3786,28 +3739,28 @@ msgstr "Avviso/i" msgid "Num Lock" msgstr "Bloc Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Numero Di Codici:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Accelerazione Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Oggetto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Spento" @@ -3815,61 +3768,57 @@ msgstr "Spento" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Solo %d blocchi disponibili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Apri file..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: impossibile creare il contesto per il dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: impossibile trovare la periferica audio" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: impossibile aprire il dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Apri il debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Apri il logger" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opzioni" @@ -3878,7 +3827,7 @@ msgstr "Opzioni" msgid "Orange" msgstr "Arancione" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3890,8 +3839,8 @@ msgstr "" "successivamente eseguire l'importazione di questi ultimi in una nuova " "memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3903,19 +3852,19 @@ msgstr "" "Altro client disconnesso a gioco in corso!! La modalità di Gioco-Online " "viene disabilitata. Arrestare manualmente il gioco." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Output" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Avvia Riproduzione Registrazione..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3931,7 +3880,7 @@ msgstr "Pag Giù" msgid "Page Up" msgstr "Pag Su" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Abbina" @@ -3943,31 +3892,35 @@ msgstr "Paragrafo" msgid "Parameters" msgstr "Parametri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfetto" @@ -3976,36 +3929,36 @@ msgstr "Perfetto" msgid "Perspective %d" msgstr "Prospettiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Gioca" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Avvia Riproduzione Registrazione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Giocabile" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opzioni di Riproduzione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4017,55 +3970,55 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Porta 4:" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4078,11 +4031,11 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valore Precedente" @@ -4090,7 +4043,7 @@ msgstr "Valore Precedente" msgid "Print" msgstr "Stamp" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profilo" @@ -4098,7 +4051,7 @@ msgstr "Profilo" msgid "Properties" msgstr "Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Pulisci Cache" @@ -4106,8 +4059,8 @@ msgstr "Pulisci Cache" msgid "Question" msgstr "Conferma" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Esci" @@ -4125,7 +4078,7 @@ msgstr "Pulsante R" msgid "R-Analog" msgstr "R-Analogico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4133,48 +4086,48 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Gamma" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Reale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Reale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Wiimote Reale" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Conferma Ricollegamento Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Ricollega Wiimote al caricamento di uno Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Registra" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Info di Registrazione" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opzioni di Registrazione" @@ -4190,7 +4143,7 @@ msgstr "Rosso Sinistro" msgid "Red Right" msgstr "Rosso Destro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4204,29 +4157,29 @@ msgstr "" "Questo produce contorni e immagini meno spigolose, ma riduce pesantemente le " "prestazioni." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Aggiorna" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Rimuovi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4236,17 +4189,17 @@ msgstr "" "Renderizza la scena in modalità vettoriale (wireframe).\n" "Utile solo per il debug." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Resetta" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Risultati" @@ -4263,7 +4216,7 @@ msgstr "Destra" msgid "Right Stick" msgstr "Levetta Destra" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrazione" @@ -4272,117 +4225,113 @@ msgstr "Vibrazione" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Esegui DSP LLE in un thread dedicato (non raccomandato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Accurata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Frequenza di Campionamento:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Salva GCI come.." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Salva Stato di Gioco nell'Ingresso 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Salva Stato di Gioco nell'Ingresso 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Salva Stato di Gioco nell'Ingresso 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Salva Stato di Gioco nell'Ingresso 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Salva Stato di Gioco nell'Ingresso 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Salva Stato di Gioco nell'Ingresso 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Salva Stato di Gioco nell'Ingresso 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Salva Stato di Gioco nell'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Istantanea" @@ -4390,24 +4339,24 @@ msgstr "Istantanea" msgid "Scroll Lock" msgstr "Bloc Scroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Cerca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 #, fuzzy msgid "Search for hex Value:" msgstr "&Cerca per un op" @@ -4419,20 +4368,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sezione %s non trovata in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleziona" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4450,23 +4399,23 @@ msgstr "Seleziona un file da importare" msgid "Select floating windows" msgstr "Seleziona finestre libere/mobili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4484,11 +4433,16 @@ msgstr "" "- Adatta a finestra: Estende l'immagine per adattarsi alle dimensioni della " "finestra." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "il file \"%s\" specificato non esiste" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Carattere selezionato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4498,7 +4452,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4508,11 +4462,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Invia" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posizione della Barra a Sensori: " @@ -4520,50 +4474,56 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Porta seriale 1 - Questa è la porta per i dispositivi come l' adattatore/" "scheda di rete" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Impostazioni..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nome breve:" @@ -4572,107 +4532,107 @@ msgstr "Nome breve:" msgid "Shoulder Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostra &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostra Finestra di &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostra Barra di &Stato" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostra Barra degli St&rumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostra FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostra Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostra Tasti di Input" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostra Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostra JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostra Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostra &Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostra PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostra Piattaforme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostra Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostra USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostra Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostra una messaggio di conferma prima di arrestare un gioco." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4682,27 +4642,39 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostra commento salvato" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostra titolo salvato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4710,48 +4682,48 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra questo messaggio di aiuto" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostra sconosciuto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Cinese Semplificato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4759,7 +4731,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4769,17 +4741,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ingresso B" @@ -4787,7 +4759,7 @@ msgstr "Ingresso B" msgid "Snapshot" msgstr "Stamp" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4799,11 +4771,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Impostazioni Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "L'interfaccia audio %s non è valida." @@ -4817,17 +4789,17 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spagnolo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume Altoparlante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4839,11 +4811,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Seleziona un plugin video" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -4851,51 +4819,55 @@ msgstr "Aumenta la velocità di trasferimento del Disco" msgid "Square Stick" msgstr "Levetta Quadrata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Controller Standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Avvia Gioco-&Online" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Avvia Re&gistrazione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Avvia Registrazione" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stato" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Stati di Gioco" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Levetta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Arresta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4904,7 +4876,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Adatta a Finestra" @@ -4925,12 +4897,12 @@ msgstr "Esportazione file in %s riuscita" msgid "Successfully imported save files" msgstr "Seleziona il file di salvataggio" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -4938,7 +4910,7 @@ msgstr "Lingua di Sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4960,31 +4932,31 @@ msgstr "Semipiano sinistro" msgid "Table Right" msgstr "Semipiano destro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -5001,13 +4973,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5029,7 +5001,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Il file %s è già stato aperto, il file di intestazione non verrà scritto." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -5046,7 +5018,7 @@ msgstr "Il nome non può contenere il carattere ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5054,13 +5026,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Il file di salvataggio che si sta provando a copiare ha una dimensione non " "valida" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5093,15 +5065,12 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "La selezione del Tema non era corretta" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5109,7 +5078,7 @@ msgstr "" "Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5118,23 +5087,24 @@ msgstr "" "Per impostazione 'indeterminata' si intende che il gioco utilizza " "l'impostazione di Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni " "giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5142,7 +5112,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5156,7 +5126,7 @@ msgstr "" "Migliora la velocità sui PC con più di un core,\n" "ma può anche provocare occasionali crash/difetti." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Questo vi permetterà di modificare manualmente il file di configurazione INI" @@ -5166,40 +5136,40 @@ msgstr "" msgid "Threshold" msgstr "Sensibilità" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titolo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -5219,7 +5189,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5231,12 +5201,12 @@ msgstr "Giradischi da DJ" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5244,7 +5214,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "SCONOSCIUTO" @@ -5267,24 +5237,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i non definito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Annulla Caricamento Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Sconosciuto" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando DVD %08x sconosciuto - errore fatale" @@ -5311,33 +5281,33 @@ msgstr "" msgid "Up" msgstr "Su" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aggiorna" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5345,7 +5315,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5354,15 +5324,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilità" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valore" @@ -5370,23 +5340,23 @@ msgstr "Valore" msgid "Value:" msgstr "Valore:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valore: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5401,7 +5371,7 @@ msgstr "Installazione WAD non riuscita: errore nella creazione di %s" msgid "WAD installation failed: error creating ticket" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5410,16 +5380,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" @@ -5439,7 +5409,7 @@ msgstr "" "%s\n" "Vuoi proseguire?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5453,7 +5423,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5461,7 +5431,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5469,7 +5439,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5489,7 +5459,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaweFileWriter - file non aperto." @@ -5497,32 +5467,32 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack Widescreen" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5530,17 +5500,17 @@ msgstr "Salva i file Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Impossibile leggere dal file" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5553,19 +5523,19 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Collegato" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Vibrazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Impostazioni Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5586,27 +5556,27 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Attività in corso..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Scrivi nella Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Scrivi su File" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Scrivi su File" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Scrivi in Finestra" @@ -5625,7 +5595,7 @@ msgstr "Inizializzazione XAudio2 non riuscita: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Creazione voce principale XAudio2 non riuscita: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5643,23 +5613,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Non è possibile chiudere riquadri che hanno pagine al loro interno" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "E' necessario selezionare un gioco!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "E' richiesto l'inserimento di un nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -5683,25 +5653,25 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Hack ZTP" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 codice non supportato" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero codice sconosciuto per dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ attesa ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5713,7 +5683,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizzata]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5724,7 +5694,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5733,11 +5703,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5754,7 +5724,7 @@ msgstr "accesso non riuscito ai dati dal file: %s" msgid "failed to read header" msgstr "accesso all'intestazione non riuscito" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lettura Opcode da %x. Per favore segnalare." @@ -5766,7 +5736,7 @@ msgstr "" "non un salvataggio wii oppure accesso non riuscito al file con dimensione " "intestazione %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5775,7 +5745,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -5787,7 +5757,7 @@ msgstr "Correzione zFar: " msgid "zNear Correction: " msgstr "Correzione zNear: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" @@ -5803,6 +5773,9 @@ msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Add function" #~ msgstr "&Aggiunge funzione" @@ -6121,6 +6094,21 @@ msgstr "| OR" #~ msgid "Count: %i" #~ msgstr "Totale: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creata da KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creata da VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList" @@ -6133,6 +6121,16 @@ msgstr "| OR" #~ msgid "Data Type" #~ msgstr "Tipo Dati" +#~ msgid "Disable Lighting" +#~ msgstr "Disabilita Illuminazione" + +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Profondità Pixel" + +#~ msgid "Disable Textures" +#~ msgstr "Disabilita Trame" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6208,6 +6206,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Abilita Autoregolazione Audio" +#~ msgid "Enable BAT" +#~ msgstr "Attiva BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" @@ -6232,6 +6233,16 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Attiva Salvaschermo (riduzione bruciature nei pixel)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Attiva Traduzione Indirizzi dei Blocchi in Memoria (BAT), una funzione " +#~ "dell'Unita di Gestione della Memoria.\n" +#~ "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire " +#~ "(Attivo = Compatibile, Disattivato = Veloce)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6278,6 +6289,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Errore apertura file %s per la registrazione" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Esci dall'Emulatore Dolphin" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6290,6 +6304,10 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Caricamento ROM DSP: %s non riuscito" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Carica Mip Maps precalcolate" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6357,6 +6375,16 @@ msgstr "| OR" #~ "Dolphin va in crash,\n" #~ "questa operazione potrebbe correggere il problema" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Disabilita illuminazione. Migliora le prestazioni ma provoca la " +#~ "scomparasa\n" +#~ "dell'illuminazione stessa nei giochi che la utilizzano" + #~ msgid "Input Source" #~ msgstr "Sorgente d'Ingresso" @@ -6407,6 +6435,16 @@ msgstr "| OR" #~ "Caricare le mip maps in formato nativo è il metodo più accurato e " #~ "preciso, ma ciò potrebbe anche diminuire le prestazioni." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" + +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "Blocca processi ai nuclei" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Audio LLE (a basso livello) o HLE (ad alto livello)" + #~ msgid "Lua Script Console" #~ msgstr "Console Script Lua" @@ -6462,6 +6500,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Apri il debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Apri il logger" + #~ msgid "PPC Size" #~ msgstr "Sezione PPC" @@ -6525,6 +6569,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Esecuzione script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Frequenza di Campionamento:" + #~ msgid "Save code" #~ msgstr "Salva codice" @@ -6585,6 +6632,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra il numero di fotogrammi renderizzati al secondo" +#~ msgid "Show this help message" +#~ msgstr "Mostra questo messaggio di aiuto" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6631,6 +6681,9 @@ msgstr "| OR" #~ "- Le altre opzioni a risoluzione fissa sono per una scelta visiva " #~ "qualitativamente indipendente alla dimensione del display." +#~ msgid "Specify a video backend" +#~ msgstr "Seleziona un plugin video" + #~ msgid "Specify an audio plugin" #~ msgstr "Seleziona un plugin audio" @@ -6670,6 +6723,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Il file" +#~ msgid "Theme selection went wrong" +#~ msgstr "La selezione del Tema non era corretta" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 33c4587fb6..a8e92b2187 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-22 06:13+0900\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-23 10:06+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Japanese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(該当数ãŒå¤šã™ãŽã¾ã™)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "タイトル：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! (...ã§ç„¡ã„)" @@ -36,15 +36,15 @@ 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 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii ã®ISOã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -54,14 +54,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "接続数 %i 個" @@ -84,7 +77,7 @@ msgid "" " Card file size is invalid (0x%x bytes)" msgstr "" "%s メモリーカードã®èª­ã¿è¾¼ã¿ã«å¤±æ•—\n" -" ä¸æ­£ãªã‚«ãƒ¼ãƒ‰å®¹é‡ã§ã™ (0x%x ãƒã‚¤ãƒˆ)" +" ä¸æ­£ãªã‚«ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã§ã™ (0x%x ãƒã‚¤ãƒˆ)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:110 #, c-format @@ -134,7 +127,7 @@ msgstr "%s ã¯åœ§ç¸®æ¸ˆã¿ã§ã™ï¼ã“れ以上圧縮ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã› #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ«åãŒé•·ã™ãŽã¾ã™ã€45文字ã¾ã§ã«ã—ã¦ãã ã•ã„" +msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ«åãŒé•·ã™ãŽã¾ã™ã€45文字ã¾ã§ã«åŽã‚ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format @@ -151,158 +144,158 @@ msgstr "%s エクスãƒãƒ¼ãƒˆ GCI %s" msgid "%sImport GCI%s" msgstr "%s インãƒãƒ¼ãƒˆ GCI %s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空ã | %u エントリ空ã" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& (...ã¨...)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Dolphinã«ã¤ã„ã¦(&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVDドライブã‹ã‚‰èµ·å‹•(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "ブレークãƒã‚¤ãƒ³ãƒˆ(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ISOファイルã®ã‚るフォルダをé¸æŠž(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "エミュレーション(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "ファイル(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Frame Advance(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" -msgstr "フルスクリーン表示(&F)" +msgstr "全画é¢è¡¨ç¤º(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "グラフィック設定(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "ヘルプ(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "ホットキーã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "ステートロード(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GCメモリーカードマãƒãƒ¼ã‚¸ãƒ£(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memory" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "é–‹ã(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "設定(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "一時åœæ­¢(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "プロパティ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "ゲームリストをå†æ›´æ–°(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "レジスタ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "リセット(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "サウンド(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "ツール(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "æç”»(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "表示(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -316,27 +309,27 @@ msgstr "補正有効" msgid "(UNKNOWN)" msgstr "(ä¸æ˜Ž)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "オフ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ビット" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ビット" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ビット" @@ -344,46 +337,48 @@ msgstr "8 ビット" msgid "" msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" -msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" +msgstr "<対応ã§ãる解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ãƒãƒƒãƒˆãƒ—レイウィンドウã¯ã™ã§ã«é–‹ã‹ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ゲームã¯ç¾åœ¨ã€èµ·å‹•ã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "サãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹Bluetoothデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ\n" -"(Microsoft製Bluetoothスタックã®ã¿ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™)" +"Microsoft製以外ã®Bluetoothスタックを使ã£ã¦ã„ã‚‹å ´åˆã¯ã€æ‰‹å‹•ã§ãƒšã‚¢ãƒªãƒ³ã‚°ã‚’è¡Œ" +"ã„ã€ã€Žæ›´æ–°ã€ãƒœã‚¿ãƒ³ã®ã¿ä½¿ç”¨ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -405,8 +400,8 @@ msgstr "" "\n" "ç¾åœ¨ãƒãƒƒãƒˆãƒ—レイã¯ä»¥ä¸‹ã®è¨­å®šã§ã—ã‹ã†ã¾ã動作ã—ã¾ã›ã‚“。\n" " - ãƒ‡ãƒ¥ã‚¢ãƒ«ã‚³ã‚¢å‡¦ç† ã€ç„¡åŠ¹ã€‘\n" -" - Enable Audio Throttle ã€ç„¡åŠ¹ã€‘\n" -" - DSP-HLE ã‚’ \"No Audio Output\"ã«è¨­å®šã€ã¾ãŸã¯ DSP-LLE を使用\n" +" - Audio Throttle ã€ç„¡åŠ¹ã€‘\n" +" - サウンド出力API ã‚’ \"No Audio Output\"ã«è¨­å®šã€ã¾ãŸã¯ DSP-LLE を使用\n" " - コントローラã®æ•°ã‚’æ­£ã—ã設定ã™ã‚‹ã€‚ã¾ãŸç¾åœ¨ã¯ [標準コントローラ] ã®ã¿å‹•ä½œ\n" "\n" "å…¨ã¦ã®ãƒ—レーヤーã¯Dolphinã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’åŒä¸€ã«æƒãˆã€è¨­å®šã‚‚統一ã™ã‚‹ã“ã¨ã€‚\n" @@ -416,13 +411,13 @@ msgstr "" "\n" "TCPãƒãƒ¼ãƒˆã®é–‹æ”¾ã‚’忘れãšã«ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Triforce基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -430,19 +425,19 @@ msgstr "アクションリプレイコード" msgid "About Dolphin" msgstr "Dolphinã«ã¤ã„ã¦" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "精度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -455,8 +450,8 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Texture】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "動作" @@ -475,14 +470,14 @@ msgstr "" "å•é¡Œã®ã‚るコード：\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Add Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -491,7 +486,7 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Fill and Slide " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -500,7 +495,7 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Ram Write And " "Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -509,44 +504,47 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay エラー: ä¸æ­£ãªå€¤ (%08x) in Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" -"エラー: マスターコードã€ã¾ãŸã¯ CCXXXXXX ã¸ã®æ›¸ãè¾¼ã¿ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“ (%s)" +"エラー: マスターコードã€ã¾ãŸã¯ CCXXXXXX ã¸ã®æ›¸ãè¾¼ã¿ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“ " +"(%s)\n" +"マスターコードã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。使用ã—ãªã„ã§ãã ã•ã„。" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "エラー: 無効ãªã‚³ãƒ¼ãƒ‰ ライン： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: æ¡ä»¶ä»˜ãコード: ä¸æ­£ãªã‚µã‚¤ã‚º %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: ä¸æ­£ãªç¨®é¡žã®é€šå¸¸ã‚³ãƒ¼ãƒ‰ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: 通常コード %i: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: 通常コード 0: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "ビデオカード：" @@ -555,11 +553,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -567,13 +565,13 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "追加" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "接続先：" @@ -611,53 +609,52 @@ msgstr "" "\n" "補足：å–得値ã¯ãƒ­ã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ï¼ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã§ç¢ºèªã—ã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" -msgstr "GC GCMファイル (gcm)|*.gcm" +msgstr "GC GCMファイル (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" -msgstr "Wii ISOファイル (iso)|*.iso" +msgstr "Wii ISOファイル (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -666,19 +663,23 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "分æž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "異方性フィルタリング：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚¹ï¼š" @@ -691,15 +692,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -709,16 +710,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "アラビア語" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,12 +727,12 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -739,12 +740,12 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -752,24 +753,24 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "自動 (ゲーム解åƒåº¦ã®å€æ•°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "自動 (ウィンドウサイズã«æ‹¡å¤§)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "ウィンドウサイズを自動調整" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -779,41 +780,28 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"ミップマップをメモリã‹ã‚‰ãƒ‡ã‚³ãƒ¼ãƒ‰ã›ãšã€è‡ªå‹•ä½œæˆã—ãŸã‚‚ã®ã‚’使用ã—ã¾ã™ã€‚\n" -"若干ã®å‹•ä½œé€Ÿåº¦å‘上ãŒæœ›ã‚ã¾ã™ãŒã€å¾®å¦™ãªæç”»ãƒã‚°ãŒç™ºç”Ÿã™ã‚‹ã“ã¨ãŒ ã‚ã‚Šã¾ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "レジスタ(&R)" +msgstr "BP register " #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "出力設定" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "æç”»API：" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å…¥åŠ›ã‚’許å¯" @@ -826,16 +814,16 @@ msgstr "後方" msgid "Bad File Header" msgstr "ファイルヘッダã®ä¸è‰¯" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "ãƒãƒŠãƒ¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "ãƒãƒŠãƒ¼ã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" @@ -843,11 +831,11 @@ msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" msgid "Bar" msgstr "ãƒãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本設定" @@ -857,9 +845,9 @@ msgstr "ãƒã‚¹ãƒ‰ãƒ©" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "Block Allocation Table ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸é©åˆ" +msgstr "Block Allocation Table checksum failed" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "ブロック数" @@ -875,47 +863,53 @@ msgstr "é’ - å·¦" msgid "Blue Right" msgstr "é’ - å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "下部" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "ダメダメ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" -msgstr "フォルダ追加" +msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "ボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -927,35 +921,19 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"3Dグラフィックスã®æ·±åº¦å€¤è¨ˆç®—を頂点ã”ã¨ã§ã¯ãªãピクセルã”ã¨ã«è¡Œã„ã¾ã™ã€‚\n" -"Per-Pixel LightingãŒå˜ãªã‚‹ç”»è³ªå‘上機能ã ã£ãŸã®ã¨ã¯å¯¾ç…§çš„ã«ã€\n" -"Per-Pixel Depthã¯ç‰¹å®šã®ã‚²ãƒ¼ãƒ ã‚’æ­£ã—ãエミュレートã™ã‚‹ãŸã‚ã« å¿…è¦ãªæ©Ÿèƒ½ã§" -"ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -963,13 +941,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ピクセルå˜ä½ã§ã®å…‰æºå‡¦ç†ã‚’è¡Œã†ã‚ˆã†ã«ã—ã¾ã™ã€‚\n" +"ピクセルå˜ä½ã§ã®å…‰æºå‡¦ç†ã‚’è¡Œã„ã¾ã™ã€‚\n" "GPUã®æ€§èƒ½ã«ã‚‚よりã¾ã™ãŒã€æ•°ãƒ‘ーセント程度ã€å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ã€‚\n" "ã“ã®ã‚ªãƒ—ションã¯é€šå¸¸å®‰å…¨ã§ã™ãŒã€æ™‚ã«æç”»ãƒã‚°ã‚’引ãèµ·ã“ã™ã“ã¨ã‚‚ã‚ã‚Šã¾ ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "キャンセル" @@ -985,7 +963,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -996,7 +974,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1004,48 +982,47 @@ msgstr "" "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“。\n" "両方ã®ã‚¹ãƒ­ãƒƒãƒˆã§åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—よã†ã¨ã—ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的ãªã‚¨ãƒ©ãƒ¼" +msgstr "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "カタルーニャ語" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 -#, fuzzy +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Center" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "変更" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ(&D)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ゲームを変更" @@ -1055,7 +1032,7 @@ msgid "" "Requires restart." msgstr "" "Dolphin本体ã®è¡¨ç¤ºè¨€èªžã‚’変更ã—ã¾ã™\n" -"変更時ã«ã¯å†èµ·å‹•ãŒå¿…è¦ã§ã™" +"変更ã®ãŸã‚ã«å†èµ·å‹•ãŒå¿…è¦ã§ã™" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 #, fuzzy @@ -1068,59 +1045,58 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (after correction)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" -msgstr "ãƒãƒ£ãƒƒãƒˆ" +msgstr "ãƒãƒ£ãƒƒãƒˆæ¬„" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:46 msgid "Cheat Code" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "コードサーãƒ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "パーティションã®æ•´åˆæ€§ã‚’ãƒã‚§ãƒƒã‚¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "ãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" -msgstr "DVDルートフォルダをé¸æŠž" +msgstr "DVDルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" -msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" +msgstr "NANDã®ã‚るルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1128,7 +1104,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,10 +1112,10 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" -msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" +msgstr "ä¿å­˜å…ˆã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" @@ -1151,8 +1127,8 @@ msgstr "クラシックコントローラ" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "全消去" @@ -1164,22 +1140,22 @@ msgstr "" "クライアントã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼ãƒãƒƒãƒˆãƒ—レイã¯ç¾åœ¨ç„¡åŠ¹ã§ã™ã€‚ゲームをåœ" "æ­¢ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "é–‰ã˜ã‚‹" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Dolphin本体ã®è¨­å®š(&N)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "コードã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "コード：" @@ -1187,101 +1163,101 @@ msgstr "コード：" msgid "Command" msgstr "Command" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "本体設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "設定" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "コントロールã®è¨­å®š" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "パッド設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "%iPã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "1Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "2Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "3Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "接続中..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:154 msgid "Console" -msgstr "Console" +msgstr "コンソール" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 msgid "Control" @@ -1291,16 +1267,16 @@ msgstr "Control" msgid "Convert to GCI" msgstr "GCIファイルã«å¤‰æ›" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "コピーã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "コア" @@ -1309,7 +1285,7 @@ msgstr "コア" msgid "Could not create %s" msgstr "%s を作æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Could not initialize backend %s." @@ -1323,27 +1299,27 @@ msgid "" msgstr "" "\"%s\" を読ã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ディスクãŒå…¥ã£ã¦ã„ãªã„ã‹ã€GC/Wii ã®ãƒãƒƒã‚¯ã‚¢ãƒƒ" "プディスクã§ã¯ã‚ã‚Šã¾ã›ã‚“。オリジナルã®GC/Wii ã®ãƒ‡ã‚£ã‚¹ã‚¯ã¯ã»ã¨ã‚“ã©ã®PC用DVDド" -"ライブã§ã¯èª­ã¿è¾¼ã‚ãªã„ã“ã¨ã«ç•™æ„ã—ã¦ãã ã•ã„" +"ライブã§ã¯èª­ã¿è¾¼ã‚ãªã„点ã«ç•™æ„ã—ã¦ãã ã•ã„" #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s ã‚’èªè­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s をセーブã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" -"(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" +"(ゲーム中ã®è¨­å®šå¤‰æ›´ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1356,29 +1332,29 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -"コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸ\n" -"設定を確èªã—ã¦ãã ã•ã„" +"コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" +"設定を確èªã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "発売国" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "アクションリプレイコードを作æˆ" @@ -1387,25 +1363,7 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Created by VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "制作者： " @@ -1413,11 +1371,11 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "クロッピング" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1432,28 +1390,28 @@ msgstr "" msgid "Crossfade" msgstr "クロスフェーダー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" -msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" +msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "Custom Projection Hack Settings" +msgstr "Custom Projection Hackã®è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1461,57 +1419,57 @@ msgstr "D" msgid "D-Pad" msgstr "å字キー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 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 "" +msgstr "DVDLowRead - Fatal Error: failed to read from volume" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "発売日" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)" @@ -1523,11 +1481,11 @@ msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)" msgid "Dead Zone" msgstr "'éŠã³'ã®èª¿æ•´" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1535,24 +1493,24 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." -msgstr "ISOファイルを解å‡" +msgstr "ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." -msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" +msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" -msgstr "解å‡ä¸­..." +msgstr "復元中..." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1561,11 +1519,11 @@ msgid "Default font" msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" @@ -1574,11 +1532,11 @@ msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "説明" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "検出" @@ -1592,13 +1550,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1622,28 +1580,16 @@ msgstr "" "ディレクトリã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—\n" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Disable Lighting" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Disable Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1657,7 +1603,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1672,30 +1618,20 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"テクスãƒãƒ£ãƒªãƒ³ã‚°ã‚’無効化ã—ã¾ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" -msgstr "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:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "表示設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1709,20 +1645,24 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "Dolby Pro Logic II decoder" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s グラフィック設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin Webサイト(&W)" @@ -1730,32 +1670,32 @@ msgstr "Dolphin Webサイト(&W)" msgid "Dolphin Configuration" msgstr "Dolphinã®è¨­å®š" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Wiiリモコンã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状æ³(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1763,7 +1703,7 @@ msgstr "" "ゲームリストã¯ç©ºã§ã™ã€‚ã“ã®æ–‡ç« ã‚’ダブルクリックã—㦠GC/Wii ã®ISO ã¾ãŸã¯ WBFS " "ã‚‚ã—ã㯠WADファイルã®ã‚るフォルダをé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1771,16 +1711,21 @@ msgstr "" "リスト中ã®å…¨ã¦ã®ã‚²ãƒ¼ãƒ ãŒè¨­å®šã«ã‚ˆã‚Šè¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“。ã“ã®æ–‡ç« ã‚’ダブルクリッ" "クã™ã‚‹ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "è¦æ±‚ã•ã‚ŒãŸæ“作を完了ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" -msgstr "Down" +msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" -msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’ダウンロード (WiiRD Database)" +msgstr "Webã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’入手 (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" @@ -1789,27 +1734,27 @@ msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1820,7 +1765,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1830,7 +1775,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1840,24 +1785,24 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "オランダ語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "終了" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1870,11 +1815,11 @@ msgstr "" msgid "EUROPE" msgstr "欧州" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "編集" @@ -1882,7 +1827,7 @@ msgstr "編集" msgid "Edit ActionReplay Code" msgstr "コードを編集" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "iniを編集" @@ -1890,12 +1835,12 @@ msgstr "iniを編集" msgid "Edit Patch" msgstr "パッãƒã‚’編集" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "編集" @@ -1903,15 +1848,15 @@ msgstr "編集" msgid "Effect" msgstr "エフェクト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "エミュレーションスレッドã¯ã™ã§ã«ç¨¼åƒä¸­ã§ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1925,7 +1870,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Virtual】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1942,19 +1887,19 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "動作状æ³ï¼š" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "有効" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1963,79 +1908,74 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ステレオスコピック3D(立体視)表示を有効ã«ã—ã¾ã™ã€‚使用ã™ã‚‹ã«ã¯ GPUã«ã‚ˆã‚‹Nvidia " -"3D Visionã®ã‚µãƒãƒ¼ãƒˆãŒå¿…è¦ã§ã™ã€‚\n" +"立体視表示を有効ã«ã—ã¾ã™ã€‚使用ã™ã‚‹ã«ã¯GPUã«ã‚ˆã‚‹ Nvidia 3D Vision ã®ã‚µãƒãƒ¼ãƒˆãŒ" +"å¿…è¦ã§ã™ã€‚\n" "ã»ã¨ã‚“ã©ã®å ´åˆä½•ã‹ã—らã®å•é¡ŒãŒç™ºç”Ÿã™ã‚‹ã§ã—ょã†ã€‚\n" "ã“ã®æ©Ÿèƒ½ã¯ãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³è¡¨ç¤ºæ™‚ã®ã¿å‹•ä½œã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Enable BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Enable Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Enable Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "ホットキーを使用" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2049,7 +1989,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2057,11 +1997,11 @@ msgstr "" "ディスクã®èª­ã¿å–り速度をå‘上ã•ã›ã¾ã™ã€‚å¿…è¦ã«ãªã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã¯ã‚ãšã‹ã§ã™ [有効ï¼" "ロード時間短縮ï¼ç„¡åŠ¹ï¼äº’æ›æ€§ãƒ»å®‰å®šæ€§é‡è¦–]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "ページ分ã‘ã—ã¦è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2073,7 +2013,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2084,7 +2024,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2092,21 +2032,35 @@ msgstr "" "トワイライトプリンセスã«ãŠã„ã¦ã€åºƒå¤§ãªã‚¨ãƒªã‚¢ã§ç™ºç”Ÿã™ã‚‹FPS低下を抑ãˆã¾ã™ã€‚ä»–ã®" "タイトルã§ã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Block Address Translation (BAT)：メモリ管ç†æ©Ÿæ§‹ã®æ©Ÿèƒ½ã®ä¸€ã¤ã§ã€æœ‰åŠ¹ã«ã™ã‚‹ã¨" -"ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" -"速度å‘上]" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚OSX " +"ã«ã¯ç¾åœ¨æœªå¯¾å¿œã§ã™" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚" +"OpenALã®ã¿å¯¾å¿œ" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚" +"OpenALã®ã¿å¯¾å¿œã€‚『soft_oal.dllã€ã‚’『OenAL32.dllã€ã«ãƒªãƒãƒ¼ãƒ ã™ã‚‹ã“ã¨ã§å‹•ä½œã—ã¾" +"ã™" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2118,7 +2072,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2126,7 +2080,7 @@ msgstr "" "メモリ管ç†æ©Ÿæ§‹ã‚’有効ã«ã—ã¾ã™ã€‚ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã§å¿…è¦ã§ã™ [有効ï¼äº’æ›æ€§ãƒ»å®‰å®š" "性é‡è¦–ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2140,14 +2094,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "英語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "画質å‘上ã®è¨­å®š" @@ -2165,17 +2119,17 @@ msgstr "エントリ %d/%d" msgid "Entry 1/%d" msgstr "エントリ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "ã«ä¸€è‡´ã™ã‚‹" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" @@ -2213,36 +2167,32 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphinを終了" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "ファイルを抽出" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" @@ -2250,15 +2200,15 @@ msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" msgid "Export failed, try again?" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚リトライã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2268,54 +2218,54 @@ msgstr "特殊パラメータ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰åŠ¹ãªè¨­å®šã§ã™" +msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰ç”¨ãªè¨­å®šã§ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." -msgstr "ã“ã® Partition を抽出" +msgstr "ã“ã®ãƒ‘ーティションを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." -msgstr "抽出中" +msgstr "抽出ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO ãƒã‚¤ãƒˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO プレーヤー" @@ -2323,7 +2273,7 @@ msgstr "FIFO プレーヤー" msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FSTサイズ" @@ -2331,15 +2281,15 @@ msgstr "FSTサイズ" msgid "Failed to Connect!" msgstr "接続ã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Listenã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "コードã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2358,26 +2308,31 @@ msgid "" msgstr "" "DSP ROMã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸï¼š\t%s\n" "\n" -"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯DSP-LLEを使用ã™ã‚‹ã®ã«å¿…è¦ã§ã™\n" +"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯DSP-LLEを使用ã™ã‚‹ã®ã«å¿…è¦ãªã‚‚ã®ã§ã™\n" "ã“ã‚Œã¯è‘—作権をæŒã¤ãƒ‡ãƒ¼ã‚¿ãªã®ã§Dolphinã«ã¯å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“\n" "DSPSpyを使用ã—ã¦ã‚ãªãŸã®GC/Wii 実機よりダンプを行ã£ã¦ä¸‹ã•ã„\n" "\n" "ダンプãŒé›£ã—ã„環境ã§ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸è¦ãªDSP-HLEエンジンを使用ã—ã¦ãã ã•ã„\n" -"(Dolphin本体ã®è¨­å®šâ†’\"サウンド設定\"ã§é¸æŠžã§ãã¾ã™)" +"(本体設定→\"サウンド\"ã§é¸æŠžã§ãã¾ã™)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "bthprops.cpl ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to load bthprops.cpl" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "hid.dll ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to load hid.dll" + +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Failed to write header for %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" -msgstr "banner.bin ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to read banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 #, c-format @@ -2386,6 +2341,9 @@ msgid "" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" +"Failed to read block %d of the save data\n" +"Memcard may be truncated\n" +"FilePosition:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2406,7 +2364,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286 #, c-format msgid "Failed to read data from file %d" -msgstr "ファイル %d ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã®èª­ã¿å–ã‚Šã«å¤±æ•—" +msgstr "Failed to read data from file %d" #: Source/Core/Core/Src/HW/GCMemcard.cpp:136 msgid "" @@ -2434,7 +2392,7 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "ディスクイメージã‹ã‚‰ã®ãƒ¦ãƒ‹ãƒ¼ã‚¯IDã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to read unique ID from disc image" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84 msgid "Failed to write BT.DINF to SYSCONF" @@ -2454,23 +2412,19 @@ msgstr "Failed to write header for %s" msgid "Failed to write header for file %d" msgstr "Failed to write header for file %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "ペルシア語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Fast Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2478,23 +2432,23 @@ msgstr "" "致命的ãªdesyncãŒç™ºç”Ÿã—ãŸãŸã‚å†ç”Ÿã‚’中止ã—ã¾ã™ã€‚ (Error in PlayWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "ファイル情報" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "コードをå«ã¾ãªã„ファイルã§ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" -msgstr "ファイルã¯GCIã«å¤‰æ›ã•ã‚Œã¾ã—ãŸ" +msgstr "ファイルã¯GCIã¸å¤‰æ›ã•ã‚Œã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2511,7 +2465,7 @@ msgstr "" "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µå­ã¯ \"%s\" ã§ã™\n" "有効ãªæ‹¡å¼µå­ã¯ .raw/.gcp ã§ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ" @@ -2524,47 +2478,47 @@ msgstr "圧縮ã•ã‚Œã¦ã„ãªã„ファイル" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "次ã¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "å‰ã¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ブロック開始ä½ç½®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" -msgstr "Force 16:9" +msgstr "強制的㫠16:9 ã«ã™ã‚‹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" -msgstr "Force 4:3" +msgstr "強制的㫠4:3 ã«ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Force Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2532,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2544,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2613,56 +2567,56 @@ msgstr "" msgid "Forward" msgstr "å‰æ–¹" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "検索çµæžœï¼š%d 件 '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "フレーム" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "フレーム" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "フレームã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "フレームã®ç¯„囲" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "フレームリミット：" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "フリールック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "フランス語" @@ -2670,20 +2624,20 @@ msgstr "フランス語" msgid "Frets" msgstr "フレットボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "開始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "全画é¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" -msgstr "フルスクリーン表示時解åƒåº¦ï¼š" +msgstr "全画é¢è¡¨ç¤ºæ™‚ã®è§£åƒåº¦ï¼š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI ファイル (*.gci)" @@ -2691,57 +2645,61 @@ msgstr "GCI ファイル (*.gci)" msgid "GCMic Configuration" msgstr "マイクã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ゲームID" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "ã™ã§ã«èµ·å‹•ã—ã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "ゲームãŒèµ·å‹•ã—ã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "ゲームãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" -msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" +msgstr "メモリーカードファイル (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "ゲームキューブã®å…¥åŠ›è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Geckoコード" @@ -2758,42 +2716,42 @@ msgstr "" "ãƒã‚¤ãƒ†ã‚£ãƒ–コードãƒãƒ³ãƒ‰ãƒ©ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„。Sys フォルダ㫠codehandler.bin " "ã‚’ç½®ãã€Dolphinã‚’å†èµ·å‹•ã™ã‚‹ã“ã¨ã§åˆ©ç”¨ã§ãã¾ã™)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "一般" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "一般" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ドイツ語" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾ã™ %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "ビデオ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "æç”»ã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "より大ãã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2809,7 +2767,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "ギリシア語" @@ -2829,23 +2787,23 @@ msgstr "ç·‘ - å³" msgid "Guitar" msgstr "ギターコントローラ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is called, please report!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "高速化(Hacks)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:158 msgid "Header checksum failed" -msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" +msgstr "Header checksum failed" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "ヘブライ語" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "範囲(縦)" @@ -2853,7 +2811,7 @@ msgstr "範囲(縦)" msgid "Help" msgstr "ヘルプ" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2870,15 +2828,15 @@ msgstr "" "\n" "ã•ã‚ˆãªã‚‰ï¼\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éš ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "マウスカーソルを隠ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2893,8 +2851,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "ホスト" @@ -2902,26 +2860,26 @@ msgstr "ホスト" msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2934,31 +2892,31 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL設定" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "ãƒã‚¤ãƒ³ã‚¿" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR ãƒã‚¤ãƒ³ã‚¿" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -2966,24 +2924,24 @@ msgstr "フォルダ一覧" msgid "ITALY" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" "主ã«ãƒšãƒ¼ãƒ‘ーマリオシリーズã§ä½¿ã‚れるã€Bounding Boxレジスタをサãƒãƒ¼ãƒˆã—ã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSãŒå®‰å®šã—ãªã„ゲームã§åŠ¹æžœãŒã‚ã‚Šã¾ã™ [有効ï¼äº’æ›æ€§å‘上ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2993,11 +2951,11 @@ msgstr "" "実機(NTSC:60ï¼PAL:50)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignore Format Changes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3011,7 +2969,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3025,7 +2983,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "セーブデータをインãƒãƒ¼ãƒˆ" @@ -3033,7 +2991,7 @@ msgstr "セーブデータをインãƒãƒ¼ãƒˆ" msgid "Import failed, try again?" msgstr "インãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚リトライã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3041,11 +2999,11 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'gsc'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "インãƒãƒ¼ãƒˆã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®é•·ã•ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3053,7 +3011,7 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'sav'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3066,28 +3024,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"å…‰æºå‡¦ç†ã‚’無効化ã—ã¾ã™ã€‚\n" -"動作速度ãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€å¤šãã®ã‚¿ã‚¤ãƒˆãƒ«ã§ç”»é¢ãŒæ­£ã—ã表示ã•ã‚Œãªã ãªã‚Šã¾" -"ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "ソコソコ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "ゲーム内" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "情報" @@ -3095,7 +3041,7 @@ msgstr "情報" msgid "Information" msgstr "情報" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "入力" @@ -3107,7 +3053,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3115,13 +3061,13 @@ msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" msgid "Insert name here.." msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" -msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" +msgstr "Wiiメニューã¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" #: Source/Core/Core/Src/MemTools.cpp:248 msgid "" @@ -3130,23 +3076,23 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." -msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." +msgstr "追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "エラー" +msgstr "エラーãŒç¢ºèªã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "完了" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "ãƒã‚§ãƒƒã‚¯çµ‚了。整åˆæ€§ã«å•é¡Œã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3155,40 +3101,40 @@ msgstr "" "パーティション %d ã«å•é¡ŒãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ データãŒç ´æã—ã¦ã„ã‚‹ã‹ã€æ­£ã—ãパッ" "ãƒãŒå½“ã¦ã‚‰ã‚Œã¦ã„ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" -msgstr "Internal LZO Error - 圧縮ã«å¤±æ•—" +msgstr "Internal LZO Error - compression failed" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -"Internal LZO Error - 復元ã«å¤±æ•— (%d) (%li, %li) \n" +"Internal LZO Error - decompression failed (%d) (%li, %li) \n" "ã‚‚ã†ä¸€åº¦ãƒ­ãƒ¼ãƒ‰ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internal LZO Error - lzo_init() failed" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "イントロ" @@ -3197,11 +3143,11 @@ msgstr "イントロ" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Invalid Size(%x) or Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "無効ãªå€¤ã§ã™ï¼" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" @@ -3210,7 +3156,7 @@ msgstr "Invalid bat.map or dir entry" msgid "Invalid event type %i" msgstr "Invalid event type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "ä¸æ­£ãªãƒ•ã‚¡ã‚¤ãƒ«" @@ -3225,29 +3171,29 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "エラー：オブジェクトをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" -msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +msgstr "ä¸æ­£ãªã‚¹ãƒ†ãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "イタリア語" @@ -3255,16 +3201,16 @@ msgstr "イタリア語" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "日本語" @@ -3272,7 +3218,7 @@ msgstr "日本語" msgid "KOREA" msgstr "韓国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3283,17 +3229,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "最å‰é¢ã«è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "韓国語" @@ -3309,32 +3255,36 @@ msgstr "Lボタン" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "L (åŠæŠ¼ã—)" +msgstr "L (アナログ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "GUI言語：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最後ã«ä¸Šæ›¸ãã—ãŸã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "レイテンシー：" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" -msgstr "Left" +msgstr "å·¦" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60 msgid "Left Stick" msgstr "左スティック" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3342,7 +3292,7 @@ msgstr "" "左クリックã§ã‚­ãƒ¼ã®å…¥åŠ›å¾…ã¡\n" "スペースキーを入力ã§æ¶ˆåŽ»ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3352,84 +3302,84 @@ msgstr "" "中クリックã§æ¶ˆåŽ»\n" "å³ã‚¯ãƒªãƒƒã‚¯ã§è©³ç´°è¨­å®šã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -"å·¦ã‹å³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" +"å·¦orå³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" "中クリックã§æ¶ˆåŽ»ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "ステートロード - スロット 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "ステートロード - スロット 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "ステートロード - スロット 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "ステートロード - スロット 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "ステートロード - スロット 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "ステートロード - スロット 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "ステートロード - スロット 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "ステートロード - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3444,36 +3394,43 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "特定ã®ã‚²ãƒ¼ãƒ å‘ã‘ã®è¨­å®šå€¤ã‚’読ã¿è¾¼ã¿ã¾ã™" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "ログ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "ログã®è¨­å®š" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "FPSã®ãƒ­ã‚°ã‚’ä¿å­˜" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"FPSã®ãƒ­ã‚°ã‚’ User/Logs/fps.txt ã«ä¿å­˜ã—ã¾ã™ã€‚\n" +"\n" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "ログ出力先" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "ログ" @@ -3481,10 +3438,6 @@ msgstr "ログ" msgid "Lost connection to server!" msgstr "サーãƒãƒ¼ã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Low level (LLE) or high level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3498,12 +3451,12 @@ msgstr "" "MD5ã®ä¸æ•´åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" @@ -3512,33 +3465,33 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "メーカー" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "最大" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®ã‚»ãƒ¼ãƒ–データã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "ã™ã§ã«é–‹ã„ã¦ã„ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "メモリーカード" @@ -3548,7 +3501,7 @@ msgid "" "could mangle stuff!" msgstr "メモリーカードマãƒãƒ¼ã‚¸ãƒ£ã€€ï½žä½¿ç”¨å‰ã«ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‚’ï¼" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3573,20 +3526,20 @@ msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã« msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "マイク" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3595,7 +3548,7 @@ msgstr "ãã®ä»–ã®è¨­å®š" msgid "Modifier" msgstr "感度変更" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3611,16 +3564,16 @@ msgstr "" msgid "Monospaced font" msgstr "等幅フォント" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "モーションプラス" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3642,7 +3595,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3650,11 +3603,11 @@ msgstr "" "Wii リモコン内蔵ã®ã‚¹ãƒ”ーカーを無効化ã—ã¾ã™ã€‚実機Wii リモコン使用中ランダムã«" "切断ã•ã‚Œã‚‹å•é¡Œã‚’解消ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3742,38 +3695,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "åå‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "åå‰ï¼š " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ãƒã‚¤ãƒ†ã‚£ãƒ– GCI ファイル(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "æ–°è¦æ¤œç´¢" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "次ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "続ã‘ã¦æ¤œç´¢" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "ニックãƒãƒ¼ãƒ ï¼š" @@ -3781,7 +3734,7 @@ msgstr "ニックãƒãƒ¼ãƒ ï¼š" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -3790,8 +3743,8 @@ msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" msgid "No banner file found for title %s" msgstr "%s ã®ãƒãƒŠãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "説明ãªã—" @@ -3799,15 +3752,15 @@ msgstr "説明ãªã—" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "空ãエントリãŒã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "録画ファイルãªã—" @@ -3816,33 +3769,33 @@ msgstr "録画ファイルãªã—" msgid "No save folder found for title %s" msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未確èª" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未接続" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ノート" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "補足： " @@ -3851,7 +3804,7 @@ msgstr "補足： " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "注æ„" @@ -3859,28 +3812,28 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "行数：" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "ヌンãƒãƒ£ã‚¯" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "ヌンãƒãƒ£ã‚¯ã®åŠ é€Ÿåº¦" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "オブジェクト" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "オフ" @@ -3888,60 +3841,56 @@ msgstr "オフ" msgid "Offset:" msgstr "オフセット値：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "オンスクリーンメッセージを表示" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." -msgstr "é–‹ãファイルをé¸æŠž" +msgstr "èµ·å‹•ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: can't create context for device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" -msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +msgstr "OpenAL: can't find sound devices" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" -msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" +msgstr "OpenAL: can't open device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "デãƒãƒƒã‚¬ã‚’é–‹ã" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "ログ画é¢ã‚’é–‹ã" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "設定" @@ -3950,7 +3899,7 @@ msgstr "設定" msgid "Orange" msgstr "オレンジ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3960,8 +3909,8 @@ msgstr "" "å³ã‚¯ãƒªãƒƒã‚¯ã‹ã‚‰ã€Žå…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆã€ã‚’実行ã—ã¦ã€\n" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "ãã®ä»–" @@ -3973,19 +3922,19 @@ msgstr "" "ゲーム中ã«ä»–ã®ãƒ—レーヤーãŒåˆ‡æ–­ã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸï¼æ‰‹å‹•ã§ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã•ã›ã¦ã" "ã ã•ã„" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "出力" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "録画ファイルをå†ç”Ÿ(&L)" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "パッド" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -4001,7 +3950,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "ペアリング" @@ -4013,30 +3962,34 @@ msgstr "Paragraph" msgid "Parameters" msgstr "パラメータ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "一時åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "å†ç”Ÿçµ‚了時ã«ä¸€æ™‚åœæ­¢" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "カンペキï¼" @@ -4045,36 +3998,36 @@ msgstr "カンペキï¼" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "開始" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "録画ファイルをå†ç”Ÿ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "開始ï¼ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "サクサク" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "å†ç”Ÿã‚ªãƒ—ション" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "確èª" @@ -4086,54 +4039,54 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4146,11 +4099,11 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ã“ã“よりå‰" @@ -4158,7 +4111,7 @@ msgstr "ã“ã“よりå‰" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "プロファイル" @@ -4166,7 +4119,7 @@ msgstr "プロファイル" msgid "Properties" msgstr "プロパティ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "キャッシュã®æ•´é “を実行" @@ -4174,8 +4127,8 @@ msgstr "キャッシュã®æ•´é “を実行" msgid "Question" msgstr "確èª" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "終了" @@ -4191,9 +4144,9 @@ msgstr "Rボタン" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "R (åŠæŠ¼ã—)" +msgstr "R (アナログ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4201,46 +4154,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "ロシア" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" -msgstr "å¼·ã•" +msgstr "範囲ï¼å¼·ã•" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "実機Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" -msgstr "実機Wii リモコンを接続" +msgstr "実機Wii リモコンã®è¨­å®š" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wii リモコンã®å†æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ステートロード時ã«Wii リモコンをå†æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "録画" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "録画情報" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "録画オプション" @@ -4256,7 +4209,7 @@ msgstr "赤 - å·¦" msgid "Red Right" msgstr "赤 - å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4271,29 +4224,29 @@ 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "å†æ›´æ–°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "ゲームリストをå†æ›´æ–°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "削除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4303,34 +4256,34 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "åˆæœŸåŒ–" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "çµæžœè¡¨ç¤ºæ¬„" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:29 msgid "Return" -msgstr "Enter" +msgstr "Return" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:57 msgid "Right" -msgstr "Right" +msgstr "å³" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61 msgid "Right Stick" msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "振動" @@ -4339,116 +4292,112 @@ msgstr "振動" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEã®å‡¦ç†ã‚’別スレッドã«åˆ†é›¢ã—ã¦è¡Œã„ã¾ã™ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "ロシア語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Safe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "サンプルレート" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ä¿å­˜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "セーブデータã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "ステートセーブ - スロット 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "ステートセーブ - スロット 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "ステートセーブ - スロット 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "ステートセーブ - スロット 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "ステートセーブ - スロット 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "ステートセーブ - スロット 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "ステートセーブ - スロット 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "ステートセーブ - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" -msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" +msgstr "復元ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" -msgstr "確èªä¸­... .%s" +msgstr "確èªã—ã¦ã„ã¾ã™... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ç”»é¢æ’®å½±" @@ -4456,23 +4405,23 @@ msgstr "ç”»é¢æ’®å½±" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "検索" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "サブフォルダも検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "ç¾åœ¨ã®ã‚ªãƒ–ジェクトを検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "値を検索" @@ -4483,20 +4432,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4514,23 +4463,23 @@ msgstr "インãƒãƒ¼ãƒˆã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4542,17 +4491,19 @@ msgid "" msgstr "" "レンダリング時ã®ã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”ã‚’é¸æŠžã—ã¾ã™ã€‚\n" "自動： ãƒã‚¤ãƒ†ã‚£ãƒ–ã®ã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" -"Force 16:9： 強制的㫠16:9 ã«è¨­å®šã—ã¾ã™ã€‚\n" -"Force 4:3： 強制的㫠4:3 ã«è¨­å®šã—ã¾ã™ã€‚\n" -"ウィンドウã«åˆã‚ã›ã‚‹: ウィンドウサイズã«åˆã£ãŸã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" +"ウィンドウã«åˆã‚ã›ã‚‹ï¼š ウィンドウサイズã«åˆã£ãŸã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "é¸æŠžã•ã‚ŒãŸãƒ—ロファイルã¯å­˜åœ¨ã—ã¾ã›ã‚“" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ³ãƒˆ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4568,7 +4519,7 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã®è§£åƒåº¦ã¨åŒã˜ã‚‚ã®ã‚’ã€\n" "ã‚‚ã—ãã¯ã€æ­£å¸¸ã«å‹•ä½œã™ã‚‹ä¸€ç•ªé«˜ã„解åƒåº¦ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4584,11 +4535,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Direct3D9】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "é€ä¿¡" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "センサーãƒãƒ¼ã®ä½ç½®" @@ -4596,182 +4547,204 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定ã¨ã—ã¦è¨­å®š" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾" "ã™ %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"レイテンシーを調整ã—ã¾ã™ï¼ˆå˜ä½ï¼šms）。高ãã™ã‚‹ã“ã¨ã§éŸ³ã®å•é¡Œã‚’軽減ã§ãã¾ã™ã€‚" +"OpenALã®ã¿" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "設定" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" -msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +msgstr "SetupWiiMem: Cant find setting file" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "通称" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103 msgid "Shoulder Buttons" -msgstr "LRアナログ" +msgstr "LRトリガー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "コンソール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "ログを表示(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "ステータスãƒãƒ¼(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "ツールãƒãƒ¼(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPSを表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "フランス" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "キー入力を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "ログã®è¨­å®šã‚’表示(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PALè¦æ ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "統計情報を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "アメリカåˆè¡†å›½" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" -msgstr "WAD(Wii ウェア)" +msgstr "WAD(Wiiウェア/VC/ãƒãƒ£ãƒ³ãƒãƒ«)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ゲームåœæ­¢å‰ã«ç¢ºèªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "潜在的ã«æ·±åˆ»ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆã«ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’表示ã—ã¾ã™\n" -"無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラーをプレイ中ã«è¡¨ç¤ºã•ã›ãšã«ã™ã¿ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥" -"時ã«ã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" +"無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラー表示ã«æ‚©ã¾ã•ã‚Œãªããªã‚Šã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥æ™‚ã«ã‚¨" +"ラー表示ãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "ラグカウンターを表示" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"エミュレーションウインドウ上ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚\n" +"メモリーカードã¸ã®æ›¸ãè¾¼ã¿ã€èµ·å‹•æ™‚ã®ã‚·ã‚¹ãƒ†ãƒ æƒ…報〠JIT cacheã®æ¶ˆåŽ»ãªã©ãŒå«ã¾" +"ã‚Œã¾ã™ã€‚" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "タイトルを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4783,15 +4756,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4801,31 +4770,35 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4837,7 +4810,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4854,17 +4827,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "スロットB" @@ -4872,7 +4845,7 @@ msgstr "スロットB" msgid "Snapshot" msgstr "スクリーンショット" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software Renderer" @@ -4884,17 +4857,17 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" "ã€Software Renderer】ã¯ä»–ã®æç”»APIã«æ¯”ã¹ã€éžå¸¸ã«ä½Žé€Ÿã§ã™ã€‚\n" -"デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" +"デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿æœ‰ç”¨ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "サウンド設定" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." -msgstr "サウンドAPI %s ã¯ç„¡åŠ¹ã§ã™ã€‚" +msgstr "Sound backend %s is not valid." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format @@ -4905,17 +4878,17 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "スペイン語" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "リモコンスピーカーã®éŸ³é‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4935,11 +4908,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x Native】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "ビデオ出力APIを指定" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -4947,51 +4916,55 @@ msgstr "Speed up Disc Transfer Rate" msgid "Square Stick" msgstr "丸ã¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "標準コントローラ" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "スタート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "ãƒãƒƒãƒˆãƒ—レイを開始(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "録画を開始(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "録画を開始" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "動作率" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "SPEED FORCE" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5005,7 +4978,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "ウィンドウã«åˆã‚ã›ã‚‹" @@ -5026,12 +4999,12 @@ msgstr "%s ã¸ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«æˆåŠŸã—ã¾ã—ãŸ" msgid "Successfully imported save files" msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" @@ -5039,7 +5012,7 @@ msgstr "システムã®è¨€èªžï¼š" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Input" @@ -5060,36 +5033,36 @@ msgstr "左テーブル" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" -msgstr "スクリーンショット" +msgstr "ç”»é¢æ’®å½±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "タルコンガ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "テスト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" -msgstr "WADファイルã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«æˆåŠŸ" +msgstr "WADファイルã®è¿½åŠ ã«æˆåŠŸ" #: Source/Core/Core/Src/ActionReplay.cpp:197 msgid "The address is invalid" @@ -5099,13 +5072,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5129,7 +5102,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s ã¯æ—¢ã«é–‹ã‹ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ãƒ˜ãƒƒãƒ€ãƒ¼ã¯æ›¸ãè¾¼ã¾ã‚Œã¾ã›ã‚“。" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (%s) ã¯å­˜åœ¨ã—ã¾ã›ã‚“" @@ -5146,7 +5119,7 @@ msgstr "',' ã‚’å«ã‚€åå‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5158,11 +5131,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€å³ç«¯ã«åˆã‚ã›ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "コピーã—よã†ã¨ã—ã¦ã„るセーブファイルã®ã‚µã‚¤ã‚ºãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5195,33 +5168,28 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "テーマ" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "00000001/00000002ã®ãƒã‚±ãƒƒãƒˆãŒå¿…è¦ã§ã™ã€‚ãŠãらãä¸å®Œå…¨ãªNANDダンプã§ã™ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -"ã“ã“ã§è¨­å®šã—ãŸé …目㯠''ã“ã®ã‚²ãƒ¼ãƒ ã«é™ã‚Š'' Dolphinやプラグインã®è¨­å®šã‚’上書ãã—" -"ã¾ã™\n" +"ã“ã“ã§è¨­å®šã—ãŸé …目㯠''ã“ã®ã‚²ãƒ¼ãƒ ã«é™ã‚Š'' Dolphinã®åŸºæœ¬è¨­å®šã‚’上書ãã—ã¾ã™\n" "例) ã“ã“ã§ã€ŒEnable Dual Coreã€ã®ãƒã‚§ãƒƒã‚¯ã‚’外ã—ã¦ãŠãã¨\n" "　　 本体設定ã§ãƒ‡ãƒ¥ã‚¢ãƒ«ã‚³ã‚¢å‡¦ç†ã‚’有効化ã—ã¦ã„ã‚‹å ´åˆã§ã‚‚ã€ã“ã®ã‚²ãƒ¼ãƒ ã®ã¿ã‚·ãƒ³ã‚°" "ルコア動作ãŒå¯èƒ½" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5229,16 +5197,18 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" "ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5254,7 +5224,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5265,7 +5235,7 @@ msgstr "" "有効ã«ã™ã‚‹ã¨å‹•ä½œé€Ÿåº¦ãŒå¤§ããå‘上ã—ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãƒã‚°ã®åŽŸå› ã«ãªã‚‹å ´åˆã‚‚" "ã‚ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" @@ -5274,40 +5244,40 @@ msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" msgid "Threshold" msgstr "ã—ãã„値" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "傾ã" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "タイトル" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "終了" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" @@ -5327,7 +5297,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "トルコ語" @@ -5339,12 +5309,12 @@ msgstr "ターンテーブル" msgid "Type" msgstr "å½¢å¼" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDPãƒãƒ¼ãƒˆ:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" @@ -5352,7 +5322,7 @@ msgstr "UDPã§æŽ¥ç¶š" msgid "UNKNOWN" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "UNKNOWN_%02X" @@ -5380,24 +5350,24 @@ msgstr "" "èªã—ã¦ä¸‹ã•ã„。\n" "ã“ã®è¡Œã‚’無視ã—ã¦è§£æžã‚’続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未定義 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Unexpected 0x80 call? Aborting..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "フィルタ無ã—" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Unknown DVD command %08x - fatal error" @@ -5420,34 +5390,34 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Up" -msgstr "Up" +msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "å†å–å¾—" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "フルスクリーンã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5459,7 +5429,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5474,15 +5444,15 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "ユーティリティ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæœŸ (V-Sync)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "値" @@ -5490,23 +5460,23 @@ msgstr "値" msgid "Value:" msgstr "値：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "値：" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5514,13 +5484,13 @@ msgstr "音é‡" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: %s 作æˆã‚¨ãƒ©ãƒ¼" +msgstr "WAD installation failed: error creating %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 msgid "WAD installation failed: error creating ticket" -msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: error creating ticket" +msgstr "WAD installation failed: error creating ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5534,22 +5504,22 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§DOLãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ELFãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting ELF in wrong console mode!" #: Source/Core/Core/Src/Boot/Boot.cpp:221 msgid "Warning - starting ISO in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ISOãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting ISO in wrong console mode!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 #, c-format @@ -5562,7 +5532,7 @@ msgstr "" "%s\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5574,9 +5544,9 @@ msgstr "" "%s\n" "注æ„：ã™ã§ã«ãƒ•ã‚©ãƒ«ãƒ€ãŒã‚ã‚‹å ´åˆã€ä¸­ã®ã‚»ãƒ¼ãƒ–ファイルã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚\n" "\n" -"続ã‘ã¦ã‚‚ã„ã„ ?" +"続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, fuzzy, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5587,7 +5557,7 @@ msgstr "" "> %u)。作業を続行ã™ã‚‹å‰ã«ã€ä»–ã®ã‚»ãƒ¼ãƒ–をロードã€ã¾ãŸã¯èª­ã¿å–り専用モードをオフ" "ã«ã—ã¦ã“ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5599,7 +5569,7 @@ msgstr "" "ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ç¶šã‘ã‚‹ã¨ã€ãŠãらãDesyncã—ã¾" "ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5632,39 +5602,39 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." -msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" +msgstr "WaveFileWriter - file not open." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NANDルート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5672,17 +5642,17 @@ msgstr "Wiiセーブデータ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ファイルã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "入力(Wii)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wii リモコン %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5695,19 +5665,19 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wii リモコンã®æŒ¯å‹•ã‚’有効化" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wii リモコンã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -5727,26 +5697,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "動作中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "コンソールã«å‡ºåŠ›" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "デãƒãƒƒã‚¬ã«æ›¸è¾¼" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "ファイルã«å‡ºåŠ›" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "ウィンドウã«å‡ºåŠ›" @@ -5765,7 +5735,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5786,23 +5756,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" -msgstr "ゲームãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" +msgstr "ソフトãŒé¸ã°ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "åå‰ãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -5825,25 +5795,25 @@ msgstr "" "æ­£ã—ã㯠0x%04x (ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ 0x%04llx)\n" "æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "03コードã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 入力を待機... ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5859,7 +5829,7 @@ msgstr "" msgid "[Custom]" msgstr "[ カスタム設定 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5877,7 +5847,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5891,11 +5861,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5906,13 +5876,13 @@ msgstr "failed to read bk header" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375 #, c-format msgid "failed to read data from file: %s" -msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿èª­ã¿è¾¼ã¿ã«å¤±æ•—: %s" +msgstr "failed to read data from file: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97 msgid "failed to read header" -msgstr "ヘッダã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "failed to read header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5920,10 +5890,9 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Wii ã®ã‚»ãƒ¼ãƒ–データã§ã¯ãªã„ã‹ã€ãƒ˜ãƒƒãƒ€ã‚µã‚¤ã‚ºãŒ %x ã§ã‚ã‚‹ãŸã‚読ã¿å–ã‚Šã«å¤±æ•— " +msgstr "not a wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "　" @@ -5932,7 +5901,7 @@ msgstr "　" msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5944,10 +5913,13 @@ msgstr "zFar 補正値：" msgid "zNear Correction: " msgstr "zNear 補正値：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| (...ã‚‚ã—ãã¯)" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Clear JIT cache" #~ msgstr "JITキャッシュを消去(&C)" @@ -6031,9 +6003,36 @@ 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 ãƒãƒ¼ã‚µã‚¹ãƒ»ã‚¯ãƒ«ã‚»ã‚¤ãƒ‰ - " +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "3Dグラフィックスã®æ·±åº¦å€¤è¨ˆç®—を頂点ã”ã¨ã§ã¯ãªãピクセルã”ã¨ã«è¡Œã„ã¾ã™ã€‚\n" +#~ "Per-Pixel LightingãŒå˜ãªã‚‹ç”»è³ªå‘上機能ã ã£ãŸã®ã¨ã¯å¯¾ç…§çš„ã«ã€\n" +#~ "Per-Pixel Depthã¯ç‰¹å®šã®ã‚²ãƒ¼ãƒ ã‚’æ­£ã—ãエミュレートã™ã‚‹ãŸã‚ã« å¿…è¦ãªæ©Ÿèƒ½ã§" +#~ "ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6082,6 +6081,22 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Couldn't find GameConfig/BreakPoints.ini file" #~ msgstr "GameConfig or BreakPoints.ini ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Created by KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Created by VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6091,9 +6106,27 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Danish" #~ msgstr "デンマーク語" +#~ msgid "Disable Lighting" +#~ msgstr "Disable Lighting" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Disable Per-Pixel Depth" + +#~ msgid "Disable Textures" +#~ msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Wii リモコンスピーカー無効 (Disable Wiimote Speaker)" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "テクスãƒãƒ£ãƒªãƒ³ã‚°ã‚’無効化ã—ã¾ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6153,6 +6186,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Enable Audio Throttle" #~ msgstr "Enable Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Enable BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" @@ -6177,6 +6213,15 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "スクリーンセーãƒãƒ¼ã‚’使用 （画é¢ç„¼ã‘軽減）" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Block Address Translation (BAT)：メモリ管ç†æ©Ÿæ§‹ã®æ©Ÿèƒ½ã®ä¸€ã¤ã§ã€æœ‰åŠ¹ã«ã™ã‚‹" +#~ "ã¨ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼" +#~ "動作速度å‘上]" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" @@ -6211,9 +6256,15 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "%s プラグインã®èª­ã¿è¾¼ã¿ã«å¤±æ•—： ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。å†é¸æŠžã—ã¦ãã ã•" #~ "ã„" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphinを終了" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSPロム (%s) ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Force Bi/Trilinear Filtering" @@ -6245,6 +6296,17 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgstr "" #~ "動作中ã¯ãƒžã‚¦ã‚¹ã‚«ãƒ¼ã‚½ãƒ«ã‚’表示ã—ãªã„よã†ã«ã—ã¾ã™ã€‚（フォーカスãŒã‚る時ã®ã¿ï¼‰" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "å…‰æºå‡¦ç†ã‚’無効化ã—ã¾ã™ã€‚\n" +#~ "動作速度ãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€å¤šãã®ã‚¿ã‚¤ãƒˆãƒ«ã§ç”»é¢ãŒæ­£ã—ã表示ã•ã‚Œãªã ãªã‚Šã¾" +#~ "ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #~ msgid "Input Source" #~ msgstr "入力デãƒã‚¤ã‚¹" @@ -6279,6 +6341,15 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "より正確ãªå‹•ä½œãŒæœŸå¾…ã§ãã¾ã™ãŒã€ 速度低下を引ãèµ·ã“ã™ã“ã¨ã‚‚ã‚ã‚Šã¾ã™(タイト" #~ "ルã¨ç’°å¢ƒã«ã‚ˆã‚Šå·¦å³ã•ã‚Œã‚‹)" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Low level (LLE) or high level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Luaコンソール" @@ -6314,6 +6385,12 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "デãƒãƒƒã‚¬ã‚’é–‹ã" + +#~ msgid "Opens the logger" +#~ msgstr "ログ画é¢ã‚’é–‹ã" + #~ msgid "Plugins" #~ msgstr "プラグイン" @@ -6349,6 +6426,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Running script...\n" #~ msgstr "スクリプトを実行中..." +#~ msgid "Sample Rate:" +#~ msgstr "サンプルレート" + #~ msgid "Scale:" #~ msgstr "内部解åƒåº¦" @@ -6391,6 +6471,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Show the number of frames rendered per second." #~ msgstr "ç”»é¢å·¦ä¸Šã«FPSを表示ã—ã¾ã™" +#~ msgid "Show this help message" +#~ msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6428,6 +6511,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "ãŒå¯èƒ½ã§ã™\n" #~ "ãã®ä»–ã®ã‚ªãƒ—ションã¯è¡¨ç¤ºè§£åƒåº¦ã«é–¢ä¿‚ãªã固定ã•ã‚ŒãŸå€çŽ‡ã§å‡ºåŠ›ã™ã‚‹ã‚‚ã®ã§ã™" +#~ msgid "Specify a video backend" +#~ msgstr "ビデオ出力APIを指定" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "全画é¢è¡¨ç¤ºã§é–‹å§‹" @@ -6437,6 +6523,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" +#~ msgid "Theme selection went wrong" +#~ msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index ce10509d26..6d243c8a63 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-01-19 11:47+0900\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-22 03:47+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Korean\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (í‘œì‹œí•˜ê¸°ì— ë„ˆë¬´ 많ì€)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "게임 :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -45,24 +45,17 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i ì—°ê²°ë˜ì—ˆìŠµë‹ˆë‹¤" @@ -151,158 +144,158 @@ msgstr "%sGCI 내보내기%s" msgid "%sImport GCI%s" msgstr "%sGCI 가져오기%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "ëŒí•€ì— 대해(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVD ë“œë¼ì´ë¸Œì—ì„œ 부트(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "브레ì´í¬í¬ì¸íŠ¸(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ISO í´ë”íƒìƒ‰(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "치트 매니저(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "ì—뮬레ì´ì…˜(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "파ì¼(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "프레임 진행(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "전체화면(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "그래픽 설정(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "ë„움(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "단축키 설정(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "ìƒíƒœ 로드(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "메모리 ì¹´ë“œ 매니저(GC) (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "메모리(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "열기(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "옵션(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "ì¼ì‹œì •ì§€(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "ì†ì„±(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "ê²Œìž„ëª©ë¡ ìƒˆë¡œ 고침(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "레지스터들(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "리셋(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "사운드(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "중지(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "ë„구(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "비디오(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "보기(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "위키(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -316,27 +309,27 @@ msgstr "(-)+z근거리" msgid "(UNKNOWN)" msgstr "(알려지지 ì•ŠìŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ë”)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" -msgstr "" +msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 비트" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 비트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D 비전" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 비트" @@ -344,46 +337,48 @@ msgstr "8 비트" msgid "" msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<시스템>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" -msgstr "" +msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ë„·í”Œë ˆì´ ìœˆë„ìš°ê°€ ì´ë¯¸ 열려있습니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "현재 ê²Œìž„ì´ êµ¬ë™ë˜ê³  있지 않습니다." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "지ì›ë˜ëŠ” 블루투스 장치를 ì°¾ì„ ìˆ˜ 없습니다!\n" -"(마ì´í¬ë¡œì†Œí”„트 블루투스 스íƒë§Œ 지ì›ë©ë‹ˆë‹¤.)" +"마ì´í¬ë¡œì†Œí”„트 블루투스 스íƒì„ 사용하고 있지 않다면 위모트들과 수ë™ìœ¼ë¡œ ì§ì„ " +"지으셔야하고 \"갱신\" 버튼 ë§Œì„ ì´ìš©í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -417,13 +412,13 @@ msgstr "" "\n" "TCP í¬íŠ¸ë¥¼ í˜¸ìŠ¤íŠ¸ì— ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-기반보드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 코드" @@ -431,19 +426,19 @@ msgstr "AR 코드" msgid "About Dolphin" msgstr "ëŒí•€ì— 대해" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "ê°€ì†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "정확성:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -456,8 +451,8 @@ msgstr "" "\n" "확신 없으면, í…ìŠ¤ì²˜ì— EFB를 ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr " [ ì•¡ì…˜ ]" @@ -476,14 +471,14 @@ msgstr "" "ë²”ì¸ ì½”ë“œ:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 코드 추가 (%s)ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -492,7 +487,7 @@ msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 채우기와 슬ë¼ì´ë“œ(%s)" "ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -501,7 +496,7 @@ msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 램 쓰기와 채우기 (%s)" "ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -509,44 +504,47 @@ msgid "" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) í¬ì¸í„° (%s)ì— ì“°ê¸°ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x), 메모리 복사 (%s)ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" -"ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 매스터 코드와 CCXXXXXXì— ì“°ê¸°ê°€ 시행ë˜ì§€ 않습니다 (%s)" +"ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 마스터 코드와 CCXXXXXXì— ì“°ê¸°ê°€ 실행ë˜ì§€ 않었습니다. " +"(%s)\n" +"마스터 코드가 필요하지 않습니다. 마스터 코드를 사용하지 마세요." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© AR 코드 ë¼ì¸: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¡°ê±´ì  ì½”ë“œ: 비ì í•© í¬ê¸° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: 비ì í•© ì¼ë°˜ 코드 타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 %i: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 0: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "어댑터:" @@ -555,11 +553,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "패치 추가" @@ -567,13 +565,13 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "추가..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "주소 :" @@ -613,74 +611,76 @@ msgstr "" "\n" "알아ë‘기: 얻어진 ê°’ë“¤ì— ëŒ€í•´ 로그윈ë„ìš°/ì½˜ì†”ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "고급 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" +msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ì—뮬레ì´ì…˜ 창안ì—ì„œ 3, 4, 5, 6, 7 í•«í‚¤ë“¤ì„ í†µí•´ 특정 옵션들 í† ê¸€ì„ í—ˆìš©í•©ë‹ˆ" -"다.\n" +"ì—뮬레ì´ì…˜ 창안ì—ì„œ 3, 4, 5, 6 í•«í‚¤ë“¤ì„ í†µí•´ 특정 옵션들 í† ê¸€ì„ í—ˆìš©í•©ë‹ˆë‹¤.\n" "\n" -"확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "위모트 타ì´ë° 대안" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" +msgstr "분ì„" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "비등방성 í•„í„°ë§:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "안티-앨리어싱:" @@ -692,15 +692,15 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "앱로ë”:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "ì ìš©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -710,16 +710,16 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ì•„ëžì–´" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -727,12 +727,12 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -740,12 +740,12 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -753,24 +753,24 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "ìžë™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "ìžë™ (640x528ì˜ ë°°ìˆ˜)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "ìžë™ (윈ë„ìš° í¬ê¸°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "윈ë„ìš° í¬ê¸° ìžë™ ì¡°ì •" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -780,41 +780,28 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"메모리ì—ì„œ ë°‰ë§µë“¤ì„ ë””ì½”ë”©í•˜ëŠ” ëŒ€ì‹ ì— ìžë™ì ìœ¼ë¡œ ìƒì„±í•©ë‹ˆë‹¤.\n" -"성능향ìƒì„ 조금 가져옵니다만 미약한 í…스처 ê²°í•¨ì´ ë°œìƒí• ì§€ë„ 모릅니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" -msgstr "" +msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " -msgstr "레지스터들(&R)" +msgstr "BP 레지스터" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "백엔드 설정" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "백엔드:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "백그ë¼ìš´ë“œ ìž…ë ¥" @@ -827,16 +814,16 @@ msgstr "뒤로" msgid "Bad File Header" msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "배너:" @@ -844,11 +831,11 @@ msgstr "배너:" msgid "Bar" msgstr "ë°”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "기본 설정" @@ -860,7 +847,7 @@ msgstr "ë² ì´ìŠ¤" msgid "Block Allocation Table checksum failed" msgstr "블럭 할당 í…Œì´ë¸” ì²´í¬ì„¬ì„ 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "블럭들" @@ -876,50 +863,56 @@ msgstr "파랑 왼쪽" msgid "Blue Right" msgstr "파랑 오른쪽" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "아래" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "고장남" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "í´ë”íƒìƒ‰" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "버í¼:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "버튼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 -msgid "C" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." msgstr "" +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +msgid "C" +msgstr "C" + #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" msgstr "C 스틱" @@ -928,34 +921,19 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" -msgstr "" +msgstr "CP 레지" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"버í…스단위 ëŒ€ì‹ ì— í”½ì…€ë‹¨ìœ„ë¡œ 3D 그래픽 ê¹Šì´ ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤.\n" -"í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 ë•Œ " -"필요가 있습니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -969,7 +947,7 @@ msgstr "" "\n" "모르겠으면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "취소" @@ -985,7 +963,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -996,7 +974,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1004,18 +982,18 @@ msgstr "" "ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" "ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: ì¹˜ëª…ì  ì—러" @@ -1023,28 +1001,28 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "카탈로니아어" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "중앙" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "변경" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ë””ìŠ¤í¬ ë³€ê²½(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ë””ìŠ¤í¬ ë³€ê²½" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "게임 변경" @@ -1065,11 +1043,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "채팅" @@ -1077,47 +1054,47 @@ msgstr "채팅" msgid "Cheat Code" msgstr "치트 코드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "치트 찾기" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "치트들 관리ìž" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "파티션 완전성 ì²´í¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "파티션 완전성 ì²´í¬ì¤‘..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1125,15 +1102,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로ë”ë¡œ 사용할 파ì¼ì„ ì„ íƒ: (디렉토리들로만 êµ¬ì„±ëœ ë””ìŠ¤í¬ë“¤ì—게만 ì ìš©ë¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1147,8 +1124,8 @@ msgstr "í´ëž˜ì‹" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "깨ë—ì´" @@ -1160,22 +1137,22 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— í´ë¼ì´ì–¸íŠ¸ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥. 수ë™ìœ¼ë¡œ 게임" "ì„ ì¤‘ì§€í•´ì•¼í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "닫기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "환경설정(&n)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "코드 ì •ë³´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "코드:" @@ -1183,95 +1160,95 @@ msgstr "코드:" msgid "Command" msgstr "명령" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "주ì„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO 압축하기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr " 환경 " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "환경설정" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "컨트롤 설정" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "패드들 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "중지시 확ì¸" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "위모트 %i ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "위모트 1 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "위모트 2 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "위모트 3 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "연결중..." @@ -1287,16 +1264,16 @@ msgstr "컨트롤" msgid "Convert to GCI" msgstr "GCI ë¡œ 변환" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "코어" @@ -1305,7 +1282,7 @@ msgstr "코어" msgid "Could not create %s" msgstr "%s 를 ìƒì„±í•  수 없었습니다" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "백엔드 %s 를 초기화할 수 없었습니다" @@ -1326,12 +1303,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파ì¼ì„ ì¸ì‹í•  수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1339,7 +1316,7 @@ msgstr "" "íŒ¨ë“œë“¤ì„ ì„¤ì •í•  수 없었습니다. 플레ì´ì–´ê°€ 떠났거나 ê²Œìž„ì´ í˜„ìž¬ 구ë™ì¤‘!\n" "(ê²Œìž„ì´ êµ¬ë™ì¤‘ì¼ ë•Œ íŒ¨ë“œë“¤ì„ ì„¤ì •í•˜ê¸°ëŠ” ì•„ì§ ì§€ì›ë˜ì§€ 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1351,11 +1328,11 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1363,17 +1340,17 @@ msgstr "" "코어를 초기화할 수 없었습니다\n" "ë‹¹ì‹ ì˜ í™˜ê²½ì„¤ì •ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "êµ­ê°€:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR 코드 ìƒì„±" @@ -1382,27 +1359,7 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by KDE-Look.org" -msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" - -#: 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:496 -msgid "Created by VistaIcons.com" -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ì—ì„œ ê²Œì‹œë¨ " - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "만든ì´:" @@ -1410,11 +1367,11 @@ msgstr "만든ì´:" msgid "Critical" msgstr "치명ì " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "ìžë¥´ê¸°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1428,12 +1385,12 @@ msgstr "" msgid "Crossfade" msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" @@ -1441,73 +1398,73 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" msgid "Custom Projection Hack Settings" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ì²´ì½”" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-패드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 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 "" +msgstr "DVD저수준ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했습니다" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVD저수준비암호화ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했습니다." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "날짜:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro 파ì¼ë“¤(*.sav)" @@ -1519,11 +1476,11 @@ msgstr "Datel MaxDrive/Pro 파ì¼ë“¤(*.sav)" msgid "Dead Zone" msgstr "ë°ë“œ ì¡´" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "디버깅" @@ -1531,24 +1488,24 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1557,11 +1514,11 @@ msgid "Default font" msgstr "기본 í°íŠ¸" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "ì‚­ì œ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "저장 지우기" @@ -1570,11 +1527,11 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "설명" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "ê°ì§€" @@ -1587,13 +1544,13 @@ msgstr "" "출력 ë²„í¼ ì•ˆì— ì í•©í•œ 것보다 ë” ë§Žì€ ë°ì´í„° ì½ê¸° ì‹œë„ê°€ ê°ì§€ë˜ì—ˆìŠµë‹ˆë‹¤. ê³ ì •" "(Clamp)." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "장비 설정" @@ -1617,28 +1574,16 @@ msgstr "" "디렉토리 ì²´í¬ì„¬ì´ 실패했습니다\n" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ê´‘ì› ë”" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "í…스처들 ë”" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1652,7 +1597,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1666,17 +1611,7 @@ msgstr "" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"í…스처ë§ì„ 비활성합니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "디스í¬" @@ -1685,11 +1620,11 @@ msgstr "디스í¬" msgid "Disc Read Error" msgstr "ë””ìŠ¤í¬ ì½ê¸° ì—러" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "화면표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1703,20 +1638,24 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "ëŒë¹„ 프로 ë¡œì§ II 디코ë”" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "ëŒí•€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ëŒí•€ %s 그래픽 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "ëŒí•€ 웹 사ì´íŠ¸(&W)" @@ -1724,32 +1663,32 @@ msgstr "ëŒí•€ 웹 사ì´íŠ¸(&W)" msgid "Dolphin Configuration" msgstr "ëŒí•€ 환경설정" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "ëŒí•€ 위모트 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "ëŒí•€ 구글 코드(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1757,7 +1696,7 @@ msgstr "" "ëŒí•€ì´ ì–´ëŠ GC/Wii ISOë„ ì°¾ì„ ìˆ˜ 없었습니다. 파ì¼ì„ 둘러보려면 여기를 ë”블í´" "릭하세요..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1765,16 +1704,21 @@ msgstr "" "ëŒí•€ì´ 현재 모든 ê²Œìž„ë“¤ì„ ìˆ¨ê¸°ê²Œ 설정ë¨. 모든 ê²Œìž„ë“¤ì„ ë³´ë ¤ë©´ 여기를 ë”블í´" "릭..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "ëŒí•€ì´ ìš”ì²­ëœ ì•¡ì…˜ì„ ì™„ìˆ˜í•  수 없었습니다." + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "아래" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "코드(WiiRD ë°ì´í„°ë² ì´ìŠ¤) 다운로드" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" @@ -1783,27 +1727,27 @@ msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1813,7 +1757,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1823,7 +1767,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1833,41 +1777,41 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "네ëœëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "종료(&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB 복사" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"ì—러: ì´ ë²„ì „ì˜ ëŒí•€ì€ ì ì–´ë„ 버전 %d.%dì¸ TAP-Win32 ë“œë¼ì´ë²„ê°€ 필요하다 " -"-- ë‹¹ì‹ ì´ ìµœê·¼ì— ë‹¹ì‹ ì˜ ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼" -"ì´ë²„를 알게 하려는 ì‹œì ì—ì„œ ì•„ë§ˆë„ ìž¬ë¶€íŒ…ì´ í•„ìš”í•©ë‹ˆë‹¤." +"ì—러: ì´ ë²„ì „ì˜ ëŒí•€ì€ ì ì–´ë„ %d.%d 버전 TAP-Win32 ë“œë¼ì´ë²„ê°€ 필요합니다. " +"-- ìµœê·¼ì— ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼ì´ë²„를 ì¸ì‹í•˜" +"는 ê´€ì ì—ì„œ ìž¬ë¶€íŒ…ì´ í•„ìš”í•  ê²ë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "유럽" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "빠른 메모리 ì—…ë°ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "편집" @@ -1875,7 +1819,7 @@ msgstr "편집" msgid "Edit ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "환경 편집" @@ -1883,12 +1827,12 @@ msgstr "환경 편집" msgid "Edit Patch" msgstr "패치 편집" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "편집..." @@ -1896,15 +1840,15 @@ msgstr "편집..." msgid "Effect" msgstr "효과" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버í¼" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "ì—뮬 쓰레드가 ì´ë¯¸ 구ë™ì¤‘ìž„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1918,7 +1862,7 @@ msgstr "" "\n" "모르겠으면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1934,19 +1878,19 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1962,72 +1906,67 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "BAT 활성" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2041,18 +1980,18 @@ msgstr "" "\n" "모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" "빠른 ë””ìŠ¤í¬ ì—‘ì„¸ìŠ¤ 활성. ì¼ë¶€ 게임들ì—ì„œ 요구ë¨. (켬 = 빠른, ë” = 호환성)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "페ì´ì§€ 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2064,7 +2003,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2076,7 +2015,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2084,20 +2023,33 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 ì†ë„를 올리려면 켬. 다른 ê²Œìž„ì„ ìœ„í•´" "서는 ë”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" -"만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OSXì—서는 ì•Šë¨." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OpenAL 백엔드 ì „" +"ìš©." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OpenAL 백엔드 ì „" +"ìš©. ìž‘ë™ì‹œí‚¤ë ¤ë©´ soft_oal.dll ì„ OpenAL32.dll ë¡œ ì´ë¦„바꾸기가 필요할 지ë„." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2109,13 +2061,13 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "ì¼ë¶€ ê²Œìž„ë“¤ì— í•„ìš”í•œ 메모리 관리 유닛 활성. (켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2129,14 +2081,14 @@ msgstr "" msgid "End" msgstr "ë" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "ì˜ì–´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "í–¥ìƒ" @@ -2154,17 +2106,17 @@ msgstr "엔트리 %d/%d" msgid "Entry 1/%d" msgstr "엔트리 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "ê°™ìŒ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "ì—러" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2203,36 +2155,32 @@ msgstr "예외 핸들러 - 메모리 공간 아래를 ì ‘ê·¼. %08llx%08llx" msgid "Execute" msgstr "실행" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" @@ -2240,15 +2188,15 @@ msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" msgid "Export failed, try again?" msgstr "내보내기 실패했습니다, 다시 ì‹œë„?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2260,52 +2208,52 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''ì—서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "모든 파ì¼ë“¤ 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "ì•±ë¡œë” ì••ì¶•í’€ê¸°..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "íŒŒì¼ ì••ì¶• 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "압축풀기..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO ë°”ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO 플레ì´ì–´" @@ -2313,7 +2261,7 @@ msgstr "FIFO 플레ì´ì–´" msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST í¬ê¸°:" @@ -2321,15 +2269,15 @@ msgstr "FST í¬ê¸°:" msgid "Failed to Connect!" msgstr "ì—°ê²°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2365,20 +2313,25 @@ msgstr "bthprops.cpl ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." msgid "Failed to load hid.dll" msgstr "hid.dll ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "banner.bin ì½ê¸°ì— 실패했습니다" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"저장 ë°ì´í„°ë¥¼ ì½ê¸°ì— 실패했습니다\n" -"(0xA000-)\n" -"메모리카드가 ìž˜ë ¸ì„ ì§€ë„" +"저장 ë°ì´í„°ì˜ %d 블럭 ì½ê¸°ì— 실패했습니다\n" +"메모리카드가 ìž˜ë ¸ì„ ì§€ë„\n" +"파ì¼ìœ„치:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2447,45 +2400,43 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" -msgstr "" +msgstr "페르시아어" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "빠른 밉맵" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"ì¹˜ëª…ì  ë¹„ë™ê¸°. 재ìƒì„ 중단합니다. (PlayWiimoteì—ì„œ ì—러: %u != %u, byte " +"%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "FIFO 플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "íŒŒì¼ ì •ë³´" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "파ì¼ì´ 코드를 지니지 않었습니다." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "파ì¼ì´ .gci ë¡œ 변환ë˜ì—ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2502,7 +2453,7 @@ msgstr "" "파ì¼ì´ í™•ìž¥ìž \"%s\"를 가집니다\n" "ì í•©í•œ 확장ìžë“¤ì€ (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "파ì¼ì´ 메모리카드로 ì¸ì‹ë˜ì§€ 않는다" @@ -2515,47 +2466,47 @@ msgstr "파ì¼ì´ 압축ë˜ì§€ 않었습니다" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "ë‹¤ìŒ ì°¾ê¸°" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "ì´ì „ 찾기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "ê°•ì œ 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "ê°•ì œ í…스처 í•„í„°ë§" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2567,7 +2518,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2579,7 +2530,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2601,57 +2552,56 @@ msgstr "" msgid "Forward" msgstr "앞으로" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "%d ê°œ 찾았습니다 '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "프레임" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "프레임" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" -msgstr "프레임" +msgstr "프레임 ì •ë³´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "프레임 범위" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "프레임제한:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "프랑스어" @@ -2659,20 +2609,20 @@ msgstr "프랑스어" msgid "Frets" msgstr "프렛들" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "From" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "전체화면" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "전체화면 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 파ì¼(*.gci)" @@ -2680,62 +2630,66 @@ msgstr "GCI 파ì¼(*.gci)" msgid "GCMic Configuration" msgstr "GCMic 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "게임 ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "ê²Œìž„ì´ ì´ë¯¸ 구ë™ì¤‘입니다!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "ê²Œìž„ì´ êµ¬ë™ì¤‘ì´ì§€ 않습니다!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "ê²Œìž„ì´ ì°¾ì„ ìˆ˜ 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "게임-ìƒì„¸ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "게임í브 게임저장 파ì¼(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "게임í브 패드 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 코드" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2743,43 +2697,44 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" "Gecko코드가 (CT%i CST%i) (%s) 구ë™ì— 실패했습니다\n" -"(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" +"(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ë˜ì§€ 않습니다. codehandler.bin 파ì¼" +"ì„ Sys í´ë”ì— ìœ„ì¹˜ì‹œí‚¤ê³  ëŒí•€ì„ 재시작해서 ì›ë³¸ 코드 핸들러를 사용해보세요.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "ì¼ë°˜" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "ì¼ë°˜ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ë…ì¼ì–´" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: ì¸ë±ìŠ¤ê°€ ar 코드 리스트 í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤ " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "그래픽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "그래픽 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "보다 í°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2796,7 +2751,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "그리스어" @@ -2816,11 +2771,11 @@ msgstr "ì´ˆë¡ ì˜¤ë¥¸ìª½" msgid "Guitar" msgstr "기타" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRYê°€ 호출ë¨, 보고해주세요!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "핵" @@ -2828,11 +2783,11 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "히브리어" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "높ì´" @@ -2840,7 +2795,7 @@ msgstr "높ì´" msgid "Help" msgstr "ë„움" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2857,15 +2812,15 @@ msgstr "" "\n" "사요나ë¼!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "마우스 커서 숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2879,8 +2834,8 @@ msgstr "" msgid "Home" msgstr "홈" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "호스트" @@ -2888,28 +2843,28 @@ msgstr "호스트" msgid "Hotkey Configuration" msgstr "단축키 설정" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "í—가리어" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "하ì´ë¸Œë¦¬ë“œ 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: 알려지지 ì•Šì€ í‹°ì¼“: %08x/%08x ì—ì„œ ë°ì´í„°ë¥¼ 얻으려 ì‹œë„í–ˆ" "습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2922,31 +2877,31 @@ msgstr "" "TitleID %016llx.\n" " ëŒí•€ì€ ì´ì œ 멈추려할 것ì´ë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 설정" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR í¬ì¸í„°" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR ê°ë„:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -2954,11 +2909,11 @@ msgstr "ISO 디렉토리들" msgid "ITALY" msgstr "ì´íƒˆë¦¬ì•„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "ì•„ì´ì½˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2966,28 +2921,28 @@ msgstr "" "ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" "ì„œ 사용ë©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSê°€ 불규칙ì ì´ë©´, ì´ ì˜µì…˜ì´ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (켬 = 호환성, ë” = ë¹ " "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -"í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하면, DSPì—ì„œ " -"오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." +"í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하려면, DSP를 " +"ì´ìš©í•´ 오디오 ë³‘ëª©ì„ ì‚¬ìš©í•˜ì„¸ìš” (ê²Œìž„ì— ë”°ë¼ì„œëŠ” 소리 ëŠê¹€ë“¤ì„ 고칠지 모르지" +"만 ë˜í•œ 지ì†ì ì¸ ìž¡ìŒì„ 유발할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "í¬ë©§ ë³€ê²½ë“¤ì„ ë¬´ì‹œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3001,7 +2956,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3015,7 +2970,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" @@ -3023,7 +2978,7 @@ msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" msgid "Import failed, try again?" msgstr "가져오기 실패했습니다, 재시ë„?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3031,11 +2986,11 @@ msgstr "" "가져온 파ì¼ì€ gsc 확장ìžë¥¼ 가진다\n" "하지만 올바른 í—¤ë”를 가지고 있지 않습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "가져온 파ì¼ì´ 비ì í•© 길ì´ë¥¼ 가지고 있습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3043,7 +2998,7 @@ msgstr "" "가져온 파ì¼ì´ sav 확장ìžë¥¼ 지닌다\n" "하지만 올바른 í•´ë”를 지니지 않는다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3054,26 +3009,16 @@ msgstr "" "발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "게임안" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "게임-안" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ì •ë³´" @@ -3081,7 +3026,7 @@ msgstr "ì •ë³´" msgid "Information" msgstr "ì •ë³´" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "ìž…ë ¥" @@ -3093,7 +3038,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3101,11 +3046,11 @@ msgstr "SD ì¹´ë“œ 삽입" msgid "Insert name here.." msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3116,42 +3061,44 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "완전성 ì²´í¬ ì—러" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "완전성 ì²´í¬ ì™„ë£Œë¨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "완전성 ì²´í¬ê°€ 완료ë˜ì—ˆìŠµë‹ˆë‹¤. ì—러가 발견ë˜ì§€ 않었습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"파티션 %d ì— ëŒ€í•œ 완전성 ì²´í¬ê°€ 실패하였습니다. ë‹¹ì‹ ì˜ ë¤í”„ê°€ 오염ë˜ì—ˆê±°ë‚˜ 잘" +"못 íŒ¨ì¹˜ëœ ê²ƒ 같습니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "내부 LZO ì—러 - 압축 실패했습니다" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3160,19 +3107,19 @@ msgstr "" "내부 LZO ì—러 - 압축해제 실패했습니다 (%d) (%li, %li) \n" "ìƒíƒœ ë¡œë”©ì„ ë‹¤ì‹œ 해보세요" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "소개화면" @@ -3181,11 +3128,11 @@ msgstr "소개화면" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "비ì í•© í¬ê¸°(%x) í˜¹ì€ ë§ˆë²• ë‚±ë§ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "비ì í•© ê°’!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" @@ -3194,7 +3141,7 @@ msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" msgid "Invalid event type %i" msgstr "비ì í•© ì´ë²¤íŠ¸ 타입 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "비ì í•© 파ì¼" @@ -3209,29 +3156,29 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "비ì í•© 찾기 파ë¼ë¯¸í„° (ì„ íƒëœ 오브ì íŠ¸ ì—†ìŒ)" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 +msgid "Invalid search string (couldn't convert to number)" +msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (숫ìžë¡œ ë³€í™˜ë  ìˆ˜ 없었습니다)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 -msgid "Invalid search string (couldn't convert to number)" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (ì§ìˆ˜ ê¸¸ì´ ìŠ¤íŠ¸ë§ë§Œ 지ì›ë©ë‹ˆë‹¤)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3239,16 +3186,16 @@ msgstr "ì´íƒˆë¦¬ì•„ì–´" msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "ì¼ë³¸ì–´" @@ -3256,28 +3203,27 @@ msgstr "ì¼ë³¸ì–´" msgid "KOREA" msgstr "한국" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ì—뮬레ì´ì…˜ 윈ë„ìš° ìœ„ì— ë§ˆìš°ìŠ¤ 커서가 ìžˆì„ ë•Œ 숨ê¹ë‹ˆë‹¤.\n" +"게임 윈ë„우를 다른 모든 윈ë„ìš°ë“¤ì˜ ë§¨ìœ„ë¡œ 유지합니다.\n" "\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "윈ë„우를 맨위로 유지" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "한국어" @@ -3295,19 +3241,23 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "언어:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "마지막 ë®ì–´ì¨ì§„ ìƒíƒœ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "지연:" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3317,8 +3267,8 @@ msgstr "왼쪽" msgid "Left Stick" msgstr "왼쪽 스틱" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3326,7 +3276,7 @@ msgstr "" "단축키를 ê°ì§€í•˜ë ¤ë©´ 좌 í´ë¦­í•˜ì„¸ìš”.\n" "지우려면 스페ì´ìŠ¤ë¥¼ 입력하세요." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3334,9 +3284,9 @@ msgid "" msgstr "" "좌-í´ë¦­ ìž…ë ¥ ê°ì§€.\n" "중-í´ë¦­ 지우기.\n" -"ìš°-í´ë¦­ 옵션들 ë”." +"ìš°-í´ë¦­ ë” ë§Žì€ ì˜µì…˜ë“¤." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3344,76 +3294,76 @@ msgstr "" "좌/ìš°-í´ë¦­ 옵션들 ë”.\n" "중-í´ë¦­ 지우기." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "슬롯1 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "슬롯2 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "슬롯3 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "슬롯4 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "슬롯5 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "슬롯6 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "슬롯7 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "슬롯8 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3427,36 +3377,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "핵 패턴들로 부터 사용 가능한 사전설정 ê°’ì„ ë¡œë“œí•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "로그" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "로그 환경설정" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "FPS를 파ì¼ì— 기ë¡" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "로그 타입" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"초당 ë Œë”ë˜ëŠ” 프레임 수치를 User/Logs/fps.txt ì— ê¸°ë¡í•©ë‹ˆë‹¤. ëŒí•€ì˜ ì„±ëŠ¥ì„ ì¸¡" +"정하고 싶ì„ë•Œ ì´ ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ì„¸ìš”.\n" +"\n" +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "로거 출력" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "로깅" @@ -3464,10 +3422,6 @@ msgstr "로깅" msgid "Lost connection to server!" msgstr "ì„œë²„ì— ì—°ê²°ì„ ìžƒì–´ë²„ë¦¼!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "저수준(LLE) í˜¹ì€ ê³ ìˆ˜ì¤€(HLE)ì—뮬 오디오" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M 버튼" @@ -3481,12 +3435,12 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" @@ -3495,33 +3449,33 @@ msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "제작사:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "최대값" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "메모리카드가 ì´ íƒ€ì´í‹€ì— 대해 ì €ìž¥ì„ ì´ë¯¸ ê°€ì§" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "메모리카드가 ì´ë¯¸ ì—´ë ¤ì§" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3533,7 +3487,7 @@ msgstr "" "메모리 ì¹´ë“œ 메니저 경고-사용하기 ì „ì— ë°±ì—…ì„ ë§Œë“œì„¸ìš”, ê³ ì³ì ¸ì•¼ 겠지만 훼ì†" "ë  ìˆ˜ 있습니다." -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3558,20 +3512,20 @@ msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "마ì´í¬" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "기타 설정" @@ -3580,7 +3534,7 @@ msgstr "기타 설정" msgid "Modifier" msgstr "수정ìž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3596,16 +3550,16 @@ msgstr "" msgid "Monospaced font" msgstr "단ì¼ë„어쓰기 í°íŠ¸" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "모션 플러스" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3627,7 +3581,7 @@ msgstr "" msgid "Multiply" msgstr "곱하기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3635,13 +3589,13 @@ msgstr "" "위모트 스피커를 ìŒì†Œê±°í•©ë‹ˆë‹¤. 실제 위모트 ìƒì—ì„œ ëžœë¤ ì—°ê²°í•´ì œë“¤ì„ ê³ ì¹©ë‹ˆë‹¤. " "ì—ë®¬ëœ ìœ„ëª¨íŠ¸ ìƒì—서는 효과 ì—†ìŒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" -msgstr "" +msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "알림: 스트림 사ì´ì¦ˆê°€ 실제 ë°ì´í„° 길ì´ì™€ 매치ë˜ì§€ 않습니다\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3727,38 +3681,38 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "ì´ë¦„:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "ì´ë¦„:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ì›ë³¸ GCI 파ì¼ë“¤(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "ë‹¤ìŒ íŽ˜ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "ë‹¤ìŒ ìŠ¤ìº”" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "별명 :" @@ -3766,7 +3720,7 @@ msgstr "별명 :" msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "ISO나 WADSê°€ ì—†ìŒ" @@ -3775,24 +3729,24 @@ msgstr "ISO나 WADSê°€ ì—†ìŒ" msgid "No banner file found for title %s" msgstr "%s 타ì´í‹€ì— 대한 배너 파ì¼ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" -msgstr "" +msgstr "ì í•©í•œ ìƒì„¸ì„¤ëª… ì—†ìŒ" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" msgstr "ë„킹 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "빈 디렉토리 ëª©ë¡ ì—”íŠ¸ë¦¬ë“¤ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "ë…¹í™”ëœ íŒŒì¼ì´ ì—†ìŒ" @@ -3801,33 +3755,33 @@ msgstr "ë…¹í™”ëœ íŒŒì¼ì´ ì—†ìŒ" msgid "No save folder found for title %s" msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "같지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "참고 사항" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "참고:" @@ -3836,7 +3790,7 @@ msgstr "참고:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "알림" @@ -3844,28 +3798,28 @@ msgstr "알림" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "코드 번호:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "눈처í¬" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "ëˆˆì²˜í¬ ê°€ì†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "오브ì íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "ë”" @@ -3873,60 +3827,56 @@ msgstr "ë”" msgid "Offset:" msgstr "오프셋:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "온-스í¬ë¦° 메시지 보여주기" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "íŒŒì¼ ì—´ê¸°..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: %s ìž¥ì¹˜ì— ëŒ€í•œ 맥ë½(context)ì„ ë§Œë“¤ 수 ì—†ìŒ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "디버거 연다" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "로거를 연다" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "옵션" @@ -3935,15 +3885,15 @@ msgstr "옵션" msgid "Orange" msgstr "주황" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "다른 것들" @@ -3955,19 +3905,19 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— ë‹¤ë¥¸ í´ë¼ì´ì–¸íŠ¸ê°€ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥ë¨. 수ë™ìœ¼" "ë¡œ ê²Œìž„ì„ ì¤‘ì§€í•˜ë¼." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "출력" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ(&l)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "패드" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "패드" @@ -3983,7 +3933,7 @@ msgstr "페ì´ì§€ 다운" msgid "Page Up" msgstr "페ì´ì§€ ì—…" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "연결하기" @@ -3995,30 +3945,34 @@ msgstr "단ë½" msgid "Parameters" msgstr "매개변수들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "ë¬´ë¹„ì˜ ëì—ì„œ 멈추기" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "완벽한" @@ -4027,36 +3981,36 @@ msgstr "완벽한" msgid "Perspective %d" msgstr "ê´€ì  %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr " 실행 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "실행/ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "ìž¬ìƒ ì˜µì…˜" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4068,54 +4022,54 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "í¬íŠ¸ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4128,11 +4082,11 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ì´ì „ ê°’" @@ -4140,7 +4094,7 @@ msgstr "ì´ì „ ê°’" msgid "Print" msgstr "프린트" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "프로파ì¼" @@ -4148,7 +4102,7 @@ msgstr "프로파ì¼" msgid "Properties" msgstr "ì†ì„±" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ìºì‰¬ 제거(Purge)" @@ -4156,8 +4110,8 @@ msgstr "ìºì‰¬ 제거(Purge)" msgid "Question" msgstr "질문" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "종료" @@ -4175,7 +4129,7 @@ msgstr "R 버튼" msgid "R-Analog" msgstr "R-아날로그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "램" @@ -4183,46 +4137,46 @@ msgstr "램" msgid "RUSSIA" msgstr "러시아" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "범위" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "실제" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "실제 위모트" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "리얼 위모트" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "위모트 재연결 확ì¸" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ìƒíƒœ 로딩시 위모트 재연결" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "녹화" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "녹화 ì •ë³´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "녹화 옵션" @@ -4238,7 +4192,7 @@ msgstr "빨강 왼쪽" msgid "Red Right" msgstr "빨강 오른쪽" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4252,29 +4206,29 @@ 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "갱신" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "제거" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4284,17 +4238,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "리셋" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "ê²°ê³¼" @@ -4311,7 +4265,7 @@ msgstr "오른쪽" msgid "Right Stick" msgstr "오른쪽 스틱" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "진ë™" @@ -4320,116 +4274,112 @@ msgstr "진ë™" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 ì „ìš© 쓰레드ìƒì—ì„œ 구ë™í•˜ê¸° (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "러시아어" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "안전" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "샘플율:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "저장" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "다른 ì´ë¦„으로 GCI 저장..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "슬롯1 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "슬롯2 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "슬롯3 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "슬롯4 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "슬롯5 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "슬롯6 ìƒíƒœ 저장 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "슬롯7 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "슬롯8 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ìƒíƒœ 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "스ìºë‹..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "스í¬ë¦°ìƒ·" @@ -4437,27 +4387,25 @@ msgstr "스í¬ë¦°ìƒ·" msgid "Scroll Lock" msgstr "스í¬ë¡¤ ë½" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" -msgstr "치트 찾기" +msgstr "찾기" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 -#, fuzzy +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" -msgstr "현재 ê´€ì ì„ 저장" +msgstr "최근 오브ì íŠ¸ 찾기" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "헥스 ê°’ 찾기:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4466,20 +4414,20 @@ msgid "Section %s not found in SYSCONF" msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4497,23 +4445,23 @@ msgstr "가져올 저장 파ì¼ì„ ì„ íƒ" msgid "Select floating windows" msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4531,11 +4479,15 @@ msgstr "" "\n" "모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "ì„ íƒëœ 컨트롤러 프로파ì¼ì´ 존재하지 않습니다" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "ì„ íƒëœ í°íŠ¸" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4551,7 +4503,7 @@ msgstr "" "모르겠으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" "ê·¸ëž˜ë„ ëª¨ë¥´ê² ìœ¼ë©´, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4567,11 +4519,11 @@ msgstr "" "\n" "모르겠으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "보내기" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "센서 ë°” 위치:" @@ -4579,46 +4531,54 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c ë¡œ 설정" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목ë¡ì´ ar 코드 ëª©ë¡ í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"지연(ms 단위로)ì„ ì„¤ì •í•©ë‹ˆë‹¤. ë” ë†’ì€ ê°’ì€ ì˜¤ë””ì˜¤ íŠì„ ì¤„ì¼ ì§€ë„ ëª¨ë¦…ë‹ˆë‹¤. " +"OpenAL 백엔드 ì „ìš©." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "설정..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "í”들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "단축 ì´ë¦„:" @@ -4626,133 +4586,147 @@ msgstr "단축 ì´ë¦„:" msgid "Shoulder Buttons" msgstr "ìˆ„ë” ë²„íŠ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "콘솔 보기(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "로그 보기(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "ìƒíƒœë°” 표시(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "툴바 표시(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "ì´íƒˆë¦¬ì•„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP (ì¼ë³¸ ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "언어 보기:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "로그 환경설정(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL (유럽 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "í”Œëž«í¼ í‘œì‹œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "통계들" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA (미국 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ê²Œìž„ì„ ë©ˆì¶”ê¸° ì „ì— í™•ì¸ ìƒìž 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"잠재ì ìœ¼ë¡œ 심ê°í•œ ì—러가 ë°œìƒí–ˆì„ ë•Œ 메시지 박스를 보여준다.\n" -"ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " -"ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." +"잠재ì ìœ¼ë¡œ 심ê°í•œ ì—러가 ë°œìƒí–ˆì„ ë•Œ 메시지 박스를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤, 하지만 그것" +"ì€ ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 고장난다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "ëž™ 계측기 보여주기" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"ì—뮬레ì´ì…˜ 화면ìƒì— ë©”ì‹œì§€ë“¤ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"ì´ ë©”ì‹œì§€ë“¤ì€ ë©”ëª¨ë¦¬ ì¹´ë“œ 쓰기, 비디오 백엔드와 CPU ì •ë³´, 그리고 JIT ìºì‹œ 비" +"우기를 í¬í•¨í•©ë‹ˆë‹¤." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "저장 ì£¼ì„ ë³´ê¸°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "저장 ì•„ì´ì½˜ 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4763,15 +4737,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "ì´ ë„움 메시지 보기" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4781,31 +4751,35 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "간소화 중국어" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "CPUë¡œ 부터 EFB 엑세스를 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4817,7 +4791,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4833,17 +4807,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "슬롯 B" @@ -4851,7 +4825,7 @@ msgstr "슬롯 B" msgid "Snapshot" msgstr "스냅샷" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "소프트웨어 ë Œë”러" @@ -4866,11 +4840,11 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "사운드 설정" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "사운드 백엔드 %s는 ì í•©í•˜ì§€ 않습니다." @@ -4884,17 +4858,17 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "스페ì¸ì–´" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "스피커 볼륨:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4914,11 +4888,7 @@ msgstr "" "\n" "모르겠으면, 640x528를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "비디오 백엔드 명시" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" @@ -4926,51 +4896,55 @@ msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "표준 컨트롤러" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "시작" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "ë„·í”Œë ˆì´ ì‹œìž‘(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘(&c)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "ìƒíƒœ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "ìƒíƒœ 저장" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "운전대" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "중지" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4983,7 +4957,7 @@ msgstr "" "ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "윈ë„ìš°ë¡œ 늘림" @@ -5004,12 +4978,12 @@ msgstr "성공ì ìœ¼ë¡œ 파ì¼ì„ %së¡œ 내보냈ìŒ" msgid "Successfully imported save files" msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "시스템 언어:" @@ -5017,7 +4991,7 @@ msgstr "시스템 언어:" msgid "TAIWAN" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS ìž…ë ¥" @@ -5038,30 +5012,30 @@ msgstr "í…Œì´ë¸” 왼쪽" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "테스트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "í…스처" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "í…스처 ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -5077,13 +5051,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5106,7 +5080,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s 파ì¼ì´ ì´ë¯¸ ì—´ë ¤ 있었습니다, íŒŒì¼ í—¤ë”는 기ë¡ë˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "ë‹¹ì‹ ì´ ê¸°ìˆ í•œ íŒŒì¼ (%s)는 존재하지 않습니다" @@ -5123,8 +5097,7 @@ msgstr "ì´ë¥¸ì€ ',' 문ìžë¥¼ í¬í•¨í•  수 없습니다" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5133,13 +5106,13 @@ msgid "" msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" -"모르겠으면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, 가장 오른쪽 ê°’ì„ ì‚¬ìš©í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "ë‹¹ì‹ ì´ ë³µì‚¬í•˜ë ¤ëŠ” ì €ìž¥ì€ ë¹„ì í•© íŒŒì¼ í¬ê¸°ìž…니다." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5172,15 +5145,11 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "테마" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5188,7 +5157,7 @@ msgstr "" "00000001/00000002ì— ëŒ€í•œ í‹°ì¼“ì´ ìžˆì–´ì•¼í•œë‹¤. ë‹¹ì‹ ì˜ NAND ë¤í”„는 ì•„ë§ˆë„ ë¯¸ì™„ì„±" "ì´ë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5196,7 +5165,7 @@ msgstr "" "ì´ ì„¤ì •ë“¤ì€ í•µì‹¬ ëŒí•€ ì„¤ì •ë“¤ì„ ë®ì–´ì”니다.\n" "ê²°ì •ë˜ì§€ì•Šì€ ê²ƒì€ ê²Œìž„ì´ ëŒí•€ì˜ ì„¤ì •ì„ ì‚¬ìš©í•¨ì„ ëœ»í•©ë‹ˆë‹¤." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5204,14 +5173,16 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5226,7 +5197,7 @@ msgstr "" "\n" "모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5238,7 +5209,7 @@ msgstr "" "ë‘ê°œ ì´ìƒì˜ 코어를 가진 PC들 ìƒì—ì„œ 주요 ì†ë„ í–¥ìƒë“¤ì„ 유발한다, 하지만 ê°‘ìž‘" "스런 깨ì§/ê²°í•¨ë“¤ì„ ì¼ìœ¼í‚¬ ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" @@ -5247,40 +5218,40 @@ msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" msgid "Threshold" msgstr "한계ì " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "기울기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr " 제목" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "To" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "전체화면 토글" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." @@ -5300,7 +5271,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "터키어" @@ -5312,12 +5283,12 @@ msgstr "í„´í…Œì´ë¸”" msgid "Type" msgstr "타입" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP í¬íŠ¸:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP 위모트" @@ -5325,10 +5296,10 @@ msgstr "UDP 위모트" msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 -#, fuzzy, c-format +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#, c-format msgid "UNKNOWN_%02X" -msgstr "알려지지 ì•ŠìŒ" +msgstr "알려지지않ì€_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5353,24 +5324,24 @@ msgstr "" "니다. 올바로 타ì´í•‘했는지 확ì¸í•˜ì„¸ìš”\n" "ì´ ë¼ì¸ì„ 무시하고 분ì„ì„ ê³„ì†í•˜ê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "ì •ì˜ë˜ì§€ ì•Šì€ %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "예ìƒí•˜ì§€ 못한 0x80 콜? 중단시킴..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "알려지지 ì•Šì€" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "알려지지 ì•Šì€ DVD 명령 %08x - ì¹˜ëª…ì  ì—러" @@ -5396,32 +5367,32 @@ msgstr "" msgid "Up" msgstr "위" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "ì—…ë°ì´íŠ¸" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "전체화면 사용" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5433,7 +5404,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5447,15 +5418,15 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "유틸리티" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "수ì§-ë™ê¸°í™”" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "ê°’" @@ -5463,23 +5434,23 @@ msgstr "ê°’" msgid "Value:" msgstr "ê°’:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "ê°’:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "ìƒì„¸ì„¤ëª…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "볼륨" @@ -5490,11 +5461,10 @@ msgid "WAD installation failed: error creating %s" msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 -#, fuzzy msgid "WAD installation failed: error creating ticket" -msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" +msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± 티켓" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5507,16 +5477,16 @@ msgstr "" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ DOLì„ ì‹œìž‘!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ELF 시작!" @@ -5535,7 +5505,7 @@ msgstr "" "%s\n" "계ì†í•˜ê³  싶습니까?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5548,7 +5518,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5559,7 +5529,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5570,7 +5540,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5604,7 +5574,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." @@ -5612,31 +5582,31 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5644,17 +5614,17 @@ msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 파ì¼ë¡œ 부터 ì½ì„ 수 없었습니다" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "위모트" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "위모트 %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5667,19 +5637,19 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "위모트 모터" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "위모트 설정" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "위모트" @@ -5699,27 +5669,26 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "ìž‘ë™ì¤‘..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "ì½˜ì†”ì— ì“°ê¸°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 -#, fuzzy +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" -msgstr "파ì¼ì— 쓰기" +msgstr "ë””ë²„ê±°ì— ê¸°ë¡" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "파ì¼ì— 쓰기" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "윈ë„ìš°ì— ì“°ê¸°" @@ -5738,9 +5707,9 @@ msgstr "XAudio2 초기화 실패: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 매스터 ë³´ì´ìŠ¤ ìƒì„± 실패: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" -msgstr "" +msgstr "XF 레지" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5758,23 +5727,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "ë‹¹ì‹ ì€ íŽ˜ì´ì§€ë“¤ì„ 가진 ì°½ì„ ë‹«ì„ ìˆ˜ 없습니다." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "ê²Œìž„ì„ ì„ íƒí•´ì•¼ 합니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -5797,25 +5766,25 @@ msgstr "" "0x%04x ì´ì–´ì•¼í•©ë‹ˆë‹¤ (하지만 0x%04llx ìž„) \n" "새로 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 핵" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 코드는 지ì›ë˜ì§€ 않습니다" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "ëŒí•€ì— 알려지지 ì•Šì€ Zero 코드: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 대기 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5831,7 +5800,7 @@ msgstr "" msgid "[Custom]" msgstr "[ì‚¬ìš©ìž ì§€ì •]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5849,7 +5818,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5863,11 +5832,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -5884,7 +5853,7 @@ msgstr "파ì¼: %s ì—ì„œ ë°ì´í„° ì½ê¸°ì— 실패" msgid "failed to read header" msgstr "í—¤ë” ì½ê¸°ì— 실패했습니다" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." @@ -5894,7 +5863,7 @@ msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." msgid "not a wii save or read failure for file header size %x" msgstr "wii ì €ìž¥ì´ ì•„ë‹ˆê±°ë‚˜ íŒŒì¼ í—¤ë” í¬ê¸° %xì— ëŒ€í•œ ì½ê¸° 실패 " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "들" @@ -5903,7 +5872,7 @@ msgstr "들" msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -5915,13 +5884,16 @@ msgstr "zì›ê±°ë¦¬ ì •ì •:" msgid "zNear Correction: " msgstr "z근거리 ì •ì •:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "프레임 스í…(&F)" @@ -5984,12 +5956,37 @@ 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 파ì¼ì´ë¦„" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "버í…스단위 ëŒ€ì‹ ì— í”½ì…€ë‹¨ìœ„ë¡œ 3D 그래픽 ê¹Šì´ ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤.\n" +#~ "í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 " +#~ "ë•Œ 필요가 있습니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6043,6 +6040,23 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "í”ŒëŸ¬ê·¸ì¸ %sì— ëŒ€í•œ 정보를 ì–»ì„ ìˆ˜ 없었습니다" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]ì— ì˜í•´ 만들" +#~ "ì–´ì§" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " + #~ msgid "DList Cache" #~ msgstr "ë°ì´í„°ë¦¬ìŠ¤íŠ¸ ìºì‰¬" @@ -6052,9 +6066,27 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "ë´ë§ˆí¬ì–´" +#~ msgid "Disable Lighting" +#~ msgstr "ê´‘ì› ë”" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" + +#~ msgid "Disable Textures" +#~ msgstr "í…스처들 ë”" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "위모트 스피커 비활성" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "í…스처ë§ì„ 비활성합니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6118,6 +6150,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "오디오 병목 활성" +#~ msgid "Enable BAT" +#~ msgstr "BAT 활성" + #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" @@ -6142,6 +6177,14 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "스í¬ë¦° 세ì´ë²„ (ì—´í™” 줄임) 활성" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, " +#~ "하지만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6195,6 +6238,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "기ë¡í•˜ê¸° 위한 %s íŒŒì¼ ì—´ê¸° ì—러" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6207,6 +6253,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP 롬: %s ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" +#~ msgid "Fast Mipmaps" +#~ msgstr "빠른 밉맵" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6254,6 +6303,15 @@ msgstr "| OR" #~ "ë§Œì¼ ê²Œìž„ì´ ë©ˆì¶”ê³ , ì¸í„°í”„리터로만 ìž‘ë™í•˜ê±°ë‚˜ ëŒí•€ì´ 깨진다면, ì´ ì˜µì…˜ì€ " #~ "ê·¸ ê²Œìž„ì„ ê³ ì¹ ì§€ 모른다." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #~ msgid "Input Source" #~ msgstr "소스 ìž…ë ¥" @@ -6295,6 +6353,15 @@ msgstr "| OR" #~ "ì›ë³¸ ë°‰ë§µë“¤ì„ ë¡œë“œí•˜ëŠ” ê²ƒì€ ì¢€ ë” ì •í™•í•œ í–‰ë™ì´ë‹¤, 하지만 ì„±ëŠ¥ì„ ê°ì†Œì‹œí‚¬" #~ "ì§€ë„ ëª¨ë¥¸ë‹¤ (마ì¼ë¦¬ì§€ê°€ 다양할지는 몰ë¼ë„)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "저수준(LLE) í˜¹ì€ ê³ ìˆ˜ì¤€(HLE)ì—뮬 오디오" + #~ msgid "Lua Script Console" #~ msgstr "Lua 스í¬ë¦½íŠ¸ 콘솔" @@ -6329,6 +6396,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "디버거 연다" + +#~ msgid "Opens the logger" +#~ msgstr "로거를 연다" + #~ msgid "Plugins" #~ msgstr "플러그ì¸" @@ -6368,6 +6441,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "스í¬ë¦½íŠ¸ 구ë™ì¤‘...\n" +#~ msgid "Sample Rate:" +#~ msgstr "샘플율:" + #~ msgid "Scale:" #~ msgstr "스케ì¼:" @@ -6413,6 +6489,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "초당 ë Œë”ë˜ëŠ” 프레임수 보기." +#~ msgid "Show this help message" +#~ msgstr "ì´ ë„움 메시지 보기" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6451,6 +6530,9 @@ msgstr "| OR" #~ "다른 ì˜µì…˜ë“¤ì€ ë‹¹ì‹ ì˜ í™”ë©´í‘œì‹œ í¬ê¸°ì˜ ë…립ì ì¸ 비주얼 품질 ì„ íƒì—대한 í•´ìƒ" #~ "ë„ë¡œ ê³ ì •ëœë‹¤." +#~ msgid "Specify a video backend" +#~ msgstr "비디오 백엔드 명시" + #~ msgid "Specify an audio plugin" #~ msgstr "오디오 í”ŒëŸ¬ê·¸ì¸ ëª…ì‹œ" @@ -6463,6 +6545,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "ê·¸ 파ì¼" +#~ msgid "Theme selection went wrong" +#~ msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 872c6cfe6a..286075ddca 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-06-06 20:15+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" "Language: Norwegian Bokmaal\n" @@ -19,17 +19,17 @@ msgstr "" "X-Poedit-Country: NORWAY\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,24,-1,-1,-1\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(for mange til til Ã¥ vises)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Spill :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! IKKE" @@ -47,7 +47,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -57,14 +57,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Frakoblet" @@ -151,156 +144,156 @@ msgstr "%sEksporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& OG" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Om..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Start fra DVD-stasjon..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breakpoints" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Bla etter ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Jukse&kode-manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Bilde Forover" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Fullskjerm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Konfigurer Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Hjelp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Innstillinger for &Hot-tast" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Last &inn Save State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Minnekort Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Minne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ã…pne..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Les-kun &modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Restart" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Lyd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "S&topp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Verktøy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "Vi&s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -316,27 +309,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UKJENT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(av)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16-bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32-bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8-bit" @@ -344,46 +337,48 @@ msgstr "8-bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Et NetPlay-vindu er allerede oppe!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Det kjøres ingen spill nÃ¥." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Et støttet bluetooh-device ble ikke funnet!\n" "(Kun Microsoft bluetooth stack støttes.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Du mÃ¥ fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -432,19 +427,19 @@ msgstr "" msgid "About Dolphin" msgstr "Om Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Nøyaktighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "Hvis usikker, velg EFB til tekstur isteden." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Aksjon" @@ -479,7 +474,7 @@ msgstr "" "Skyldig-kode:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +482,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Legg Til " "Kode (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +491,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) in Fyll Og " "Skli (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +500,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Ram-skriv " "Og Fyll (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,15 +509,16 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Skriv Til " "Peker (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Feil: Ugyldig verdi (%08x) i Minnekopi (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Feil: Master Code og Skriv Til CCXXXXXXikke implementert (%s)" @@ -531,27 +527,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Feil: Ugyldig AR-kode linje: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Kondisjonsbasert Kode: Ugyldig Størrelse %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ugyldig Normal Kodetype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kode %i: ugyldig Sub-type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kode 0: Ugyldig Sub-type %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -560,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Legg til Patch" @@ -572,13 +568,13 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Legg til..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse :" @@ -618,53 +614,54 @@ msgstr "" "\n" "MERKNAD: Sjekk Loggvindu/Konsoll for de oppnÃ¥dde verdier." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Juster analogkontrolltrykket som kreves for Ã¥ aktivere knapper." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -673,20 +670,24 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropisk Filtrering:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Kantutjevning:" @@ -700,15 +701,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Applikasjonslaster:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Bruk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,16 +719,16 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabisk" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker pÃ¥ at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -750,12 +751,12 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -763,24 +764,24 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatisk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiplum av 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatisk (Vindusstørrelse):" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Automatisk juster Vindusstørrelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,23 +791,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatisk generer mipmaps isteden for Ã¥ dekode dem fra minne.\n" -"Øker ytelsen litt, men kan forÃ¥rsake mindre teksturkorrupsjoner.\n" -"\n" -"Hvis usikker, la stÃ¥ pÃ¥." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registre" @@ -815,16 +804,16 @@ msgstr "&Registre" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend-innstillinger" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Bakgrunnsinndata" @@ -837,16 +826,16 @@ msgstr "Bakover" msgid "Bad File Header" msgstr "DÃ¥rlig Fil-header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -854,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -870,7 +859,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blokkallokasjontabellsjekksum feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokker" @@ -886,47 +875,53 @@ msgstr "BlÃ¥ Venstre" msgid "Blue Right" msgstr "BlÃ¥ Høyre" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Bunn" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ødelagt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Bla i" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Bla etter en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Bla etter lagringssted" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -939,34 +934,19 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cacher Display-lister" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Kalkuler dybdeverdier for 3D-grafikk per-piksel istedenfor per punkt.\n" -"I motsetning til pikselbelysning (som er en forbedring), sÃ¥ er per-piksel " -"dybdekalkuleringer nødvendige for Ã¥ nøyaktig emulere en liten mengde spill.\n" -"\n" -"Hvis usikker, la stÃ¥ pÃ¥." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -980,7 +960,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Avbryt" @@ -996,7 +976,7 @@ msgstr "Kan ikke Ã¥pne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1006,7 +986,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1014,18 +994,18 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" @@ -1033,28 +1013,28 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalansk" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Senter" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Endre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Endre &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Endre Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Endre Spill" @@ -1075,11 +1055,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Ã… endre dette vil ikke ha noen effekt mens emulatoren kjører!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1087,47 +1066,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Juksekode" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Juksekodesøk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1135,7 +1114,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1143,8 +1122,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Velg mappen Ã¥ ekstrahere til" @@ -1158,8 +1137,8 @@ msgstr "Klassisk" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Tøm" @@ -1171,22 +1150,22 @@ msgstr "" "Klientfrakobling mens spillet kjørte!! NetPlay er slÃ¥tt av. Du mÃ¥ manuelt " "stoppe spillet." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Lukk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ko&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kodeinfo" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kode:" @@ -1194,95 +1173,95 @@ msgstr "Kode:" msgid "Command" msgstr "Kommando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimerer ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfig" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfigurer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Konfigurer Kontroller" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Konfigurer Kontrollere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Koble til Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Koble til Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Koble til Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Koble til Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Kobler til..." @@ -1298,16 +1277,16 @@ msgstr "Kontroll" msgid "Convert to GCI" msgstr "Konverter til GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Kjerne" @@ -1316,7 +1295,7 @@ msgstr "Kjerne" msgid "Could not create %s" msgstr "Kunne ikke lage %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Kunne ikke initialisere backend %s." @@ -1337,12 +1316,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1351,7 +1330,7 @@ msgstr "" "spillet kjører ikke!\n" "(Ã… stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1363,11 +1342,11 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1375,17 +1354,17 @@ msgstr "" "Kunne ikke initialisere kjernen.\n" "Sjekk kofigurasjonen din." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Lag AR-kode" @@ -1394,25 +1373,7 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Laget av VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Skaper:" @@ -1420,11 +1381,11 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Krum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,12 +1399,12 @@ msgstr "" msgid "Crossfade" msgstr "Kryssutfase" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "NÃ¥værende mappesti endret fra %s til %s etter wxFilVelger!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1451,15 +1412,15 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tsjekkisk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1467,36 +1428,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1508,16 +1469,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Dato:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro-filer(*.sav)" @@ -1529,11 +1490,11 @@ msgstr "Datel MaxDrive/Pro-filer(*.sav)" msgid "Dead Zone" msgstr "Dødsone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1541,24 +1502,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1567,11 +1528,11 @@ msgid "Default font" msgstr "Standard tekst-font" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1580,11 +1541,11 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Beskrivelse" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Finn automatisk" @@ -1597,13 +1558,13 @@ msgstr "" "Forsøkte Ã¥ lese mer data fra DVD-en enn det som fÃ¥r plass i ut-bufferen. " "Clamp-krasj." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1627,28 +1588,16 @@ msgstr "" "Mappestisjekksum misyktes\n" " og mappesti backup-sjekksummen mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deaktiver lyseffekter" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Deaktiver Per-Pikseldybde" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deaktiver teksturer" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1662,7 +1611,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1678,17 +1627,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Deaktiver teksturer.\n" -"\n" -"Hvis usikker, la stÃ¥ avslÃ¥tt." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1697,11 +1636,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Feil ved lesing av disk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Visning" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1715,20 +1654,24 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafikkinstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Webside" @@ -1736,32 +1679,32 @@ msgstr "Dolphin &Webside" msgid "Dolphin Configuration" msgstr "Konfigurer Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulert Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin pÃ¥ &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1769,7 +1712,7 @@ msgstr "" "Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for Ã¥ bla " "etter filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1777,16 +1720,21 @@ msgstr "" "Dolphin er satt til Ã¥ gjemme alle spill. Dobbeltklikk her for Ã¥ vise alle " "spill..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Ned" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Last ned juksekoder (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Lastet ned %lu koder. (la til %lu)" @@ -1795,27 +1743,27 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump teksturer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1825,7 +1773,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1835,7 +1783,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1845,24 +1793,24 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Nederlansk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Avslutt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB-kopier" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1875,11 +1823,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Tidlige Minneoppdateringer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Endre" @@ -1887,7 +1835,7 @@ msgstr "Endre" msgid "Edit ActionReplay Code" msgstr "Endre ActionReplay-kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Endre Konfigurasjon" @@ -1895,12 +1843,12 @@ msgstr "Endre Konfigurasjon" msgid "Edit Patch" msgstr "Endre Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Endre..." @@ -1908,15 +1856,15 @@ msgstr "Endre..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emulator-CPU-trÃ¥den kjører allerede" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1930,7 +1878,7 @@ msgstr "" "\n" "Hvis usikker, benytt virtuell XFB isteden." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1946,19 +1894,19 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulasjonsstatus:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Aktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1974,72 +1922,67 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Aktiver BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Aktiver cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2052,7 +1995,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2060,11 +2003,11 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen fÃ¥ spill. (PÃ… = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Aktiver sider" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2076,7 +2019,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2088,7 +2031,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,21 +2039,28 @@ msgstr "" "Aktiver dette for Ã¥ bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Tillater Block Adress Translation (BAT); en funksjon av Memory Management " -"Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " -"AV = Raskt)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2123,7 +2073,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2131,7 +2081,7 @@ msgstr "" "Tillater Memory Management Unit (MMU), som trengs for noen spill. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2145,14 +2095,14 @@ msgstr "" msgid "End" msgstr "Slutt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Engelsk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Forbedringer" @@ -2170,17 +2120,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Lik" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Feil" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2217,36 +2167,32 @@ msgstr "Unntakshandler - tilgang under minneomrÃ¥de. %08llx%08llx" msgid "Execute" msgstr "Kjør" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Avslutt Dolphin med emulator" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Eksporter Fil" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Eksporter Opptak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2254,15 +2200,15 @@ msgstr "Eksporter alle lagringsfiler" msgid "Export failed, try again?" msgstr "Eksportering mislyktes, prøv igjen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Eksporter lagringsfil som..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2274,52 +2220,52 @@ msgstr "Ekstra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Ekstraherer..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO-Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO-spiller" @@ -2327,7 +2273,7 @@ msgstr "FIFO-spiller" msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2335,15 +2281,15 @@ msgstr "FST-størrelse:" msgid "Failed to Connect!" msgstr "Tilkobling Mislyktes!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Lytting Mislyktes!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2379,6 +2325,11 @@ msgstr "Kunne ikke laste bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Kunne ikke laste hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Kunne ikke skrive header for %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Kunne ikke lese banner.bin" @@ -2461,45 +2412,41 @@ msgstr "Kunne ikke skrive header for %s" msgid "Failed to write header for file %d" msgstr "Kunne ikke skrive header for filen %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Raske Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo-spiller" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Filinformasjon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Filen inneholder ingen koder." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fil konvertert til .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2516,7 +2463,7 @@ msgstr "" "Filen har utvidelsen \"%s\"\n" "gyldige utvidelser er (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Filen kjennes ikke igjen som et minnekort" @@ -2529,47 +2476,47 @@ msgstr "Filen ikke komprimert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Tving 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Tving Teksturfiltrering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2582,7 +2529,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2594,7 +2541,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2616,57 +2563,57 @@ msgstr "" msgid "Forward" msgstr "Send frem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Bilderekkevidde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Fri Utkikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Fransk" @@ -2674,20 +2621,20 @@ msgstr "Fransk" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Fra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "FullSkj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Fullskjermsoppløsning:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Fil(*.gci)" @@ -2696,57 +2643,61 @@ msgstr "GCI Fil(*.gci)" msgid "GCMic Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spill-ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Spillet kjører allerede!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Et spill kjører ikke!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-juksekoder" @@ -2761,41 +2712,41 @@ msgstr "" "GeckoKode mislyktes i Ã¥ kjøre (CT%i CST%i) (%s)\n" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Generelt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Generelle Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Tysk" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeksen er større enn AR-kodelistens størrelse %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Innstillinger for Grafikk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Større Enn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2813,7 +2764,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Gresk" @@ -2833,11 +2784,11 @@ msgstr "Grønn Høyre" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2845,11 +2796,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebraisk" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Høyde" @@ -2857,7 +2808,7 @@ msgstr "Høyde" msgid "Help" msgstr "Hjelp" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2873,15 +2824,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Gjem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Gjem Musepeker" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2895,8 +2846,8 @@ msgstr "" msgid "Home" msgstr "Hjem" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Vert" @@ -2904,26 +2855,26 @@ msgstr "Vert" msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungarsk" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Forsøkte Ã¥ fÃ¥ data fra en ukjent billett: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2936,31 +2887,31 @@ msgstr "" "TitleID %016llx.\n" "Dolphin vil sannsynligvis krasje nÃ¥" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Innstillinger for IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR-peker" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO-mapper" @@ -2968,24 +2919,24 @@ msgstr "ISO-mapper" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2996,11 +2947,11 @@ msgstr "" "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " "gjøre endringen effektiv." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorer Formatendringer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3014,7 +2965,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3028,7 +2979,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3036,7 +2987,7 @@ msgstr "Importer Lagringsfil" msgid "Import failed, try again?" msgstr "Importering mislyktes, prøv igjen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3044,11 +2995,11 @@ msgstr "" "Importert fil har .gsc-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "importert fil har ugyldig lengde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3056,7 +3007,7 @@ msgstr "" "Importert fil har .sav-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3067,26 +3018,16 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Øker ytelsen, men forÃ¥rsaker at lys forsvinner i de fleste spill.\n" -"\n" -"Hvis usikker, la stÃ¥ avslÃ¥tt." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3094,7 +3035,7 @@ msgstr "Info" msgid "Information" msgstr "Informasjon" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Inndata" @@ -3106,7 +3047,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3114,11 +3055,11 @@ msgstr "Sett inn SD-kort" msgid "Insert name here.." msgstr "Sett inn navn her..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3127,42 +3068,42 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Intern LZO-feil - komprimering mislyktes" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3171,19 +3112,19 @@ msgstr "" "Intern LZO-feil - dekomprimering mislyktes (%d) (%li, %li) \n" "Prøv Ã¥ laste Save State'en igjen" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Intern LZO-feil - lzo_init() mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3192,11 +3133,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ugyldig størrelse (%x) eller magisk ord (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ugyldig verdi!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" @@ -3205,7 +3146,7 @@ msgstr "Ugyldig bat.map eller mappesti" msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ugyldig fil" @@ -3220,29 +3161,29 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ugyldig save state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiensk" @@ -3250,16 +3191,16 @@ msgstr "Italiensk" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japansk" @@ -3267,7 +3208,7 @@ msgstr "Japansk" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3278,17 +3219,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreansk" @@ -3306,19 +3247,23 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Siste Overskrevne Save State:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Siste Save State:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3328,8 +3273,8 @@ msgstr "Venstre" msgid "Left Stick" msgstr "Venstre Joystick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3337,7 +3282,7 @@ msgstr "" "Venstreklikk for Ã¥ oppdage hot-taster.\n" "Trykk space for Ã¥ klarere." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3347,7 +3292,7 @@ msgstr "" "Middelklikk for Ã¥ tømme.\n" "Høyreklikk for flere alternativer." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3355,76 +3300,76 @@ msgstr "" "Venstre/Høyre-klikk for flere alternativer.\n" "Middelklikk for Ã¥ tømme." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Last Inn Save State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Last Inn Save State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Last Inn Save State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Last Inn Save State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Last Inn Save State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Last Inn Save State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Last Inn Save State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Last Inn Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3438,36 +3383,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Loggtyper" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Vis antall bilder rendert per sekund som et mÃ¥l pÃ¥ emulasjonsfart.\n" +"\n" +"Hvis usikker, la stÃ¥ avslÃ¥tt." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger utdata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3475,10 +3428,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "Mistet koblingen til server!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Lavt level emulert (LLE) eller høyt level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M-knappen" @@ -3492,12 +3441,12 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" @@ -3506,33 +3455,33 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Skaper:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Maximum" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Minnekortet har allerede en lagringsfil for denne tittelen." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Minnekort allerede Ã¥pnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Minnekort" @@ -3544,7 +3493,7 @@ msgstr "" "Minnekort Manager ADVARSEL - Lag backup før du benytter, det skal bli " "fikset, men den kan tukle med lagringsfilene dine!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3569,20 +3518,20 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3591,7 +3540,7 @@ msgstr "Diverse Innstillinger" msgid "Modifier" msgstr "Modifiserer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3607,16 +3556,16 @@ msgstr "" msgid "Monospaced font" msgstr "Mono-mellomrom tekst-font" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3638,7 +3587,7 @@ msgstr "" msgid "Multiply" msgstr "Multipliser" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3646,11 +3595,11 @@ msgstr "" "Deaktiver Wiimote-høytaleren. Fikser tilfeldige avkoblinger pÃ¥ ekte Wiimote-" "er. Har ingen effekt pÃ¥ emulert Wii-kontroll." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3738,38 +3687,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Navn:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Navn:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Maskinvare-innfødte GCI-filer(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Neste Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Neste Søk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Brukernavn :" @@ -3777,7 +3726,7 @@ msgstr "Brukernavn :" msgid "No Country (SDK)" msgstr "Intet Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Ingen ISO- eller WAD-filer funnet" @@ -3786,8 +3735,8 @@ msgstr "Ingen ISO- eller WAD-filer funnet" msgid "No banner file found for title %s" msgstr "Inngen banner-fil funnet for tittelen %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3795,15 +3744,15 @@ msgstr "" msgid "No docking" msgstr "Ingen dokking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Ingen fil lastet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Ingen ledige mappestiindeks-entries" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Ingen opptaksfil" @@ -3812,33 +3761,33 @@ msgstr "Ingen opptaksfil" msgid "No save folder found for title %s" msgstr "Ingen lagringsmappe funnet for tittel %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Ikke tilkoblet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notater" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notater:" @@ -3847,7 +3796,7 @@ msgstr "Notater:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Merknad" @@ -3855,28 +3804,28 @@ msgstr "Merknad" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Antall koder:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk Aksellerasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Av" @@ -3884,60 +3833,56 @@ msgstr "Av" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Kun %d blokker tilgjengelig" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ã…pne fil..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kan ikke lage kontekst for device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kan ikke finne lyd-device" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan ikke Ã¥pne device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Ã…pner debuggeren" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Ã…pner loggeren" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Alternativer" @@ -3946,7 +3891,7 @@ msgstr "Alternativer" msgid "Orange" msgstr "Oransje" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3956,8 +3901,8 @@ msgstr "" "Høyreklikk og eksporter all lagringsfilene,\n" "og importer lagringsfilene til et nytt minnekort\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Annet" @@ -3969,19 +3914,19 @@ msgstr "" "Den andre klienten koblet fra mens spillet kjører! NetPlay er frakoblet. Du " "mÃ¥ stoppe spillet manuelt." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Utdata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Spi&llopptak..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Kontroll" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Kontroll" @@ -3997,7 +3942,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Pair Up" @@ -4009,30 +3954,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametere" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekt" @@ -4041,36 +3990,36 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektiv %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Spill" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Spill Opptak" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Spillbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Avspillingsalterntiver" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4082,54 +4031,54 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4142,11 +4091,11 @@ msgstr "ForhÃ¥ndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Forrige Verdi" @@ -4154,7 +4103,7 @@ msgstr "Forrige Verdi" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4162,7 +4111,7 @@ msgstr "Profil" msgid "Properties" msgstr "Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Tøm Cache" @@ -4170,8 +4119,8 @@ msgstr "Tøm Cache" msgid "Question" msgstr "SpørsmÃ¥l" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Avslutt" @@ -4189,7 +4138,7 @@ msgstr "R-knappen" msgid "R-Analog" msgstr "Høyre-analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4197,47 +4146,47 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rekkevidde" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Ekte" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Ekte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Ekte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Gjenntilkoble Wiimote bekreftelse" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Opptak" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Opptaksinformasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opptaksinnstillinger" @@ -4253,7 +4202,7 @@ msgstr "Rød Venstre" msgid "Red Right" msgstr "Rød Høyre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4268,29 +4217,29 @@ msgstr "" "\n" "Hvis usikker, velg ingen." -#: 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Oppdater" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Oppdater spilliste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Fjern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4300,17 +4249,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Render til Hovedvindu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Restart" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultater" @@ -4327,7 +4276,7 @@ msgstr "Høyre" msgid "Right Stick" msgstr "Høyre Joystick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4336,116 +4285,112 @@ msgstr "Rumble" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Kjør DSP LLE pÃ¥ en dedikert CPU-trÃ¥d (ikke anbefalt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sikker" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Samplingsratio:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Lagre" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Lagre GCI som..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Lagre Save State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Lagre Save State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Lagre Save State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Lagre Save State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Lagre Save State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Lagre Save State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Lagre Save State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Lagre Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Søker..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "SkjDump" @@ -4453,25 +4398,25 @@ msgstr "SkjDump" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Juksekodesøk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4482,20 +4427,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Seksjon %s ikke funnet i SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Velg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4513,23 +4458,23 @@ msgstr "Velg en lagringsfil Ã¥ importere" msgid "Select floating windows" msgstr "Velg flytvindu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4547,11 +4492,16 @@ msgstr "" "\n" "Hvis usikker, velg Automatisk." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Valgt font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4567,7 +4517,7 @@ msgstr "" "Hvis usikker, velg skrivebordsoppløsningen din.\n" "Hvis fortsatt usikker, bruk den høyeste oppløsingen som fungerer for deg." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4583,11 +4533,11 @@ msgstr "" "\n" "Hvis usikker, velg Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Send" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensorbarposisjon:" @@ -4595,46 +4545,52 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Innstillinger..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kortnavn:" @@ -4643,105 +4599,105 @@ msgstr "Kortnavn:" msgid "Shoulder Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Vis &Konsoll" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Vis &Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Vis &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Vis &Verktøylinje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Vis Bildefrekvens (FPS)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Vis Frankrike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Vis Inndata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Vis Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Vis JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Vis SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Vis Loggk&onfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Vis PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Vis Plattformer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Vis Statistikker" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Vis Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Vis USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Vis WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4750,27 +4706,39 @@ msgstr "" "men det kan ogsÃ¥ forÃ¥rsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Vis lagringskommentar" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Vis lagringstittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4781,15 +4749,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Vis denne hjelpemelding" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Vis ukjent" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4799,31 +4763,35 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Dropp EFB Access fra CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4835,7 +4803,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4851,17 +4819,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4869,7 +4837,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Stillbilde" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software-renderer" @@ -4884,11 +4852,11 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Innstillinger for Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Audio backend %s er ugyldig" @@ -4902,17 +4870,17 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spansk" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Høytalervolum:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4931,11 +4899,7 @@ msgstr "" "\n" "Hvis usikker, velg 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Spesifiser en programvareutvidelse for video" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -4943,51 +4907,55 @@ msgstr "Øk diskoverføringshatighet" msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standardkontroller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Begynn &Opptak" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Begynn Opptak" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Save State" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Save State-lagringsfiler" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5001,7 +4969,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Strekk til Vindu" @@ -5022,12 +4990,12 @@ msgstr "Eksportering av fil til %s vellykket" msgid "Successfully imported save files" msgstr "Importering av lagringsfiler vellykket" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "SystemsprÃ¥k:" @@ -5035,7 +5003,7 @@ msgstr "SystemsprÃ¥k:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -5057,30 +5025,30 @@ msgstr "Tabell Venstre" msgid "Table Right" msgstr "Tabell Høyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5096,13 +5064,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5125,7 +5093,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Filen %s er allerede Ã¥pen, fil-headeren vil ikke bli skrevet." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -5142,7 +5110,7 @@ msgstr "navnet kan ikke inneholde tegnet ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Den dekrypterte AR-koden inneholder ingen linjer." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5155,11 +5123,11 @@ msgstr "" "\n" "Hvis usikker, bruk den andre-raskeste verdien fra høyre." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Lagringsfilen du forsøker Ã¥ Ã¥pne har en ugyldig filstørrelse" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5191,22 +5159,19 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Velging av tema gikk feil" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "Det mÃ¥ være en billett for 00000001/00000002. Din NAND-dump er ukomplett." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5214,7 +5179,7 @@ msgstr "" "Disse innstillingene overstyrer Dolphins kjerneinnstillinger.\n" "Ubestemt betyr at spillet bruker Dolphins kjerneinnstillinger." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5222,14 +5187,16 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5244,7 +5211,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5256,7 +5223,7 @@ msgstr "" "Øker ytelsen pÃ¥ datamaskiner med mer enn én kjerne,\n" "men kan ogsÃ¥ føre til feil/krasj." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" @@ -5265,40 +5232,40 @@ msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" msgid "Threshold" msgstr "Terskel" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Tittel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Til" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." @@ -5318,7 +5285,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Tyrkisk" @@ -5330,12 +5297,12 @@ msgstr "Dreieskive" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5343,7 +5310,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UKJENT" @@ -5369,24 +5336,24 @@ msgstr "" "kryptert eller dekryptert kode. Sørg for at du tastet den inn korrekt.\n" "Ønsker du Ã¥ ignorere denne linjen og fortsette parsering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Udefinert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Angre Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Ukjent" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Ukjent DVD-kommando%08x - fatal feil" @@ -5411,32 +5378,32 @@ msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" msgid "Up" msgstr "Opp" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Oppdater" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Bruk Fullskjerm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5449,7 +5416,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5463,15 +5430,15 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Verktøyet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Vertikal Synkronisering" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Verdi" @@ -5479,23 +5446,23 @@ msgstr "Verdi" msgid "Value:" msgstr "Verdi:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Verdi:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volum" @@ -5510,7 +5477,7 @@ msgstr "WAD-installasjon feilet: Skaper feil %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD-installasjon feilet: Skaper feil %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5523,16 +5490,16 @@ msgstr "" "Hvis usikker, la stÃ¥ avslÃ¥tt." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" @@ -5551,7 +5518,7 @@ msgstr "" "%s\n" "Ønsker du Ã¥ fortsette?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5564,7 +5531,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5572,7 +5539,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5580,7 +5547,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5600,7 +5567,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fil ikke Ã¥pen." @@ -5608,31 +5575,31 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Widescreen Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5640,17 +5607,17 @@ msgstr "Wii-lagringsfiler (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunne ikke lese fra fil" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5663,19 +5630,19 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote-motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5696,27 +5663,27 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Arbeider..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Skriv til Konsoll" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Skriv til Fil" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Skriv til Fil" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Skriv til Vindu ->" @@ -5735,7 +5702,7 @@ msgstr "XAudio2-initialisering mislyktes: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice-laging mislyktes: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5753,23 +5720,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Du kan ikke lukke panelene som har sider/faner i dem." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Du mÃ¥ velge et spill!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Du mÃ¥ skrive inn et navn!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Du mÃ¥ skrive inn en gyldig desimal, hexadesimal eller octal verdi." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Du mÃ¥ skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du mÃ¥ restarte Dolphin for at endringen skal tre i kraft." @@ -5792,25 +5759,25 @@ msgstr "" "Den skal være 0x%04x (men er 0x%04llx)\n" "Ønsker du Ã¥ generere en ny en?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP-hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3-kode støttes ikke" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero-kode ukjent for Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ venter ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5825,7 +5792,7 @@ msgstr "" msgid "[Custom]" msgstr "[Selvdefinert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5844,7 +5811,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5858,11 +5825,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -5879,7 +5846,7 @@ msgstr "Kunne ikke lese data fra fil: %s" msgid "failed to read header" msgstr "Kunne ikke lese header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." @@ -5889,7 +5856,7 @@ msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." msgid "not a wii save or read failure for file header size %x" msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5898,7 +5865,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -5910,13 +5877,16 @@ msgstr "zFar Korreksjon: " msgid "zNear Correction: " msgstr "zNear Korreksjon: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ELLER" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Bilde-etter-bilde Modus" @@ -5970,9 +5940,35 @@ 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" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Kalkuler dybdeverdier for 3D-grafikk per-piksel istedenfor per punkt.\n" +#~ "I motsetning til pikselbelysning (som er en forbedring), sÃ¥ er per-piksel " +#~ "dybdekalkuleringer nødvendige for Ã¥ nøyaktig emulere en liten mengde " +#~ "spill.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ pÃ¥." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6009,6 +6005,21 @@ msgstr "| ELLER" #~ msgid "Could not get info about plugin %s" #~ msgstr "Kunne ikke lage %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Laget av KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Laget av VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6019,9 +6030,27 @@ msgstr "| ELLER" #~ msgid "Danish" #~ msgstr "Dansk" +#~ msgid "Disable Lighting" +#~ msgstr "Deaktiver lyseffekter" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Deaktiver Per-Pikseldybde" + +#~ msgid "Disable Textures" +#~ msgstr "Deaktiver teksturer" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Deaktiver Wiimote-høytaler" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Deaktiver teksturer.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ avslÃ¥tt." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6068,6 +6097,9 @@ msgstr "| ELLER" #~ msgid "Enable Audio Throttle" #~ msgstr "Aktiver Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Aktiver BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" @@ -6092,6 +6124,15 @@ msgstr "| ELLER" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Aktiver Skjermsparer (reduserer bildeinnbrenning)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Tillater Block Adress Translation (BAT); en funksjon av Memory Management " +#~ "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = " +#~ "Kompitabelt, AV = Raskt)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6127,6 +6168,9 @@ msgstr "| ELLER" #~ msgid "Error opening file %s for recording" #~ msgstr "Feil ved Ã¥pning av fil %s for opptak" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Avslutt Dolphin med emulator" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6136,6 +6180,9 @@ msgstr "| ELLER" #~ "%s\n" #~ "Denne filen kreves for Ã¥ bruke DSP LLE." +#~ msgid "Fast Mipmaps" +#~ msgstr "Raske Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6184,6 +6231,15 @@ msgstr "| ELLER" #~ "Hvis et spill fryser til, fungerer kun i Interpreter-modus, eller Dolphin " #~ "krasjer, kan dette alternativet muligens fikse spillet." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Øker ytelsen, men forÃ¥rsaker at lys forsvinner i de fleste spill.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ avslÃ¥tt." + #~ msgid "Input Source" #~ msgstr "Kilde For Inndata" @@ -6218,6 +6274,15 @@ msgstr "| ELLER" #~ "Ã… laste mipmaps er den nøyaktigste oppførserselen i forhold til GC/Wii, " #~ "men det kan redusere ytelsen." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Lavt level emulert (LLE) eller høyt level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script-Konsoll" @@ -6248,6 +6313,12 @@ msgstr "| ELLER" #~ msgid "OpenGL" #~ msgstr "Ã…pne" +#~ msgid "Opens the debugger" +#~ msgstr "Ã…pner debuggeren" + +#~ msgid "Opens the logger" +#~ msgstr "Ã…pner loggeren" + #~ msgid "Plugins" #~ msgstr "Programvareutvidelser" @@ -6282,6 +6353,9 @@ msgstr "| ELLER" #~ msgid "Running script...\n" #~ msgstr "Kjører skript...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Samplingsratio:" + #~ msgid "Scale:" #~ msgstr "Skala:" @@ -6330,6 +6404,9 @@ msgstr "| ELLER" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Vis antall bilder rendert per sekund (FPS)." +#~ msgid "Show this help message" +#~ msgstr "Vis denne hjelpemelding" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6372,6 +6449,9 @@ msgstr "| ELLER" #~ "De andre alternativene er forhÃ¥ndsbestemte oppløsninger for Ã¥ velge en " #~ "visuell kvalitet uavhengig av din skjermoppløsning." +#~ msgid "Specify a video backend" +#~ msgstr "Spesifiser en programvareutvidelse for video" + #~ msgid "Specify an audio plugin" #~ msgstr "Spesifiser en programvareutvidelse for audio" @@ -6384,6 +6464,9 @@ msgstr "| ELLER" #~ msgid "The file " #~ msgstr "Filen" +#~ msgid "Theme selection went wrong" +#~ msgstr "Velging av tema gikk feil" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 50592ad0ae..97aa1e2d0b 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-08-07 16:43+0100\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" "Language: Dutch\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(te veel om te weergeven)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Spel:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NIET" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Verbinding Verbroken" @@ -150,156 +143,156 @@ msgstr "%sExporteer GCI%s" msgid "%sImport GCI%s" msgstr "%sImporteer GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& EN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Over..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Start van DVD Drive..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breekpunten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Zoek voor ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Cheats Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulatie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Frame Avanceren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Volledig Scherm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafische Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Help" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Sneltoets Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Laad staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Geheugenkaart Manager (GC) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Geheugen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Open..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opties " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Eigenschappen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Lijst Vernieuwen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Geluid " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Gereedschap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Bekijk " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -315,27 +308,27 @@ msgstr "(-)+zDichtbij" msgid "(UNKNOWN)" msgstr "(ONBEKEND)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(uit) " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -343,46 +336,48 @@ msgstr "8 bit" msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Er is al een NetPlay venster geopend!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Er staat geen spel aan." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Er is geen ondersteund bluetooth apparaat gevonden!\n" "(Alleen de Microsoft bluetooth stack is ondersteund.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -432,19 +427,19 @@ msgstr "AR Codes" msgid "About Dolphin" msgstr "Over Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Actie" @@ -479,7 +474,7 @@ msgstr "" "Boosdoener Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +482,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : address = %08x) in Voeg Code " "Toe (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +491,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Vul en Schuif " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +500,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Ram Schrijf " "En Vul (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,15 +509,16 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Schrijf Naar " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Fout: Verkeerde waarde (%08x) in Geheugen Kopie (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Fout: Master Code en Schrijf naar CCXXXXXX niet " "geimplementeerd (%s)" @@ -532,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fout: foutive AR code regel: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditionele Code: Onjuiste Grootte %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Onjuiste Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Onjuist subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Onjuist Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -561,11 +557,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -573,13 +569,13 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Voeg toe..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -619,53 +615,54 @@ msgstr "" "\n" "NB: Controleer de uiteindelijke waardes in LogWindow/Console." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Stel de vereiste analoge control druk in om de knop te activeren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -674,20 +671,24 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropic Filteren:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -700,15 +701,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Applader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Toepassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,16 +719,16 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabisch" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -750,12 +751,12 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -763,24 +764,24 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Veelvoud van 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatisch (Venster Grootte)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Venster grootte automatisch aanpassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,19 +791,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registers" @@ -811,16 +804,16 @@ msgstr "&Registers" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Instellingen" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Geluids backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Achtergrond invoer" @@ -833,16 +826,16 @@ msgstr "Terug" msgid "Bad File Header" msgstr "Verkeerde bestands header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -850,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Balk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -866,7 +859,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum is mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokken" @@ -882,47 +875,53 @@ msgstr "Blauw Links" msgid "Blue Right" msgstr "Blauw Rechts" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Onder" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Defect" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Zoek" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Knoppen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -934,35 +933,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Bereken diepte waardes van 3D graphics per-pixel, in plaats van per " -"vertex. \n" -"In tegenstelling tot pixel verlichting (wat enkel een toevoeging is) zijn " -"per-pixel berekeningen nodig om een klein aantal spellen goed te emuleren.\n" -"\n" -"In geval van twijfel leeg laten." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -978,7 +961,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuleer" @@ -994,7 +977,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1004,7 +987,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1012,18 +995,18 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" @@ -1031,28 +1014,28 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalaans" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Middelpunt" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Verander" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Verander &Schijf" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Verander Schijf" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Spel veranderen" @@ -1073,11 +1056,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Verandert teken van zDichtbij parameter (na correctie)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1085,47 +1067,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cheat Zoeken" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1133,7 +1115,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1141,8 +1123,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1156,8 +1138,8 @@ msgstr "Klassiek" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Legen" @@ -1169,22 +1151,22 @@ msgstr "" "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. " "Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Sluit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "In&stellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code: " @@ -1192,96 +1174,96 @@ msgstr "Code: " msgid "Command" msgstr "Commando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Config" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configureer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configureer Besturing" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configureer Besturing Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Verbind Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Verbind Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Verbind Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Verbind Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Verbinden..." @@ -1297,16 +1279,16 @@ msgstr "Bestuur" msgid "Convert to GCI" msgstr "Omzetten naar GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1315,7 +1297,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Het volgende bestanden kon niet gemaakt worden %s " -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Kon de %s backend niet initialiseren." @@ -1336,12 +1318,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1350,7 +1332,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1363,11 +1345,11 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1375,17 +1357,17 @@ msgstr "" "Kon de kern niet initialiseren.\n" "Controleer je instellingen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Maak AR Code" @@ -1394,25 +1376,7 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Gemaakt door VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Auteur:" @@ -1420,11 +1384,11 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Bijsnijden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,12 +1402,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1451,15 +1415,15 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tsjechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1467,36 +1431,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Station:" @@ -1508,16 +1472,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro bestanden(*.sav)" @@ -1529,11 +1493,11 @@ msgstr "Datel MaxDrive/Pro bestanden(*.sav)" msgid "Dead Zone" msgstr "Dode Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1542,24 +1506,24 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1568,11 +1532,11 @@ msgid "Default font" msgstr "Standaard font" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Verwijder Save" @@ -1581,11 +1545,11 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Beschrijving" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detect" @@ -1598,13 +1562,13 @@ msgstr "" "Poging gedecteerd om meer data af te lezen van een DVD dan dat er in de " "buffer past. Klem" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1628,29 +1592,17 @@ msgstr "" "Map checksum is mislukt\n" " en map backup checksum is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Schakel Lighting uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Schakel Pixel Diepte uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Schakel Textures uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1664,7 +1616,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1680,17 +1632,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Schakel texturing uit.\n" -"\n" -"In geval van twijfel leeg laten." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Schijf" @@ -1699,11 +1641,11 @@ msgstr "Schijf" msgid "Disc Read Error" msgstr "Schijf Lees Fout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1717,20 +1659,24 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafische Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1738,39 +1684,39 @@ msgstr "Dolphin &Web Site" msgid "Dolphin Configuration" msgstr "Dolphin Configuratie" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Geëmuleerde Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin kan geen GC/Wii ISO's vinden. Dubbelklik om bestanden te zoeken..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1778,16 +1724,21 @@ msgstr "" "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle " "spellen te weergeven..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Omlaag" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download Codes (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes gedownload. (%lu toegevoegd)" @@ -1796,27 +1747,27 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump texturen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1826,7 +1777,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1836,7 +1787,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1846,24 +1797,24 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Nederlands" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Sl&uiten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Regio kopie" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1876,11 +1827,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Vroege Geheugen Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Wijzig" @@ -1888,7 +1839,7 @@ msgstr "Wijzig" msgid "Edit ActionReplay Code" msgstr "Wijzig ActionReplay Code" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Wijzig Configuratie" @@ -1896,12 +1847,12 @@ msgstr "Wijzig Configuratie" msgid "Edit Patch" msgstr "Wijzig Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Wijzig..." @@ -1909,15 +1860,15 @@ msgstr "Wijzig..." msgid "Effect" msgstr "Effect" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emu Thread draait al!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1931,7 +1882,7 @@ msgstr "" "\n" "In geval van twijfel selecteer virtuele XFB emulatie." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1947,19 +1898,19 @@ msgstr "" "\n" "In geval van twijfel geselecteerd laten." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulatie Staat:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activeer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1975,73 +1926,68 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Activeer BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activeer Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2055,7 +2001,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2063,11 +2009,11 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activeer Pagina's" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2079,7 +2025,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2091,7 +2037,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2099,21 +2045,28 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Schakel Block Address Translation (BAT) in, een functie van de Memory " -"Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " -"(AAN = Compatibel, UIT = Snel)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2126,7 +2079,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2134,7 +2087,7 @@ msgstr "" "Schakel de Memory Management Unit in, die nodig is voor sommige games. (AAN " "= Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2148,14 +2101,14 @@ msgstr "" msgid "End" msgstr "Einde" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Engels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Verbeteringen" @@ -2173,17 +2126,17 @@ msgstr "Toegang %d/%d" msgid "Entry 1/%d" msgstr "Toegang 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Gelijk" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error (Fout)" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " @@ -2223,36 +2176,32 @@ msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx" msgid "Execute" msgstr "Uitvoeren" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sluit Dolphin met emulator" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exporteer Bestand" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2260,15 +2209,15 @@ msgstr "Exporteer alle saves..." msgid "Export failed, try again?" msgstr "Uitpakken is mislukt, opnieuw proberen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exporteer save als..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2280,52 +2229,52 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Uitpakken..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Speler" @@ -2333,7 +2282,7 @@ msgstr "FIFO Speler" msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Groote:" @@ -2341,15 +2290,15 @@ msgstr "FST Groote:" msgid "Failed to Connect!" msgstr "Verbinden Mislukt!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Luisteren Mislukt!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2386,6 +2335,11 @@ msgstr "Kon bthprops.cpl niet laden" msgid "Failed to load hid.dll" msgstr "Mislukt om hid.dll te laden" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Het schrijven van header voor %s is mislukt" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Mislukt om banner.bin te lezen" @@ -2468,46 +2422,41 @@ msgstr "Het schrijven van header voor %s is mislukt" msgid "Failed to write header for file %d" msgstr "Het schrijven van header voor bestanden %d is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Laad Native Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Speler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Bestand bevat geen codes." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Bestand geconverteerd naar .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2524,7 +2473,7 @@ msgstr "" "Bestand heeft de extensie \"%s\"\n" "juiste extensie zijn (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Bestand is niet herkend als geheugenkaart" @@ -2537,48 +2486,48 @@ msgstr "Bestand niet gecompressed" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Herstel Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forceer 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forceer Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2591,7 +2540,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2603,7 +2552,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2626,57 +2575,57 @@ msgstr "" msgid "Forward" msgstr "Vooruit" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Frame Bereik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimiet:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vrije kijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Frans" @@ -2684,21 +2633,21 @@ msgstr "Frans" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Van" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Volledig scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Volledige Scherm Resolutie:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Bestand(*.gci)" @@ -2707,57 +2656,61 @@ msgstr "GCI Bestand(*.gci)" msgid "GCMic Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spel ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Het spel draait al!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Het spel draait niet!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2772,41 +2725,41 @@ msgstr "" "GeckoCode kon niet draaien (CT%i CST%i) (%s)\n" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Algemeen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Algemene Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Duits" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is groter dan de grootte van de AR code lijst %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafische" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafische instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Grooter dan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2824,7 +2777,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grieks" @@ -2844,11 +2797,11 @@ msgstr "Groen Rechts" msgid "Guitar" msgstr "Gitaar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2856,11 +2809,11 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreeuws" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Hoogte" @@ -2868,7 +2821,7 @@ msgstr "Hoogte" msgid "Help" msgstr "Help" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2884,15 +2837,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Verberg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Verberg Muis Cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2906,8 +2859,8 @@ msgstr "" msgid "Home" msgstr "Thuis" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2915,28 +2868,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongaarse" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Poging tot verkrijgen van data van een onbekende ticket: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2949,31 +2902,31 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Instellingen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR Aanwijzer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO Map" @@ -2981,24 +2934,24 @@ msgstr "ISO Map" msgid "ITALY" msgstr "ITALIË" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT = " "Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3009,11 +2962,11 @@ msgstr "" "50),\n" "dan moet je ook Audio Throttle DSP uitschakelen om het effectief te maken." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Negeer formaat veranderingen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3027,7 +2980,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3041,7 +2994,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importeer Save" @@ -3049,7 +3002,7 @@ msgstr "Importeer Save" msgid "Import failed, try again?" msgstr "Importeren is mislukt, opnieuw proberen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3057,11 +3010,11 @@ msgstr "" "Geimporteerd bestand heeft gsc extensie\n" "maar heeft niet de juiste header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Geimporteerd bestand heeft een onjuiste lengte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3069,7 +3022,7 @@ msgstr "" "Geimporteerd bestand heeft sav extension\n" "maar heeft geen juiste header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3081,27 +3034,16 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Verbeterd performance, maar zorgt ervoor dat belichting in meeste games " -"verdwijnt. \n" -"\n" -"In geval van twijfel leeg laten." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3109,7 +3051,7 @@ msgstr "Info" msgid "Information" msgstr "Informatie" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Invoer" @@ -3121,7 +3063,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3129,11 +3071,11 @@ msgstr "Schakel SD Card in" msgid "Insert name here.." msgstr "Voeg naam hier toe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3144,43 +3086,43 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Interface Instellingen" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Interne LZO fout - compressie is mislukt" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3189,19 +3131,19 @@ msgstr "" "Interne LZO fout - decompressie is mislukt (%d) (%li, %li) \n" "Probeer de staat opnieuw te laden" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Interne LZO fout - lzo_init() is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3210,11 +3152,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Onjuiste grootte (%x) of Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Onjuiste waarde!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" @@ -3223,7 +3165,7 @@ msgstr "Onjuiste bat.map of map vermelding" msgid "Invalid event type %i" msgstr "Onjuist event type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Onjuist bestand" @@ -3238,29 +3180,29 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Onjuiste staat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italië" @@ -3268,16 +3210,16 @@ msgstr "Italië" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japans" @@ -3285,7 +3227,7 @@ msgstr "Japans" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3296,17 +3238,17 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreaans" @@ -3324,19 +3266,23 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Laatste Overgeschreven Staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Laatste Opgeslagen Staat" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3346,8 +3292,8 @@ msgstr "Links" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3355,7 +3301,7 @@ msgstr "" "Links-klik om sneltoetsen te detecteren.\n" "Druk op spatie om te legen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3365,7 +3311,7 @@ msgstr "" "Midden-klik om te wissen.\n" "Klik met de rechtermuisknop voor meer opties." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3373,77 +3319,77 @@ msgstr "" "Links / Rechts-klik voor meer opties.\n" "Midden-klik om te wissen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Laad staat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Laad staat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Laad staat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Laad staat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Laad staat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Laad staat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Laad staat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Laad staat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3457,36 +3403,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Vergrendel Threads aan CPU cores" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Logboek" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Log Types" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Weergeef het aantal frames dat per seconde wordt gerendered als een meting " +"van de emulatie snelheid,\n" +"\n" +"In geval van twijfel leeg laten." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger Uitvoer" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logboek Bijhouden" @@ -3494,10 +3449,6 @@ msgstr "Logboek Bijhouden" msgid "Lost connection to server!" msgstr "Verbinding met de server verloren!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Laag niveau (LLE) of Hoog niveau (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Knop" @@ -3511,12 +3462,12 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" @@ -3525,33 +3476,33 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Maker:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "De geheugenkaart heeft al een save voor deze titel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "De geheugenkaart is al geopend" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3563,7 +3514,7 @@ msgstr "" "Geheugenkaart Manager Waarschuwing - Maak backups voor gebruik, het zou " "moeten werken" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3588,20 +3539,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Microfoon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3610,7 +3561,7 @@ msgstr "Overige Instellingen" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3626,16 +3577,16 @@ msgstr "" msgid "Monospaced font" msgstr "Niet-proportioneel (monospace) lettertype" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3658,7 +3609,7 @@ msgstr "" msgid "Multiply" msgstr "Vermenigvuldigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3666,11 +3617,11 @@ msgstr "" "Dempt de Wiimote speaker. Fixt willekeurige loskoppelingen van echte " "wiimotes. Heeft geen effect op geëmuleerde wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3758,38 +3709,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Naam:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Naam:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI-bestanden (*. GCI)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Volgende Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Volgende Scan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Gebruikersnaam :" @@ -3797,7 +3748,7 @@ msgstr "Gebruikersnaam :" msgid "No Country (SDK)" msgstr "Geen land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Geen ISOs of WADS gevonden." @@ -3806,8 +3757,8 @@ msgstr "Geen ISOs of WADS gevonden." msgid "No banner file found for title %s" msgstr "Geen banner gevonden voor titel %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3815,15 +3766,15 @@ msgstr "" msgid "No docking" msgstr "Geen docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Geen bestand geladen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Geen vrije map indexes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Geen opgenomen bestand" @@ -3832,33 +3783,33 @@ msgstr "Geen opgenomen bestand" msgid "No save folder found for title %s" msgstr "Geen save map gevonden voor titel %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Niet verbonden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Opmerkingen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Opmerkingen:" @@ -3867,7 +3818,7 @@ msgstr "Opmerkingen:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Opmerkingen" @@ -3875,28 +3826,28 @@ msgstr "Opmerkingen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Aantal Codes:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk Acceleratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Uit" @@ -3904,60 +3855,56 @@ msgstr "Uit" msgid "Offset:" msgstr "Afstand:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Er zijn maar %d blocks beschikaarr" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Open Wii &save map" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Open Bestand..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kan geen context aanmaken voor device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kan geen geluids devices vinden" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan device %s niet openen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Open de debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Open de logger" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opties" @@ -3966,7 +3913,7 @@ msgstr "Opties" msgid "Orange" msgstr "Oranje" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3977,8 +3924,8 @@ msgstr "" "Rechts-klik en exporteer alle save bestanden,\n" "en importeer de saves naar een nieuwe geheugenkaart\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Overige" @@ -3990,19 +3937,19 @@ msgstr "" "De andere client is losgekoppeld terwijl het spel draait!! NetPlay is " "uitgeschakeld. Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Uitgang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Opname afspelen" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad" @@ -4018,7 +3965,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Verbinden" @@ -4030,30 +3977,34 @@ msgstr "Paragraaf" msgid "Parameters" msgstr "Parameters" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauze" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfect" @@ -4062,36 +4013,36 @@ msgstr "Perfect" msgid "Perspective %d" msgstr "Perspectief %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Speel" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Speel Opname" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Speelbaar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Terugspeel Opties" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4103,54 +4054,54 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Poort 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4163,11 +4114,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Vorige waarden" @@ -4175,7 +4126,7 @@ msgstr "Vorige waarden" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profiel" @@ -4183,7 +4134,7 @@ msgstr "Profiel" msgid "Properties" msgstr "Eigenschappen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Cache leegmaken" @@ -4191,8 +4142,8 @@ msgstr "Cache leegmaken" msgid "Question" msgstr "Vraag" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Stoppen" @@ -4210,7 +4161,7 @@ msgstr "R Knop" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4218,48 +4169,48 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Afstand" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Echt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Bevestig herverbinding van Wiimote " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Herverbind Wiimote Bij Staat Laden" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Speel Opnemen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Opname Informatie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opname Opties" @@ -4275,7 +4226,7 @@ msgstr "Rood Links" msgid "Red Right" msgstr "Rood Rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4289,29 +4240,29 @@ msgstr "" "\n" "In geval van twijfel selecteer Geen." -#: 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Ververs" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Lijst Verversen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Ververs de speellijst" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4322,17 +4273,17 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Opnieuw" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultaten" @@ -4349,7 +4300,7 @@ msgstr "Rechts" msgid "Right Stick" msgstr "Rechter Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4358,117 +4309,113 @@ msgstr "" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Zet DSP LLE op een aparte core (niet aanbevolen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Sample Rate:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Sla GCI op als..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Sla Staat 1 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Sla Staat 2 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Sla Staat 3 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Sla Staat 4 op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Sla Staat 5 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Sla Staat 6 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Sla Staat 7 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Sla Staat 8 Op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Scannen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4476,25 +4423,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Slot" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Cheat Zoeken" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4505,20 +4452,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sectie %s niet gevonden in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Selecteer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4536,23 +4483,23 @@ msgstr "Selecteer een save file om te importeren" msgid "Select floating windows" msgstr "Selecteer zwevende vensters" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4568,11 +4515,16 @@ msgstr "" "Force 4:3: Strek de afbeelding naar een beeldverhouding van 4:3\n" "Stretch naar het venster: Stretch de afbeelding naar je venster grootte." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Het opgegeven bestand \"%s\" bestaat niet" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Geselecteerde font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4589,7 +4541,7 @@ msgstr "" "In geval van twijfel, gebruik je desktop resolutie. \n" "Als je nog steeds twijfelt, gebruik de hoogste resolutie die voor jou werkt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4605,11 +4557,11 @@ msgstr "" "\n" "In geval van twijfel gebruik Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Verzend" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensor Bar Positie:" @@ -4617,48 +4569,54 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - Dit is de poort die apparaten zoals de net-adapter gebruiken" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Index is groter dan de grootte van de AR Code lijst %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Instellingen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Korte Naam:" @@ -4666,105 +4624,105 @@ msgstr "Korte Naam:" msgid "Shoulder Buttons" msgstr "Schouder Knoppen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Toon &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Toon &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Toon &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Toon &Toolbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Toon FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Toon Frans" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Toon Input Venster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Toon Italië" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Toon JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Toon Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Bekijk Log &Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Toon PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Toon Platformen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Weergeef statistieken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Toon Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Toon USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Toon Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Toon een bevestigingsvenster voordat u stopt met een spel." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4772,27 +4730,39 @@ msgstr "" "Als je dit uitschakeld zie je geen irritante berichten, maar het betekend " "ook dat Dolphin spontaan uit kan vallen zonder enige reden." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Toon save commentaar" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Toon save titel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4804,15 +4774,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Toon dit help bericht" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Toon onbekend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4822,32 +4788,36 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Sla EFB toegang van de CPU over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4859,7 +4829,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4869,17 +4839,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4887,7 +4857,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4903,11 +4873,11 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Geluids Instellingen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Geluids backend %s is niet juist." @@ -4921,17 +4891,17 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spaans" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4951,11 +4921,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 640x528" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Geef een video-plugin aan" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -4963,51 +4929,55 @@ msgstr "Versnel Disc Transfer Rate" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &netplay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Start Op&nemen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Start Opnemen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Staat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Opgeslage Staten" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5016,7 +4986,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Uitrekken naar Venster" @@ -5037,12 +5007,12 @@ msgstr "Bestand succesvol gexporteerd naar %s" msgid "Successfully imported save files" msgstr "Succesvol save games geimporteerd" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Systeem Taal:" @@ -5050,7 +5020,7 @@ msgstr "Systeem Taal:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Ingang" @@ -5071,31 +5041,31 @@ msgstr "Linker Tabel" msgid "Table Right" msgstr "Rechter Tabel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textuur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5111,13 +5081,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5141,7 +5111,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Het bestand %s was al open, de bestands header zal niet worden weggeschreven." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -5158,7 +5128,7 @@ msgstr "De naam mag niet het volgende teken bevatten ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "De resulterende gedecodeerde AR code bevat geen regels." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5166,13 +5136,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Het save bestand dat je probeert te kopiëren heeft een onjuiste bestands " "grootte" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5205,15 +5175,12 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Thema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Thema selectie ging fout" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5221,7 +5188,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5229,7 +5196,7 @@ msgstr "" "Deze instellingen overschrijven interne Dolphin instellingen.\n" "Onbepaald betekent dat het spel maakt gebruik van Dolphin's instellingen." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5237,14 +5204,16 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5259,7 +5228,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5271,7 +5240,7 @@ msgstr "" "Leidt tot grote snelheid verbeteringen op pc's met meer dan een kern, maar " "kan ook leiden tot crashes / glitches zo nu en dan." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" @@ -5280,40 +5249,40 @@ msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" msgid "Threshold" msgstr "Drempelwaarde" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Kantelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Naar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5333,7 +5302,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turks" @@ -5345,12 +5314,12 @@ msgstr "Draaischijf" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote " @@ -5358,7 +5327,7 @@ msgstr "UDP Wiimote " msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ONBEKEND" @@ -5385,24 +5354,24 @@ msgstr "" "manier hebt ingevoerd. \n" "Wil je deze regel negeren en verder gaan met verwerken?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Onbepaalde %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Ongedaan maken van Load staat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Onbekend" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Onbekend DVD commando %08x - fatale fout" @@ -5429,32 +5398,32 @@ msgstr "" msgid "Up" msgstr "Omhoog" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Update" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Gebruik &Volledig Scherm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5467,7 +5436,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5481,15 +5450,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Hulpprogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Waarde" @@ -5497,23 +5466,23 @@ msgstr "Waarde" msgid "Value:" msgstr "Waarde:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Waarde:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5528,7 +5497,7 @@ msgstr "WAD installatie mislukt: fout bij het creëren van %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installatie mislukt: fout bij het creëren van %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5541,16 +5510,16 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Waarschuwing - DOL wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" @@ -5570,7 +5539,7 @@ msgstr "" "%s\n" "Weet je zeker dat je door wil gaan?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5583,7 +5552,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5591,7 +5560,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5599,7 +5568,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5619,7 +5588,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - bestand niet open." @@ -5627,31 +5596,31 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5659,17 +5628,17 @@ msgstr "Wii save bestanden (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kon het bestand niet lezen" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5682,19 +5651,19 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Connected" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote instellingen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5715,27 +5684,27 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Werken..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Schrijf naar Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Schrijf naar Bestand" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Schrijf naar Bestand" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Schrijf naar venster" @@ -5754,7 +5723,7 @@ msgstr "XAudio2 initialisatie mislukt: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creatie mislukt: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5772,23 +5741,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "U kunt geen panelen sluiten die paginas bevatten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Je moet een spel kiezen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Je moet een naam invoeren!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -5811,25 +5780,25 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 code niet ondersteund" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code onbekend voor Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ wachten ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5845,7 +5814,7 @@ msgstr "" msgid "[Custom]" msgstr "[Aangepast]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5862,7 +5831,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5876,11 +5845,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "applader (.img)" @@ -5897,7 +5866,7 @@ msgstr "kon geen data lezen van bestand: %s" msgid "failed to read header" msgstr "kon de header niet lezen" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren." @@ -5908,7 +5877,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "geen wii save of het lezen van de grootte van bestandsheader %x is mislukt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5917,7 +5886,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -5929,13 +5898,16 @@ msgstr "zVer correctie:" msgid "zNear Correction: " msgstr "zDichtbij correctie:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OF" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Frame Stepping" @@ -5981,6 +5953,22 @@ msgstr "| OF" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Bereken diepte waardes van 3D graphics per-pixel, in plaats van per " +#~ "vertex. \n" +#~ "In tegenstelling tot pixel verlichting (wat enkel een toevoeging is) zijn " +#~ "per-pixel berekeningen nodig om een klein aantal spellen goed te " +#~ "emuleren.\n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6018,6 +6006,21 @@ msgstr "| OF" #~ msgid "Could not get info about plugin %s" #~ msgstr "Het volgende bestanden kon niet gemaakt worden %s " +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Gemaakt door KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Gemaakt door VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Gemaakt door black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Dlijst Cache" @@ -6028,9 +6031,27 @@ msgstr "| OF" #~ msgid "Danish" #~ msgstr "Deens" +#~ msgid "Disable Lighting" +#~ msgstr "Schakel Lighting uit" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Schakel Pixel Diepte uit" + +#~ msgid "Disable Textures" +#~ msgstr "Schakel Textures uit" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Schakel Wiimote speaker uit" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Schakel texturing uit.\n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6070,6 +6091,9 @@ msgstr "| OF" #~ msgid "Enable Audio Throttle" #~ msgstr "Activeer Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Activeer BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" @@ -6094,6 +6118,15 @@ msgstr "| OF" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activeer Screen Saver (burn-in reduction)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Schakel Block Address Translation (BAT) in, een functie van de Memory " +#~ "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " +#~ "(AAN = Compatibel, UIT = Snel)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6127,9 +6160,16 @@ msgstr "| OF" #~ "Afhankelijk van hoe het spel gebruik maakt van deze functie, hits van de " #~ "snelheid veroorzaakt door deze optie variëren van geen tot kritisch." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sluit Dolphin met emulator" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Mislukt om DSP ROM te laden vanuit: %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Laad Native Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6179,6 +6219,16 @@ msgstr "| OF" #~ "Als een spel hangt, werkt alleen in de Interpreter anders crasht Dolphin, " #~ "Deze optie kan het spel fixen" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Verbeterd performance, maar zorgt ervoor dat belichting in meeste games " +#~ "verdwijnt. \n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "Input Source" #~ msgstr "Invoer bron" @@ -6211,6 +6261,15 @@ msgstr "| OF" #~ "Laden native mipmaps is het nauwkeuriger gedrag, maar kan ook de " #~ "prestaties doen afnemen (uw kilometerstand kan zich evenwel verschillen)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Vergrendel Threads aan CPU cores" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Laag niveau (LLE) of Hoog niveau (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script Console" @@ -6242,6 +6301,12 @@ msgstr "| OF" #~ msgid "OpenGL" #~ msgstr "Open" +#~ msgid "Opens the debugger" +#~ msgstr "Open de debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Open de logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6263,6 +6328,9 @@ msgstr "| OF" #~ msgid "Running script...\n" #~ msgstr "Draaiend script ...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Sample Rate:" + #~ msgid "Scale:" #~ msgstr "Schaal:" @@ -6289,6 +6357,9 @@ msgstr "| OF" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Toon het aantal frames per seconde." +#~ msgid "Show this help message" +#~ msgstr "Toon dit help bericht" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6331,6 +6402,9 @@ msgstr "| OF" #~ "De andere opties zijn vaste resoluties voor het kiezen van een visuele " #~ "kwaliteit, onafhankelijk van uw beeldscherm grootte." +#~ msgid "Specify a video backend" +#~ msgstr "Geef een video-plugin aan" + #~ msgid "Specify an audio plugin" #~ msgstr "Geef een audio-plugin" @@ -6343,6 +6417,9 @@ msgstr "| OF" #~ msgid "The file " #~ msgstr "Het bestand" +#~ msgid "Theme selection went wrong" +#~ msgstr "Thema selectie ging fout" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index ed66a17a00..41be3b5604 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,26 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-23 11:42+0100\n" -"Last-Translator: Krzysztof Baszczok \n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" +"Last-Translator: Baszta \n" "Language-Team: Polish \n" "Language: Polish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(za dużo do wyÅ›wietlenia)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Gra :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -44,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -54,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i poÅ‚Ä…czony" @@ -152,156 +146,156 @@ msgstr "%sEksportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&O programie..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&ZaÅ‚aduj z napÄ™du DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breakpointy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ZaÅ‚aduj z ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Menadżer cheatów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulacja" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Plik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&PeÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Ustawienia &hotkey'ów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Wczytaj stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Menadżer karty pamiÄ™ci (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Pamięć" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otwórz..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Wstrzymaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Tryb &Read-only" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Rejestry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&DźwiÄ™k" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&NarzÄ™dzia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Wideo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Widok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -317,27 +311,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(Nieznany)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(wyÅ‚Ä…czone)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bitów" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bity" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bitów" @@ -345,46 +339,48 @@ msgstr "8 bitów" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay jest już otwarte!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Gra nie jest aktualnie uruchomiona." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Wspierany adapter bluetooth nie zostaÅ‚ znaleziony!\n" "(Tylko Microsoft bluetooth stack jest wspierane)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -417,13 +413,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kody AR" @@ -431,19 +427,19 @@ msgstr "Kody AR" msgid "About Dolphin" msgstr "O Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "DokÅ‚adność:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -456,8 +452,8 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz EFB to Texture." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Akcja" @@ -476,7 +472,7 @@ msgstr "" "Kod:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -484,7 +480,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -493,7 +489,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Fill and " "Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -502,7 +498,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Ram Write " "And Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -511,15 +507,16 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwa wartość (%08x) w Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "BÅ‚Ä…d Action Replay: Master Code and Write do CCXXXXXX nie jest " "zaimplementowane (%s)" @@ -529,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "BÅ‚Ä…d Action Replay: niewÅ‚aÅ›ciwa linia kodu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: NiewÅ‚aÅ›ciwy rozmiar %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: NiewÅ‚aÅ›ciwy typ Normal Code %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -558,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -570,13 +567,13 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Dodaj..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -616,72 +613,77 @@ msgstr "" "\n" "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartoÅ›ci." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Reguluje siÅ‚Ä™ nacisku wymaganego do aktywacji przycisków." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Pozwala przeÅ‚Ä…czać okreÅ›lone opcje przez skróty klawiszowe 3, 4, 5, 6 i 7 w " +"Pozwala przeÅ‚Ä…czać okreÅ›lone opcje przez skróty klawiszowe 3, 4, 5 i 6 w " "oknie emulacji.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Alternate Wiimote Timing" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrowanie anizotropowe:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Antyaliasing:" @@ -693,34 +695,34 @@ msgstr "Apploader niewÅ‚aÅ›ciwego rozmiaru... Czy to rzeczywiÅ›cie apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógÅ‚ wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Zastosuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -"Stosuje efekt post-processingowy po zakonczeniu ramki.\n" +"Stosuje efekt post-processingowy po zakonczeniu klatki.\n" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabski" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteÅ› pewny by usunÄ…c \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -728,12 +730,12 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -741,12 +743,12 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -754,24 +756,24 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Wiele z 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (rozmiar okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Auto-dopasowanie rozmiaru okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -781,23 +783,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" -"ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP rejestr" @@ -805,16 +795,16 @@ msgstr "BP rejestr" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Ustawienia Backend'u" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "WejÅ›cie w tle" @@ -827,16 +817,16 @@ msgstr "W tyÅ‚" msgid "Bad File Header" msgstr "ZÅ‚y nagłówek pliku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Baner:" @@ -844,11 +834,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Wajcha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -860,7 +850,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Suma kontrolna Block Allocation Table nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloki" @@ -876,47 +866,53 @@ msgstr "Niebieski lewo" msgid "Blue Right" msgstr "Niebieski prawo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Dół" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Zepsuty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Bufor:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Przyciski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -928,34 +924,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Oblicza wartoÅ›ci gÅ‚Ä™bokoÅ›ci grafiki 3D na pixel zamiast na wierzchoÅ‚ek.\n" -"W kontraÅ›cie do pixel lighting (które ledwo jest ulepszeniem), obliczenia " -"gÅ‚Ä™bokoÅ›ci na pixel sÄ… niezbÄ™dne do wÅ‚aÅ›ciwej emulacji niektórych gier.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -968,7 +949,7 @@ msgstr "" "Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować bÅ‚Ä™dy.\\nW razie " "wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Anuluj" @@ -984,7 +965,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeÅ„ podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -995,7 +976,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1003,18 +984,18 @@ msgstr "" "Tego pliku nie można użyć jako karty pamiÄ™ci.\n" "Chcesz użyć tego samego pliku w obu slotach?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle poÅ‚Ä…czenia %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" @@ -1022,28 +1003,28 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "KataloÅ„ski" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Åšrodek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "ZmieÅ„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ZmieÅ„ &dysk" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ZmieÅ„ dysk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ZmieÅ„ grÄ™" @@ -1064,12 +1045,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Zmienia symbol do parametru zNear (po poprawce)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Zmiana tego nie bÄ™dzie miaÅ‚a wpÅ‚ywu jeÅ›li emulator jest w trakcie pracy!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1077,47 +1057,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Szukaj cheatów" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Sprawdź integralność partycji" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Sprawdzanie integralnoÅ›ci..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1125,7 +1105,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1133,8 +1113,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1148,8 +1128,8 @@ msgstr "Classic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Wyczyść" @@ -1161,22 +1141,22 @@ msgstr "" "Klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " "rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zamknij" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ko&nfiguruj..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1184,95 +1164,95 @@ msgstr "Kod:" msgid "Command" msgstr "Polecenie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kompresowanie ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfig" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfiguracja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Konfiguracja sterowania" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Konfiguracja padów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "PoÅ‚Ä…cz Wiilot %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "PoÅ‚Ä…cz Wiilot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "PoÅ‚Ä…cz Wiilot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "PoÅ‚Ä…cz Wiilot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1288,16 +1268,16 @@ msgstr "Sterowanie" msgid "Convert to GCI" msgstr "Konwertuj do GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "RdzeÅ„" @@ -1306,7 +1286,7 @@ msgstr "RdzeÅ„" msgid "Could not create %s" msgstr "Nie można utworzyć %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Beckend %s nie mógÅ‚ zostać zainicjalizowany." @@ -1327,12 +1307,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1340,7 +1320,7 @@ msgstr "" "Nie można ustawić pada. Gracz odszedÅ‚ lub gra jest uruchomiona!\n" "(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1353,11 +1333,11 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1365,17 +1345,17 @@ msgstr "" "Nie można zainicjować rdzenia.\n" "Sprawdź konfiguracjÄ™." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Kraj:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Utwórz kod AR" @@ -1384,27 +1364,7 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nowÄ… perspektywÄ™" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Utworzone przez VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Twórca:" @@ -1412,11 +1372,11 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "ObciÄ™cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1430,12 +1390,12 @@ msgstr "" msgid "Crossfade" msgstr "Suwak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1443,15 +1403,15 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Czeski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1459,36 +1419,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" @@ -1500,16 +1460,16 @@ msgstr "DVDLowRead - Fatal Error: bÅ‚Ä…d odczytu dysku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: bÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Pliki Datel MaxDrive/Pro(*.sav)" @@ -1521,11 +1481,11 @@ msgstr "Pliki Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Dead Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugowanie" @@ -1533,24 +1493,24 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" @@ -1559,11 +1519,11 @@ msgid "Default font" msgstr "DomyÅ›lna czcionka" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "UsuÅ„ zapis" @@ -1572,11 +1532,11 @@ msgstr "UsuÅ„ zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Opis" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Wykryj" @@ -1589,13 +1549,13 @@ msgstr "" "Wykryto próbÄ™ odczytu wiÄ™cej danych z DVD niż mieÅ›ci siÄ™ w buforze " "wyjÅ›ciowym. ZapchaÅ‚o siÄ™." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1619,28 +1579,16 @@ msgstr "" "Suma kontrolna folderu oraz \n" "folderu zapasowego nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "WyÅ‚Ä…cz Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "WyÅ‚Ä…cz tekstury" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1654,7 +1602,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1670,17 +1618,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"WyÅ‚Ä…cza teksturowanie.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Dysk" @@ -1689,11 +1627,11 @@ msgstr "Dysk" msgid "Disc Read Error" msgstr "DÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1707,20 +1645,24 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ustawienia graficzne %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin strona &WWW" @@ -1728,32 +1670,32 @@ msgstr "Dolphin strona &WWW" msgid "Dolphin Configuration" msgstr "Konfiguracja Dolphin'a" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Konfiguracja emulowanego Wiilota" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Konfiguracja Wiilot'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1761,7 +1703,7 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1769,16 +1711,21 @@ msgstr "" "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by " "pokazać wszystkie gry..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Dół" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ÅšciÄ…gnij kody (baza WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Pobrano %lu kodów. (dodano %lu)" @@ -1787,37 +1734,37 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" -msgstr "Zrzut Audio" +msgstr "Zrzut audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" -msgstr "Zrzut ramek" +msgstr "Zrzut klatek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Zrzut tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zrzuca wszystkie renderowane ramki do pliku AVI w User/Dump/Frames/\n" +"Zrzuca wszystkie renderowane klatki do pliku AVI w User/Dump/Frames/\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1827,7 +1774,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1837,41 +1784,41 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holenderski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&WyjÅ›cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"BÅÄ„D: Ta wersja programu wymaga sterownika TAP-Win32 w najnowszej wersji %d. " -"%d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie systemu " -"jest wymagane by sterownik zaczÄ…Å‚ dziaÅ‚ać." +"BÅÄ„D: Ta wersja programu wymaga sterownika TAP-Win32 w wersji przynajmniej " +"%d. %d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie " +"systemu jest wymagane aby sterownik zaczÄ…Å‚ dziaÅ‚ać." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "Europa" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Edycja" @@ -1879,7 +1826,7 @@ msgstr "Edycja" msgid "Edit ActionReplay Code" msgstr "Edytuj kody ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Edytuj konfiguracjÄ™" @@ -1887,12 +1834,12 @@ msgstr "Edytuj konfiguracjÄ™" msgid "Edit Patch" msgstr "Edytuj patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Edytuj..." @@ -1900,15 +1847,15 @@ msgstr "Edytuj..." msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "WÄ…tek emulacji jest już uruchomiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1923,7 +1870,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz wirtualnÄ… emulacjÄ™ XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1939,19 +1886,19 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stan emulacji:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "WÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1967,72 +1914,67 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "WÅ‚Ä…cz BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "WÅ‚Ä…cz Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2046,7 +1988,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2054,11 +1996,11 @@ msgstr "" "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "WÅ‚Ä…cz strony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2070,7 +2012,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2082,7 +2024,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2090,21 +2032,28 @@ msgstr "" "WÅ‚Ä…cz to by przyspieszyć The Legend of Zelda: Twilight Princess. WyÅ‚Ä…cz dla " "KAÅ»DEJ innej gry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2116,7 +2065,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2124,13 +2073,13 @@ msgstr "" "WÅ‚Ä…cza Memory Management Unit, wymagane dla niektórych gier. (ON = " "kompatybilny, OFF = szybko)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Koduj zrzuty ramek używajÄ…c kodeka FFV1.\n" +"Koduj zrzuty klatek używajÄ…c kodeka FFV1.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -2138,14 +2087,14 @@ msgstr "" msgid "End" msgstr "Koniec" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Angielski" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Ulepszenia" @@ -2163,17 +2112,17 @@ msgstr "WejÅ›cie %d/%d" msgid "Entry 1/%d" msgstr "WejÅ›cie 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Równy" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "BÅ‚Ä…d" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2212,36 +2161,32 @@ msgstr "Handler wyjÄ…tku - dostÄ™p poniżej obszaru pamiÄ™ci. %08llx%08llx" msgid "Execute" msgstr "Wykonaj" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "WyjÅ›cie z Dolphina" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Eksportuj plik" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Eksportuj nagranie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2249,15 +2194,15 @@ msgstr "Eksportuj wszystkie zapisy" msgid "Export failed, try again?" msgstr "Eksport nieudany, ponowić?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Eksportuj zapis jako..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2269,52 +2214,52 @@ msgstr "Parametr Dodatkowy" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Wypakowywanie..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Bajt FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Player" @@ -2322,7 +2267,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2330,15 +2275,15 @@ msgstr "Rozmiar FST:" msgid "Failed to Connect!" msgstr "PoÅ‚Ä…czenie nieudane!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "NasÅ‚uchiwanie nieudane!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2374,6 +2319,11 @@ msgstr "Åadowanie bthprops.cpl nie udaÅ‚o siÄ™" msgid "Failed to load hid.dll" msgstr "Åadowanie hid.dll nie udaÅ‚o siÄ™" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "BÅ‚Ä…d odczytu banner.bin" @@ -2456,23 +2406,19 @@ msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" msgid "Failed to write header for file %d" msgstr "BÅ‚Ä…d zapisu nagłówka do pliku %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Farsi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Fast Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2480,23 +2426,23 @@ msgstr "" "Fatal desync. Anulowanie playback'u. (BÅ‚Ä…d w PlayWiimote: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informacja o pliku" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Plik nie zawiera kodów." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Plik skonwertowany do .gci." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2513,7 +2459,7 @@ msgstr "" "Plik posiada rozszerzenie \"%s\"\n" "poprawne rozszerzenia to (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Plik nierozpoznany jako karta pamiÄ™ci" @@ -2526,47 +2472,47 @@ msgstr "Plik nie skompresowany" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "NastÄ™pny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Poprzedni" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "WymuÅ› 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "WymuÅ› filtrowanie tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2524,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚aczone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2536,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2612,56 +2558,56 @@ msgstr "" msgid "Forward" msgstr "W przód" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Znaleziono %d dla '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" -msgstr "Ramka" +msgstr "Klatka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " -msgstr "Ramka" +msgstr "Klatka" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" -msgstr "Zrzuty ramek używajÄ… FFV1" +msgstr "Zrzuty klatek używajÄ… FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Frame Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" -msgstr "ZasiÄ™g ramki" +msgstr "ZasiÄ™g klatki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" -msgstr "Limit ramek:" +msgstr "Limit klatek:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" -msgstr "Ramki do nagrania" +msgstr "Klatki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Free Look" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francuski" @@ -2669,20 +2615,20 @@ msgstr "Francuski" msgid "Frets" msgstr "Gryfy" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "FullScr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Rozdzielczość peÅ‚noekranowa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Plik GCI(*.gci)" @@ -2690,57 +2636,61 @@ msgstr "Plik GCI(*.gci)" msgid "GCMic Configuration" msgstr "Konfiguracja GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID gry:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Gra jest już uruchomiona!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Gra nie jest uruchomiona!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kody Gecko" @@ -2757,41 +2707,41 @@ msgstr "" "obsÅ‚ugi kodu poprzez wklejenie pliku codehandler.bin w folderze Sys oraz " "zrestartowaniiu programu)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Główne" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ustawienia ogólne" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Niemiecki" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeks jest wiÄ™kszy niż rozmiar listy kodów AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "WiÄ™kszy niż" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2809,7 +2759,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grecki" @@ -2829,11 +2779,11 @@ msgstr "Zielony prawo" msgid "Guitar" msgstr "Gitara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wywoÅ‚any, raportuj!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacki" @@ -2841,11 +2791,11 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebrajski" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Wysokość" @@ -2853,7 +2803,7 @@ msgstr "Wysokość" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2868,15 +2818,15 @@ msgstr "" "\n" "Pozdro i poćwicz!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Ukryj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Ukryj kursor myszy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2890,8 +2840,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2899,27 +2849,27 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "WÄ™gierski" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Próba otrzymania danych z nieznanego ticket'u: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2932,31 +2882,31 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba siÄ™ zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Ustawienia IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Wskaźnik IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "CzuÅ‚ość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Foldery ISO" @@ -2964,11 +2914,11 @@ msgstr "Foldery ISO" msgid "ITALY" msgstr "WÅ‚ochy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2976,28 +2926,28 @@ msgstr "" "JeÅ›li wÅ‚Ä…czone, bounding box registers zostanÄ… zaktualizowane. " "Wykorzystywane przez gry Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -"JeÅ›li ustawisz limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), " -"ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale może " -"spowodować trwaÅ‚y szum zależnie od gry)." +"JeÅ›li ustawisz limitu klatek wiÄ™kszego niż peÅ‚na szybkość gry (NTSC:60, " +"PAL:50), ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale " +"może spowodować trwaÅ‚y szum zależnie od gry)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignoruj zmiany formatu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3011,7 +2961,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3025,7 +2975,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importuj zapis" @@ -3033,7 +2983,7 @@ msgstr "Importuj zapis" msgid "Import failed, try again?" msgstr "Importowanie nie powiodÅ‚o siÄ™, próbować ponownie?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3041,11 +2991,11 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie gsc\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Zaimportowany plik jest niewÅ‚Ä…Å›ciwej wielkoÅ›ci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3053,7 +3003,7 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie sav\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3065,26 +3015,16 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3092,7 +3032,7 @@ msgstr "Info" msgid "Information" msgstr "Informacja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "WejÅ›cie" @@ -3104,7 +3044,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3112,11 +3052,11 @@ msgstr "Włóż kartÄ™ SD" msgid "Insert name here.." msgstr "Wprowadź nazwÄ™ tutaj..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3126,23 +3066,23 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "BÅ‚Ä…d sprawdzania integralnoÅ›ci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone. Nie znaleziono bÅ‚Ä™dów." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3151,19 +3091,19 @@ msgstr "" "Sprawdzenie integralnoÅ›ci dla partycji %d nie powiodÅ‚o siÄ™. Twój zrzut jest " "prawdopodobnie uszkodzony lub zostaÅ‚ źle spatchowany." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Ustawienia interfejsu" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - kompresja nie powiodÅ‚a siÄ™" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3172,19 +3112,19 @@ msgstr "" "WewnÄ™trzny bÅ‚Ä…d LZO - dekompresja nie powiodÅ‚a siÄ™ (%d) (%li, %li) \n" "Wczytaj stan ponownie" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3193,11 +3133,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "NiewÅ‚aÅ›ciwy rozmiar (%x) lub Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "NiewÅ‚aÅ›ciwa wartość!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" @@ -3206,7 +3146,7 @@ msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" msgid "Invalid event type %i" msgstr "NiewÅ‚aÅ›ciwy typ zdarzenia %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "NiewÅ‚aÅ›ciwy plik" @@ -3221,31 +3161,31 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "NiewÅ‚aÅ›ciwy parametr przeszukiwania (nie wybrano obiektu)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (nie udaÅ‚o siÄ™ zamienić na liczbÄ™)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (wspierane sÄ… tylko równe dÅ‚ugoÅ›ci " "Å‚aÅ„cucha)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "WÅ‚oski" @@ -3253,16 +3193,16 @@ msgstr "WÅ‚oski" msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "JapoÅ„ski" @@ -3270,7 +3210,7 @@ msgstr "JapoÅ„ski" msgid "KOREA" msgstr "Korea" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3280,17 +3220,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÄ…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Okno na wierzchu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "KoreaÅ„ski" @@ -3308,19 +3248,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "JÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Ostatni nadpisany stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Ostatni zapisany stan" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3330,8 +3274,8 @@ msgstr "Lewo" msgid "Left Stick" msgstr "GaÅ‚ka lewa" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3339,7 +3283,7 @@ msgstr "" "LPM by wykryc skróty klawiszowe.\n" "WciÅ›nij spacjÄ™ by wyczyÅ›cic." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3349,7 +3293,7 @@ msgstr "" "ÅšPM by wyczyÅ›cic.\n" "PPM wiÄ™cej opcji." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3357,76 +3301,76 @@ msgstr "" "LPM/PPM wiÄ™cej opcji.\n" "ÅšPM by wyczyÅ›cić." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limit FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Wczytaj stan Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Wczytaj stan Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Wczytaj stan Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Wczytaj stan Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Wczytaj stan Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Wczytaj stan Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Wczytaj stan Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Wczytaj stan Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3440,36 +3384,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Åaduje wartoÅ›ci wczeÅ›niej ustawione z dostÄ™pnych hack patterns" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Przypisz wÄ…tki do rdzeni" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Konfiguracja Logu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "Zapisz FPS do pliku" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Typy logów" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Zapisz liczbÄ™ renderowanych klatek na sekundÄ™ do User/Logs/fps.txt. Użyj tej " +"opcji jeÅ›li chcesz zmierzyć wydajność programu.\n" +"\n" +"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger Outputs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3477,10 +3429,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "PoÅ‚Ä…czenie z serwerem przerwane!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Llow level (LLE) lub high level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3494,12 +3442,12 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" @@ -3508,33 +3456,33 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gaÅ‚ka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Twórca:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Karta pamiÄ™ci już posiada zapis dla tego tytuÅ‚u" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Karta pamiÄ™ci już otwarta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3546,7 +3494,7 @@ msgstr "" "Memory Card Manager OSTRZEÅ»ENIE - Twórz kopie zapasowe przed użyciem, " "powinno zostać naprawione, ale może namieszać!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3571,20 +3519,20 @@ msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3593,7 +3541,7 @@ msgstr "Ustawienia różne" msgid "Modifier" msgstr "Zmiennik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3609,16 +3557,16 @@ msgstr "" msgid "Monospaced font" msgstr "Nieproporcjonalna czcionka" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3640,7 +3588,7 @@ msgstr "" msgid "Multiply" msgstr "Pomnóż" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3648,11 +3596,11 @@ msgstr "" " Wycisza gÅ‚oÅ›nik Wiilota. Naprawia losowe rozÅ‚Ä…czenia z prawdziwymi " "Wiilotami. Brak efektu na emulowanych Wiilotach." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "Notka: Wielkość strumienia nie zgadza siÄ™ z wÅ‚aÅ›ciwÄ… dÅ‚ugoÅ›ciÄ… danych\n" @@ -3741,38 +3689,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nazwa:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nazwa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Natywne pliki GCI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "NastÄ™pna strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "NastÄ™pne skanowanie" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ksywa:" @@ -3780,7 +3728,7 @@ msgstr "Ksywa:" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nie odnaleziono IOS/WAD" @@ -3789,8 +3737,8 @@ msgstr "Nie odnaleziono IOS/WAD" msgid "No banner file found for title %s" msgstr "Nie odnaleziono pliku banera dla tytuÅ‚u %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Brak opisu" @@ -3798,15 +3746,15 @@ msgstr "Brak opisu" msgid "No docking" msgstr "Brak dokowania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nie wczytano żadnego pliku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Brak wolnych wejść folderów" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Brak nagranego pliku" @@ -3815,33 +3763,33 @@ msgstr "Brak nagranego pliku" msgid "No save folder found for title %s" msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norweski" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notatki" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notatki:" @@ -3850,7 +3798,7 @@ msgstr "Notatki:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Uwagi" @@ -3858,28 +3806,28 @@ msgstr "Uwagi" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Liczba kodów:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Acelerator Nunchak'a" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "ZasiÄ™g objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "WyÅ‚Ä…czone" @@ -3887,60 +3835,56 @@ msgstr "WyÅ‚Ä…czone" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "On-Screen Display Messages" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "DostÄ™pnych tylko %d bloków" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otwórz plik..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: nie można utworzyć kontekstu dla urzÄ…dzenia %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nie można odnaleźć urzÄ…dzeÅ„ dźwiÄ™kowych" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: nie można otworzyć urzÄ…dzenia %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Otwiera debugera" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Otwiera logera" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcje" @@ -3949,7 +3893,7 @@ msgstr "Opcje" msgid "Orange" msgstr "PomaraÅ„czowy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3959,8 +3903,8 @@ msgstr "" "PPM i wyeksportuj wszystkie zapisy,\n" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "PozostaÅ‚e" @@ -3972,19 +3916,19 @@ msgstr "" "Inny klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " "rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "WyjÅ›cie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Od&twórz nagranie" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -4000,7 +3944,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Parowanie" @@ -4012,30 +3956,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Paramerty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Åšcieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Zatrzymaj na koncu filmu" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekcyjny" @@ -4044,36 +3992,36 @@ msgstr "Perfekcyjny" msgid "Perspective %d" msgstr "Perspekrtywa %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Play" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Odtwórz nagranie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Grywalny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opcje playback'u" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Potwierdź..." @@ -4085,54 +4033,54 @@ msgstr "ProszÄ™ utworzyć perspektywÄ™ przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Premature movie end in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Premature movie end in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Premature movie end in PlayWiimote. %u > %u" @@ -4145,11 +4093,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Poprzednia wartość" @@ -4157,7 +4105,7 @@ msgstr "Poprzednia wartość" msgid "Print" msgstr "Drukuj" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4165,7 +4113,7 @@ msgstr "Profil" msgid "Properties" msgstr "WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Purge Cache" @@ -4173,8 +4121,8 @@ msgstr "Purge Cache" msgid "Question" msgstr "Pytanie" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Zamknij" @@ -4192,7 +4140,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4200,46 +4148,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Rosja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "ZasiÄ™g" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Prawdziwy" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Prawdziwy Wiilot" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Prawdziwe Wiiloty" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Potwierdzenie ponownego poÅ‚Ä…czenia Wiilota" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "PodÅ‚acz ponownie Wiilota gdy wczytywany jest stan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Nagranie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informacje nagrywania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opcje nagrywania" @@ -4255,7 +4203,7 @@ msgstr "Czerwony lewo" msgid "Red Right" msgstr "Czerwony prawo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4269,29 +4217,29 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Å»adne." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "OdÅ›wież" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4301,17 +4249,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Generuj w oknie głównym" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Wynik" @@ -4328,7 +4276,7 @@ msgstr "Prawo" msgid "Right Stick" msgstr "GaÅ‚ka prawa" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Wibracje" @@ -4337,116 +4285,112 @@ msgstr "Wibracje" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wÄ…tku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rosyjski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Bezpieczny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Wskaźnik próbkowania:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Zapisz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Zapisz GCI jako..." +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "Slot stanu 1" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "Slot stanu 2" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "Slot stanu 3" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "Slot stanu 4" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" -msgstr "Zapisz stan Slot 1" +msgid "Save State Slot 5" +msgstr "Slot stanu 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" -msgstr "Zapisz stan Slot 2" +msgid "Save State Slot 6" +msgstr "Slot stanu 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" -msgstr "Zapisz stan Slot 3" +msgid "Save State Slot 7" +msgstr "Slot stanu 8" #: 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" +msgstr "Slot stanu 9" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." -msgstr "PrzeszukujÄ™" +msgstr "PrzeszukujÄ™..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4454,23 +4398,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Przeszukaj bieżący obiekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Szukaj wartoÅ›ci hex:" @@ -4481,20 +4425,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Nie odnaleziono sekcji %s w SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4512,23 +4456,23 @@ msgstr "Wybierz plik zapisu do importowania" msgid "Select floating windows" msgstr "Select floating windows" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4546,11 +4490,16 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Auto." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Wskazany plik \"%s\" nie istnieje." + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Wybrana czcionka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4566,7 +4515,7 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, użyj rozdzielczoÅ›ci komputera.\n" "JeÅ›li nadal masz wÄ…tpliwoÅ›ci, użyj najwyższej dziaÅ‚ajÄ…cej rozdzielczoÅ›ci." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4581,11 +4530,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, użyj Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "WyÅ›lij" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Pozycja Sensor Bar'a" @@ -4593,46 +4542,52 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Indeks jest wiÄ™kszy niz rozmiar listy kodu AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ustawienia..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "WstrzÄ…s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4640,105 +4595,105 @@ msgstr "Krótka nazwa:" msgid "Shoulder Buttons" msgstr "Przyciski tylnie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Pokaż &konsolÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Pokaż &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Pokaż pasek &stanu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Pokaż pasek &narzÄ™dzi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Pokaż FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Pokaż FrancjÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Pokaż Input Display" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Pokaż WÅ‚ochy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Pokaż JaponiÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Pokaż KoreÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Pokaż &konfiguracjÄ™ logu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Pokaż PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Pokaż platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Pokaż statystyki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Pokaż Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Pokaż USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Pokaż WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4746,46 +4701,56 @@ msgstr "" "WyÅ‚Ä…czenie tego pozwoli uniknąć denerwujÄ…cych i maÅ‚o ważnych wiadomoÅ›ci, ale " "może spowodować zamkniÄ™cie programu bez żadnego ostrzeżenia." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Pokaż licznik opóźnienia" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"WyÅ›wietla wiadomoÅ›ci na ekrnie emulacji.\n" +"WiadomoÅ›ci zawierajÄ… informacje o zapisach do karty pamiÄ™ci, video backend, " +"informacje o procesorze oraz oczyszczaniu cache'u JIT." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Pokaż ikonÄ™ zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Pokaż liczbÄ™ renderowanych ramek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" +"Pokaż liczbÄ™ renderowanych klatek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Pokaż wiadomość pomocy" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Pokaż niewiadome" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4795,31 +4760,35 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "PomiÅ„ EFB Access z CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4831,7 +4800,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4847,17 +4816,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4865,7 +4834,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderer Programowy" @@ -4881,11 +4850,11 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "NiewÅ‚aÅ›ciwy sound beckend %s." @@ -4899,17 +4868,17 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "HiszpaÅ„ski" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Poziom gÅ‚oÅ›nika:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4929,11 +4898,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Wybierz video backend" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -4941,51 +4906,55 @@ msgstr "Przyspiesz Disc Transfer Rate" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" -msgstr "Standard Controller" +msgstr "Standardowy kontroler" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stan" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Stany zapisu" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "GaÅ‚ka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4999,7 +4968,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "RozciÄ…gnij do okna" @@ -5020,12 +4989,12 @@ msgstr "Sukcesywnie wyeksportowano plik do %s" msgid "Successfully imported save files" msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "JÄ™zyk systemu:" @@ -5033,7 +5002,7 @@ msgstr "JÄ™zyk systemu:" msgid "TAIWAN" msgstr "Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "WejÅ›cie TAS" @@ -5054,30 +5023,30 @@ msgstr "Talerz lewo" msgid "Table Right" msgstr "Talerz prawo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Tekstura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5093,13 +5062,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5122,7 +5091,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybraÅ‚eÅ› (%s) nie istnieje" @@ -5139,7 +5108,7 @@ msgstr "Nazwa nie może zawierać znaku ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5151,11 +5120,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz wartość na koÅ„cu po prawej." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Zapis, który chcesz skopiować posiada niewÅ‚aÅ›ciwÄ… wielkość pliku." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5187,15 +5156,12 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Styl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Wybór stylu nieudany" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5203,7 +5169,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5211,7 +5177,7 @@ msgstr "" "Te ustawienia przewyższaja źródÅ‚owe ustawienia programu.\n" "NieokreÅ›lone ustawienia odczytywane sÄ… ze źródÅ‚owych." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5219,14 +5185,16 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5241,7 +5209,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5252,7 +5220,7 @@ msgstr "" "Znacznie zwiÄ™ksza wydajność na komputerach z wiÄ™cej niż jednym rdzeniem, ale " "powoduje także okazjonalne bÅ‚edy." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Pozwala na rÄ™cznÄ… edycjÄ™ pliku konfiguracyjnego." @@ -5261,40 +5229,40 @@ msgstr "Pozwala na rÄ™cznÄ… edycjÄ™ pliku konfiguracyjnego." msgid "Threshold" msgstr "Threshold" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Przechylenie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "TytuÅ‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -5314,7 +5282,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turecki" @@ -5326,12 +5294,12 @@ msgstr "DJ Gramofon" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiilot" @@ -5339,7 +5307,7 @@ msgstr "UDP Wiilot" msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "Nieznany_%X" @@ -5367,24 +5335,24 @@ msgstr "" "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" "Czy chcesz pominąć liniÄ™ i kontynuować analizÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Niezdefiniowane %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Cofnij wczytywanie stanu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Nieoczekiwane wywoÅ‚anie 0x80? Przerywanie..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Nieznany" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Nieznane polecenie DVD %08x - poważny bÅ‚Ä…d" @@ -5409,32 +5377,32 @@ msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" msgid "Up" msgstr "Góra" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aktualizuj" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Użyj trybu peÅ‚noekranowego" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5446,7 +5414,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5461,15 +5429,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "NarzÄ™dzie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Wartość" @@ -5477,23 +5445,23 @@ msgstr "Wartość" msgid "Value:" msgstr "Wartość:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Wartość:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Poziom" @@ -5507,7 +5475,7 @@ msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia biletu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5520,16 +5488,16 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie DOL w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w zÅ‚ym trybie konsoli!" @@ -5548,7 +5516,7 @@ msgstr "" "%s\n" "Kontynuować?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5561,7 +5529,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5572,7 +5540,7 @@ msgstr "" "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed " "kontynuacjÄ… lub wczytaj ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5584,7 +5552,7 @@ msgstr "" "ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu. W przeciwnym razie może " "nastÄ…pić desynchronizacja." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5618,7 +5586,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - plik nie jest otwarty." @@ -5626,31 +5594,31 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Widescreen Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5658,17 +5626,17 @@ msgstr "Pliki zapisu Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: nie moża odczytać z pliku" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiilot" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiilot %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5681,19 +5649,19 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiilot Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiiloty" @@ -5713,26 +5681,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "PracujÄ™..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Zapisz do konsoli" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Zapisz do Debugger'a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Zapisz do pliku" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Wpisz do okna" @@ -5751,7 +5719,7 @@ msgstr "Inicjalizacja XAudio2 nie powiodÅ‚a siÄ™: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Utworzenie XAudio2 master voice nie powiodÅ‚o siÄ™: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5771,24 +5739,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nie możesz zamknąć paneli jeÅ›li sÄ… w nich strony." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Wybierz grÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Musisz wprowadzić nazwÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musisz wprowadzić poprawnÄ… wartość dziesiÄ™tnÄ…, szestnastkowÄ… lub ósemkowÄ…." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5811,25 +5779,25 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Kod 3 zero niewspierany" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Kod zero nieznany dla programu: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ czekam ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5845,7 +5813,7 @@ msgstr "" msgid "[Custom]" msgstr "[WÅ‚asne]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5864,7 +5832,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5878,11 +5846,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5899,7 +5867,7 @@ msgstr "Odczyt z pliku %s nie powiódÅ‚ siÄ™" msgid "failed to read header" msgstr "Odczyt nagłówka nie powiódÅ‚ siÄ™" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." @@ -5909,7 +5877,7 @@ msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." msgid "not a wii save or read failure for file header size %x" msgstr "to nie jest zapis Wii lub bÅ‚Ä…d odczytu rozmiaru nagłówka pliku %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5918,7 +5886,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -5930,13 +5898,16 @@ msgstr "zFar Correction: " msgid "zNear Correction: " msgstr "zNear Correction: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Frame Stepping" @@ -5999,12 +5970,37 @@ 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" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Oblicza wartoÅ›ci gÅ‚Ä™bokoÅ›ci grafiki 3D na pixel zamiast na wierzchoÅ‚ek.\n" +#~ "W kontraÅ›cie do pixel lighting (które ledwo jest ulepszeniem), obliczenia " +#~ "gÅ‚Ä™bokoÅ›ci na pixel sÄ… niezbÄ™dne do wÅ‚aÅ›ciwej emulacji niektórych gier.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6058,6 +6054,23 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Nie można odczytać informacji o pluginie %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Utworzone przez KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl." +#~ "deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Utworzone przez VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Utworzone przez black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6067,9 +6080,27 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "DuÅ„ski" +#~ msgid "Disable Lighting" +#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "WyÅ‚Ä…cz Per-Pixel Depth" + +#~ msgid "Disable Textures" +#~ msgstr "WyÅ‚Ä…cz tekstury" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "WyÅ‚Ä…cza teksturowanie.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6133,6 +6164,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "WÅ‚Ä…cz Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "WÅ‚Ä…cz BAT" + #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" @@ -6157,6 +6191,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "WÅ‚Ä…cz wygaszacz ekranu (burn-in reduction)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "WÅ‚Ä…cza Block Address Translation (BAT); funkcja Memory Management Unit. " +#~ "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " +#~ "szybko)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6210,9 +6253,15 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "BÅ‚Ä…d otwarcia pliku %s do nagrania." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "WyjÅ›cie z Dolphina" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nieudane Å‚adowanie romu DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6260,6 +6309,15 @@ msgstr "| OR" #~ "JeÅ›li gra siÄ™ zawiesza, dziaÅ‚a tylko w Interpreter lub Dolphin siÄ™ " #~ "zawiesza, ta opcja może naprawić dziaÅ‚anie gry." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "Input Source" #~ msgstr "ŹródÅ‚o wejÅ›cia" @@ -6301,6 +6359,15 @@ msgstr "| OR" #~ "Wczytywanie natywnych mipmap jest bardziej dokÅ‚adnym zachowaniem, ale " #~ "może obniżyć wydajność." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Przypisz wÄ…tki do rdzeni" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Llow level (LLE) lub high level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Konsola skryptów Lua" @@ -6335,6 +6402,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Otwiera debugera" + +#~ msgid "Opens the logger" +#~ msgstr "Otwiera logera" + #~ msgid "Plugins" #~ msgstr "Wtyczki" @@ -6371,6 +6444,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "WykonujÄ™ skrypt...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Wskaźnik próbkowania:" + #~ msgid "Scale:" #~ msgstr "Skala:" @@ -6414,6 +6490,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Pokazuje iloÅ›c generowanych ramek na sekundÄ™." +#~ msgid "Show this help message" +#~ msgstr "Pokaż wiadomość pomocy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6453,6 +6532,9 @@ msgstr "| OR" #~ "PozostaÅ‚e opcje to ustawione rozdzielczoÅ›cie niezależne od wielkoÅ›ci " #~ "ekranu." +#~ msgid "Specify a video backend" +#~ msgstr "Wybierz video backend" + #~ msgid "Specify an audio plugin" #~ msgstr "Wybierz wtyczkÄ™ audio" @@ -6465,6 +6547,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" +#~ msgid "Theme selection went wrong" +#~ msgstr "Wybór stylu nieudany" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index a14b91f916..1db99bd424 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-07-23 15:53-0000\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" "Language: Portuguese\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Jogo: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NÃO" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Não conectado" @@ -151,156 +144,156 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Arrancar através da unidade de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Pontos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procurar ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Gestor de Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Ficheiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Definições Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Definições de Teclas de Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Gestor de Cartão de Memória(GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo só de leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -316,27 +309,27 @@ msgstr "(-)+zPerto" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -344,46 +337,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Uma janela NetPlay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Nenhum jogo actualmente a correr." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nenhum dispositivo bluetooth suportado foi encontrado!\n" "(Apenas o Microsoft bluetooth stack é suportado.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -432,19 +427,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Sobre o Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acção" @@ -479,7 +474,7 @@ msgstr "" "Culprit Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +482,7 @@ msgstr "" "Erro Action Replay: Tamanho Inválido (%08x : address = %08x) em Adição de " "Código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +491,7 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em " "Preenchimento e Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +500,7 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita e " "Preenchimento Ram (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,15 +509,16 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita para " "Ponteiro (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro Action Replay: Valor inválido (%08x) em cópia de memória (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Erro Action Replay: Códgo Mestre e Escrita para CCXXXXXX não implementado " "(%s)" @@ -532,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro Action Replay: linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay:Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de código normal inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código normal %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo Inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -561,11 +557,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Adicionar Patch" @@ -573,13 +569,13 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Adicionar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Localização :" @@ -619,54 +615,55 @@ msgstr "" "\n" "NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajustar a pressão de controlo analógico necessária para activar os botões." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Definições avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -675,20 +672,24 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotrópico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Serrilhamento" @@ -700,15 +701,15 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,16 +719,16 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -750,12 +751,12 @@ msgstr "Proporção de ecrã:" msgid "At least one pane must remain open." msgstr "Pelo menos um painel deve manter-se aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Ãudio Backend :" @@ -763,24 +764,24 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Automático (Multiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Dimensão da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajuste Automático da Dimensão da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,24 +791,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticamente gera mipmaps em vez de descodifica-los através da memória.\n" -"Aumenta ligeiramente o desempenho mas poderá causar defeitos mínimos nas " -"texturas.\n" -"\n" -"Em caso de dúvida, mantenha esta opção activada." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registos" @@ -816,16 +804,16 @@ msgstr "&Registos" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Definições Backend" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Introdução em segundo plano" @@ -838,16 +826,16 @@ msgstr "Retroceder" msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -855,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Definições Básicas" @@ -871,7 +859,7 @@ msgstr "Baixo" msgid "Block Allocation Table checksum failed" msgstr "Verificação da Tabela de Atribuição de Blocos falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocos" @@ -887,47 +875,53 @@ msgstr "Azul esquerda" msgid "Blue Right" msgstr "Azul Direita" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Inferior" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Inactivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -939,36 +933,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula valores de profundidade dos gráficos 3D por pixel em vez de por " -"vértice.\n" -"Em contraste com a iluminação por pixel (que é meramente uma melhoria), " -"calculos de profundidade por pixel são necessários para emular correctamente " -"um pequeno número de jogos.\n" -"\n" -"Em caso de dúvida, mantenha esta opção activada." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -984,7 +961,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -1000,7 +977,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1010,7 +987,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1018,19 +995,19 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Não foi possível encontrar WiiMote por esta conexão %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fatal" @@ -1038,28 +1015,28 @@ msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fata msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalão" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Mudar &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Mudar Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Mudar de Jogo" @@ -1080,12 +1057,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Alterações não vão surtir efeito enquanto o emulador estiver em execução!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Conversa" @@ -1093,47 +1069,47 @@ msgstr "Conversa" msgid "Cheat Code" msgstr "Código de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Procura de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1141,7 +1117,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1149,8 +1125,8 @@ msgstr "" "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos " "construídos através de pastas)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1164,8 +1140,8 @@ msgstr "Clássico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpar" @@ -1177,22 +1153,22 @@ msgstr "" "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá " "que parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info de Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1200,95 +1176,95 @@ msgstr "Código:" msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "A comprimir ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configuração" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configuração de Controlos" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configuração de Comandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "A conectar..." @@ -1304,16 +1280,16 @@ msgstr "Controlo" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1322,7 +1298,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Não foi possível criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível iniciar o backend %s." @@ -1343,12 +1319,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1357,7 +1333,7 @@ msgstr "" "execução!\n" "(definir os controlos enquanto o jogo está em execução ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1370,11 +1346,11 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1382,17 +1358,17 @@ msgstr "" "Não foi possível iniciar o core.\n" "Verifique a sua configuração." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Criar um código AR" @@ -1401,25 +1377,7 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Criado por VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Criador:" @@ -1427,11 +1385,11 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Recortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1445,12 +1403,12 @@ msgstr "" msgid "Crossfade" msgstr "Desvanecimento cruzado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1458,15 +1416,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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1474,36 +1432,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1515,16 +1473,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro files(*.sav)" @@ -1536,11 +1494,11 @@ msgstr "Datel MaxDrive/Pro files(*.sav)" msgid "Dead Zone" msgstr "Zona morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Depuração" @@ -1548,24 +1506,24 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "A descomprimir ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1574,11 +1532,11 @@ msgid "Default font" msgstr "Tipo de letra Padrão" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1587,11 +1545,11 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descrição" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1604,13 +1562,13 @@ msgstr "" "Detectada tentativa de leitura excessiva de dados do DVD, mais do que pode " "caber dentro do buffer externo." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1634,28 +1592,16 @@ msgstr "" "Verificação de pasta falhou\n" " e verificação da cópia de segurança de pasta falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Desactivar Luminosidade" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Desactivar Profundidade por Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Desactivar Texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1669,7 +1615,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1685,17 +1631,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar texturas.\n" -"\n" -"Em caso de duvida, mantenha esta opção desactivada." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1704,11 +1640,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro de leitura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1722,20 +1658,24 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Configurações Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1743,32 +1683,32 @@ msgstr "Dolphin &Web Site" msgid "Dolphin Configuration" msgstr "Configurações Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração da emulação de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuração Dolphin do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1776,7 +1716,7 @@ msgstr "" "O Dolphin não conseguiu encontrar ISOs de GC/Wii. Duplo clique aqui para " "procurar ficheiros..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1784,16 +1724,21 @@ msgstr "" "Dolphin está actualmente definido para esconder todos os jogos. Duplo " "clique aqui para mostrar todos os jogos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Base de dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregados %lu códigos. (adicionados %lu)" @@ -1802,27 +1747,27 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Depositar Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1833,7 +1778,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1843,7 +1788,7 @@ msgstr "" "\n" "Em caso de dúvida. mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1853,24 +1798,24 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "S&air" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Cópias EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1884,11 +1829,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualizações de Memória Inicial" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1896,7 +1841,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1904,12 +1849,12 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1917,15 +1862,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Thread de Emulador já em execução" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1939,7 +1884,7 @@ msgstr "" "\n" "Em caso de dúvida, active a opção emulação virtual XFB como alternativa." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1955,19 +1900,19 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado da Emulação:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1983,72 +1928,67 @@ msgstr "" "Necessita de ecrã inteiro para funcionar.\n" "Em caso de dúvida mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Activar BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Activar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2062,7 +2002,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2070,11 +2010,11 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activar Páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2087,7 +2027,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2099,7 +2039,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,21 +2047,28 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Permite a Localização de Bloco Traduzida (LBT); uma função da Unidade de " -"Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " -"Compatível, OFF = Rápida)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2133,7 +2080,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2141,7 +2088,7 @@ msgstr "" "Activa a Unidade de Gestão de Memória, necessária em alguns jogos. (ON = " "Compatível, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2155,14 +2102,14 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Melhorias" @@ -2180,17 +2127,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " @@ -2230,36 +2177,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sair do Dolphin com emulador" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar Ficheiro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2267,15 +2210,15 @@ msgstr "Exportar todos os jogos guardados" msgid "Export failed, try again?" msgstr "Exportação falhou, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar guardar como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2287,52 +2230,52 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra apenas útil em \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "A Extrair..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Reprodutor FIFO" @@ -2340,7 +2283,7 @@ msgstr "Reprodutor FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2348,15 +2291,15 @@ msgstr "Tamanho FST:" msgid "Failed to Connect!" msgstr "A Conexão Falhou!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "A Escuta Falhou!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2393,6 +2336,11 @@ msgstr "Falha ao carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Falha ao carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Falha ao escrever cabeçalho para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" @@ -2476,45 +2424,41 @@ msgstr "Falha ao escrever cabeçalho para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever cabeçalho para o ficheiro %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rápidos" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Reprodutor Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informação de Ficheiro" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "O ficheiro não continha códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Ficheiro convertido para .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2531,7 +2475,7 @@ msgstr "" "O ficheiro tem a extensão \"%s\"\n" "as extensões válidas são (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória" @@ -2544,47 +2488,47 @@ msgstr "Ficheiro não comprimido" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2597,7 +2541,7 @@ msgstr "" "jogos.\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2609,7 +2553,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:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2631,57 +2575,57 @@ msgstr "" msgid "Forward" msgstr "Frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Quadro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Alcance de Quadros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limite de Quadros:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vista Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francês" @@ -2689,20 +2633,20 @@ msgstr "Francês" msgid "Frets" msgstr "Trastes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolução em ecrã Inteiro:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Ficheiro GCI(*.gci)" @@ -2711,57 +2655,61 @@ msgstr "Ficheiro GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID do Jogo:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "O jogo já está a correr!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "O jogo não está a correr!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2776,41 +2724,41 @@ msgstr "" "GeckoCode falhou ao executar (CT%i CST%i) (%s)\n" "(Ou é um código com erros ou o tipo de código não é suportado.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Geral" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Definições Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemão" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index é maior que o tamanho da lista de código %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Definições Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maior Que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2827,7 +2775,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grego" @@ -2847,11 +2795,11 @@ msgstr "Verde Direita" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2859,11 +2807,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebraico" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2871,7 +2819,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2887,15 +2835,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder o cursor do rato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2909,8 +2857,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2918,28 +2866,28 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentativa de obter dados de um ticket desconhecido: %08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2952,31 +2900,31 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin irá provavelmente bloquear agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Definições IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IV" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Ponteiro Infra Vermelho" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Pastas ISO" @@ -2984,24 +2932,24 @@ msgstr "Pastas ISO" msgid "ITALY" msgstr "Itália" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ãcone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3012,11 +2960,11 @@ msgstr "" "(NTSC:60, PAL:50), também terá que desactivar o Regulador Ãudio em DSP para " "torna-lo eficaz." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3030,7 +2978,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3044,7 +2992,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3052,7 +3000,7 @@ msgstr "Importar Jogo Guardado" msgid "Import failed, try again?" msgstr "Importação falhou, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3060,11 +3008,11 @@ msgstr "" "O ficheiro importado tem a extensão gsc\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "O ficheiro importado tem um tamanho inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3072,7 +3020,7 @@ msgstr "" "O ficheiro importado tem a extensão sav\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3084,27 +3032,16 @@ msgstr "" "\n" "Em caso de dúvida, manteha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Melhora a performance mas provoca que a iluminação desapareca na maioria " -"dos jogos.\n" -"\n" -"Em caso de dúvida, mantenha esta opção desactivada" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Em Jogo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Em-Jogo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Informação" @@ -3112,7 +3049,7 @@ msgstr "Informação" msgid "Information" msgstr "Informação" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3124,7 +3061,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3132,11 +3069,11 @@ msgstr "Inserir Cartão SD" msgid "Insert name here.." msgstr "Introduza o nome aqui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3146,42 +3083,42 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Definições de interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erro interno de LZO - compressão falhou" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3190,19 +3127,19 @@ msgstr "" "Erro interno de LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente carregar o estado novamente" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro interno de LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3211,11 +3148,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra mágica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor inválido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" @@ -3224,7 +3161,7 @@ msgstr "bat.map inválido ou entrada de pasta" msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ficheiro inválido" @@ -3239,29 +3176,29 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3269,16 +3206,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonês" @@ -3286,7 +3223,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "COREIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3297,17 +3234,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3325,19 +3262,23 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último estado Substituído" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último Estado Guardado" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3347,8 +3288,8 @@ msgstr "Esquerda" msgid "Left Stick" msgstr "Stick Esquerdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3356,7 +3297,7 @@ msgstr "" "Clique esquerdo para detectar teclas de atalho. \n" "Prima barra de espaço para limpar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3366,7 +3307,7 @@ msgstr "" "Clique botão do meio para limpar.\n" "Clique botão direito para mais opções." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3374,76 +3315,76 @@ msgstr "" "Clique Esquerdo/Direito para mais opções.\n" "Botão do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar por FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar Estado Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar Estado Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar Estado Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar Estado Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar Estado Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar Estado Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar Estado Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3457,36 +3398,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar Valores de origem para padrões de hack disponíveis." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Bloqueia as threads aos núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipos de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostra o número de quadros renderizados por segundo como medição da " +"velocidade de emulação.\n" +"\n" +"Em caso de dúvida, mantenha esta opção desactivada." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Relatório em execução" @@ -3494,10 +3444,6 @@ msgstr "Relatório em execução" msgid "Lost connection to server!" msgstr "A ligação ao servidor perdeu-se!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Ãudio em baixo nível (LLE) ou alto nível (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botão M" @@ -3511,12 +3457,12 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" @@ -3525,33 +3471,33 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "O cartão de memória já tem um jogo guardado para este título" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "O cartão de memória já abriu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Cartão de memória" @@ -3563,7 +3509,7 @@ msgstr "" "Gestor de Cartões de memória AVISO-Faça cópias de segurança antes de " "utilizar, deve estar corrigido mas também pode danificar!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3588,20 +3534,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3610,7 +3556,7 @@ msgstr "Configurações Diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3626,16 +3572,16 @@ msgstr "" msgid "Monospaced font" msgstr "Tipo de letra monoespaçada" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3658,7 +3604,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3666,11 +3612,11 @@ msgstr "" "Silencía o altifalante Wiimote. Corrige desconexões aleatórias em wiimotes " "reais. Sem efeito em wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3758,38 +3704,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Ficheiros GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próxima Procura" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Alcunha :" @@ -3797,7 +3743,7 @@ msgstr "Alcunha :" msgid "No Country (SDK)" msgstr "Sem País (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nenhum ISO ou WAD encontrado" @@ -3806,8 +3752,8 @@ msgstr "Nenhum ISO ou WAD encontrado" msgid "No banner file found for title %s" msgstr "Nenhum ficheiro banner foi encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3815,15 +3761,15 @@ msgstr "" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nenhum ficheiro carregado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Sem entradas de índice para pastas livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nenhum ficheiro de gravação" @@ -3832,33 +3778,33 @@ msgstr "Nenhum ficheiro de gravação" msgid "No save folder found for title %s" msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3867,7 +3813,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Noticia" @@ -3875,28 +3821,28 @@ msgstr "Noticia" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Número De Códigos" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleração Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objecto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Desligado" @@ -3904,60 +3850,56 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir ficheiro..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: não foram encontrados dispositivos de som" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abre o depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abre o gerador de relatórios" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3966,7 +3908,7 @@ msgstr "Opções" msgid "Orange" msgstr "Laranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3976,8 +3918,8 @@ msgstr "" "Botão direito e exporte todos os jogos guardados,\n" "e importe os jogos guardados para um novo cartão de memória\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Outro" @@ -3989,19 +3931,19 @@ msgstr "" "O outro cliente desligou enquanto o jogo corria!! Netplay está desactivado. " "Manualmente parou o jogo." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Destino" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "R&eproduzir Gravação..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Comando" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Comando" @@ -4017,7 +3959,7 @@ msgstr "Página Abaixo" msgid "Page Up" msgstr "Página Acima" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Emparelhar" @@ -4029,30 +3971,34 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfeito" @@ -4061,36 +4007,36 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Começar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Tocar Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4102,54 +4048,54 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4162,11 +4108,11 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4174,7 +4120,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4182,7 +4128,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpar Cache" @@ -4190,8 +4136,8 @@ msgstr "Limpar Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sair" @@ -4209,7 +4155,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4217,47 +4163,47 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Alcance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de Reconexão de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao Carregar Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informação de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4273,7 +4219,7 @@ msgstr "Vermelho Esquerda" msgid "Red Right" msgstr "Vermelho Direita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4288,29 +4234,29 @@ msgstr "" "\n" "Em caso de dúvida, seleccione Nenhum." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4320,17 +4266,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4347,7 +4293,7 @@ msgstr "Direita" msgid "Right Stick" msgstr "Stick Direito" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" @@ -4356,116 +4302,112 @@ msgstr "Vibração" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Correr DSP LLE numa thread dedicada (não recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Taxa de Amostragem:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Guardar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Guardar Estado Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Guardar Estado Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Guardar Estado Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Guardar Estado Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Guardar Estado Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Guardar Estado Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Guardar Estado Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Guardar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Em Analise..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4473,25 +4415,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Procura de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4502,20 +4444,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Selecção %s não encontrada em SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4533,23 +4475,23 @@ msgstr "Seleccione um ficheiro de jogo guardado para importar" msgid "Select floating windows" msgstr "Seleccionar janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4567,11 +4509,16 @@ msgstr "" "da sua proporção.\n" "Em caso de dúvida, seleccione Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "O ficheiro especificado \"%s\" não existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Tipo de letra seleccionado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4587,7 +4534,7 @@ msgstr "" "Em caso de dúvida, utilize a resolução do ambiente de trabalho.\n" "Se ainda tiver dúvidas, utilize a resolução mais alta que funcione melhor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4603,11 +4550,11 @@ msgstr "" "\n" "Em caso de dúvida, utilize o Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posição da Barra de Sensor:" @@ -4615,48 +4562,54 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - Esta é a porta em que dispositivos tais como adaptadores de " "rede utilizam" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Definições..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Abreviatura:" @@ -4664,105 +4617,105 @@ msgstr "Abreviatura:" msgid "Shoulder Buttons" msgstr "Botões Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar &Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar &Barra de estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar Barra de Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar Japão" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar Pal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma caixa de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4770,27 +4723,39 @@ msgstr "" "Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também " "poderá não explicar o motivo pelo qual o Dolphin crashe de repente." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostrar guardar comentário" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4802,15 +4767,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostrar esta mensagem de ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4820,31 +4781,35 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Ignorar o acesso do EFB a partir do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4856,7 +4821,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4838,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4891,7 +4856,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de ecrã" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -4908,11 +4873,11 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Definições de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Backend de Som %s não é válido" @@ -4926,17 +4891,17 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanhol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume do Altifalante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4956,11 +4921,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifique um plugin de vídeo" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -4968,51 +4929,55 @@ msgstr "Aumente a taxa de transferência do disco" msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Comando padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Começar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Começar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Começar Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Começar Gravação" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estado" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados Guardados" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5026,7 +4991,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ajustar à janela" @@ -5047,12 +5012,12 @@ msgstr "Ficheiros extraídos com sucesso para %s" msgid "Successfully imported save files" msgstr "Sucesso na importação de ficheiros de jogo guardado" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma do sistema:" @@ -5060,7 +5025,7 @@ msgstr "Idioma do sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5081,30 +5046,30 @@ msgstr "Table Esquerda" msgid "Table Right" msgstr "Table Direita" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Teste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5120,13 +5085,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5151,7 +5116,7 @@ msgstr "" "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser " "escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -5168,7 +5133,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O resultado do código AR desencriptado não contém quaisquer linhas." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5181,12 +5146,12 @@ msgstr "" "\n" "Em caso de dúvida, utilize o segundo valor mais rápido a partir da direita." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Jogo Guardado que está a tentar copiar tem um tamanho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5219,15 +5184,12 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Selecção de tema correu mal" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5235,7 +5197,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5243,7 +5205,7 @@ msgstr "" "Estas definições substituem as definições raiz do Dolphin .\n" "Indeterminado significa que o jogo usa as definições do Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5251,14 +5213,16 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5275,7 +5239,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:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5287,7 +5251,7 @@ msgstr "" "Provoca aumentos significativos de velocidade em PCs com mais de um núcleo, " "mas também poderá causar crashes ou falhas." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto permite a edição manual do ficheiro de configuração INI" @@ -5296,40 +5260,40 @@ msgstr "Isto permite a edição manual do ficheiro de configuração INI" msgid "Threshold" msgstr "Limite" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5349,7 +5313,7 @@ msgstr "" "Tentativa de leitura inválida de SYSCONF\n" " ids bt de wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5361,12 +5325,12 @@ msgstr "Rotação" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5374,7 +5338,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO" @@ -5400,24 +5364,24 @@ msgstr "" "encriptado ou desencriptado válido. Verifique se o escreveu correctamente.\n" "Quer ignorar esta linha e continuar a analisar?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Retroceder Carregamento de Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconhecido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando de DVD desconhecido %08x - Erro fatal" @@ -5444,32 +5408,32 @@ msgstr "" msgid "Up" msgstr "Cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Utilizar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5482,7 +5446,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5497,15 +5461,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5513,23 +5477,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5544,7 +5508,7 @@ msgstr "Instalação WAD falhou: erro ao criar %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalação WAD falhou: erro ao criar %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5558,16 +5522,16 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - a começar DOL em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" @@ -5587,7 +5551,7 @@ msgstr "" "%s\n" "Deseja continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5600,7 +5564,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5608,7 +5572,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5616,7 +5580,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5636,7 +5600,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - ficheiro não aberto." @@ -5644,31 +5608,31 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5676,17 +5640,17 @@ msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler do ficheiro" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5700,19 +5664,19 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Definições de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5733,27 +5697,27 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "A trabalhar..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escrever para Consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Escrever para Ficheiro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escrever para Ficheiro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escrever para a Janela" @@ -5772,7 +5736,7 @@ msgstr "Inicialização do XAudio2 falhou: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Criação de master voice do XAudio2 falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5790,23 +5754,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Não pode fechar painéis que contenham páginas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Tem que escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Tem que introduzir um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -5829,25 +5793,25 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 não é suportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido para o Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ em espera ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5863,7 +5827,7 @@ msgstr "" msgid "[Custom]" msgstr "[Costumizar]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5882,7 +5846,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:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5897,11 +5861,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5918,7 +5882,7 @@ msgstr "falha ao ler dados de ficheiro: %s" msgid "failed to read header" msgstr "falha ao ler cabeçalho" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar." @@ -5929,7 +5893,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "não é uma falha de gravação ou de leitura Wii para o cabeçalho do ficheiro %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5938,7 +5902,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -5950,10 +5914,13 @@ msgstr "Correcção zFar: " msgid "zNear Correction: " msgstr "Correcção zNear: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OU" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Padrão)" @@ -6002,9 +5969,38 @@ 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" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula valores de profundidade dos gráficos 3D por pixel em vez de por " +#~ "vértice.\n" +#~ "Em contraste com a iluminação por pixel (que é meramente uma melhoria), " +#~ "calculos de profundidade por pixel são necessários para emular " +#~ "correctamente um pequeno número de jogos.\n" +#~ "\n" +#~ "Em caso de dúvida, mantenha esta opção activada." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6044,15 +6040,48 @@ msgstr "| OU" #~ msgid "Could not get info about plugin %s" #~ msgstr "Não foi possível obter informação sobre o plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Criado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Criado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList " #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Lighting" +#~ msgstr "Desactivar Luminosidade" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desactivar Profundidade por Pixel" + +#~ msgid "Disable Textures" +#~ msgstr "Desactivar Texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar Altifalante do Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar texturas.\n" +#~ "\n" +#~ "Em caso de duvida, mantenha esta opção desactivada." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6098,6 +6127,9 @@ msgstr "| OU" #~ msgid "Enable Audio Throttle" #~ msgstr "Activar Regulador Ãudio" +#~ msgid "Enable BAT" +#~ msgstr "Activar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" @@ -6116,6 +6148,15 @@ msgstr "| OU" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activar Protecção de ecrã (redução de ecrã queimado)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Permite a Localização de Bloco Traduzida (LBT); uma função da Unidade de " +#~ "Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " +#~ "Compatível, OFF = Rápida)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" @@ -6149,6 +6190,9 @@ msgstr "| OU" #~ msgid "Error opening file %s for recording" #~ msgstr "Erro ao abrir o ficheiro %s para gravação" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sair do Dolphin com emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6161,6 +6205,9 @@ msgstr "| OU" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Falha ao carregar ROM DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6198,6 +6245,16 @@ msgstr "| OU" #~ "Esconder o cursor quando está sobre a janela de renderização e quando " #~ "esta está focada." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Melhora a performance mas provoca que a iluminação desapareca na maioria " +#~ "dos jogos.\n" +#~ "\n" +#~ "Em caso de dúvida, mantenha esta opção desactivada" + #~ msgid "Input Source" #~ msgstr "Fonte de Entrada" @@ -6236,6 +6293,15 @@ msgstr "| OU" #~ "Carregar mipmaps nativos é a forma mais precisa, mas também poderá " #~ "diminuir o desempenho (poderá ser variável)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Bloqueia as threads aos núcleos" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Ãudio em baixo nível (LLE) ou alto nível (HLE)" + #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Misturador: Taxa de amostragem não suportada." @@ -6252,6 +6318,12 @@ msgstr "| OU" #~ msgid "OK" #~ msgstr "OK" +#~ msgid "Opens the debugger" +#~ msgstr "Abre o depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Abre o gerador de relatórios" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6278,6 +6350,9 @@ msgstr "| OU" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Necessário para usar o ROM com caracteres japoneses" +#~ msgid "Sample Rate:" +#~ msgstr "Taxa de Amostragem:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6323,6 +6398,9 @@ msgstr "| OU" #~ msgstr "" #~ "Mostrar o número de quadros renderizados por segundo (frames per second)" +#~ msgid "Show this help message" +#~ msgstr "Mostrar esta mensagem de ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6358,6 +6436,9 @@ msgstr "| OU" #~ "As outras opções são resoluções fixas para escolher uma qualidade visual " #~ "independentemente do tamanho ou resolução do ecrã." +#~ msgid "Specify a video backend" +#~ msgstr "Especifique um plugin de vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifique um plugin de audio" @@ -6367,6 +6448,9 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +#~ msgid "Theme selection went wrong" +#~ msgstr "Selecção de tema correu mal" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 66d5476b64..c141b932c2 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,26 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-07 19:13-0300\n" -"Last-Translator: Runo \n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-17 02:48-0300\n" +"Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (muitos para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Jogo : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NÃO" @@ -45,7 +46,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,14 +56,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i conectado" @@ -152,156 +146,156 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Carregar a Partir do Drive de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Pontos de Interrupção" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procurar por ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gerenciador de &Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Arquivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Tela Cheia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Configurações de &Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Configurações de &Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Gerenciador de Cartão de &Memória (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Recarregar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registradores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -317,27 +311,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,46 +339,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Uma janela de Netplay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Não tem nenhum jogo rodando no momento." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nenhum dispositivo Bluetooth suportado foi encontrado!\n" -"(Apenas o Bluetooth Microsoft é suportado.)" +"(Se você não está usando o dispositivo Bluetooth da Microsoft você deve " +"parear seus wiimotes manualmente e usar apenas o botão \"Atualizar\"." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -420,13 +416,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -434,19 +430,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Sobre o Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação correta do VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -460,8 +456,8 @@ msgstr "" "\n" "Se estiver em dúvida, mude o EFB para Textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Ação" @@ -480,7 +476,7 @@ msgstr "" "Código Culpado:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -488,7 +484,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -497,7 +493,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e " "Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -506,7 +502,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write " "e Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -515,45 +511,47 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " -"(%s)" +"(%s)\n" +"Master codes não são necessários. Não use master codes." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro no Action Replay: Linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de Normal Code Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Subtipo inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -562,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Adicionar Código de ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Adicionar Patch" @@ -574,13 +572,13 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Adicionar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Endereço:" @@ -620,74 +618,77 @@ msgstr "" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configurações Avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 -#, fuzzy +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permite Ligar/Desligar algumas opções através das teclas 3, 4, 5, 6 e 7 " -"enquanto o emulador está funcionando.\n" +"Permite Ligar/Desligar algumas opções através das teclas 3, 4, 5 e 6 estando " +"na janela de emulação.\n" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Tempo Alternativo de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtragem Anisotrópica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -699,15 +700,15 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -717,16 +718,16 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -734,14 +735,14 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -749,12 +750,12 @@ msgstr "Proporção:" msgid "At least one pane must remain open." msgstr "Pelo menos um painél deve permanecer aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -762,24 +763,24 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Tamanho da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajustar Automaticamente o Tamanho da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -789,24 +790,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Gera os mipmaps automaticamente ao invés de decodificá-los da memória.\n" -"Aumenta um pouco a velocidade de emulação mas pode causar pequenos defeitos " -"nas texturas.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registrador BP" @@ -814,16 +802,16 @@ msgstr "Registrador BP" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configurações do Backend" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input em Background" @@ -836,16 +824,16 @@ msgstr "Para trás" msgid "Bad File Header" msgstr "Header de Arquivo Ruim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -853,11 +841,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Alavanca" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -869,7 +857,7 @@ msgstr "Baixo" msgid "Block Allocation Table checksum failed" msgstr "Falha no teste de Mesa de Alocação de Blocos" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocos" @@ -885,47 +873,53 @@ msgstr "Azul Esquerdo" msgid "Blue Right" msgstr "Azul Direito" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Embaixo" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procurar por um diretório de output" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -937,36 +931,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula os valores de profundidade dos gráficos 3D por Pixel ao invés de por " -"vetor.\n" -"Ao contrário da Iluminação por Pixels (que é meramente uma melhoria), o " -"cálculo da Profundidade por Pixel é necessário para emular própriamente um " -"pequeno número de jogos.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -980,7 +957,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -996,7 +973,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1007,7 +984,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1015,20 +992,20 @@ msgstr "" "Não é possível usar aquele arquivo como um Memory Card.\n" "Você está tentando usar o mesmo arquivo nos dois slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar o Wiimote pelo bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" @@ -1036,28 +1013,28 @@ msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalão" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centralizar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Mudar &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Mudar o Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Mudar Jogo" @@ -1078,11 +1055,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "Muda o sinal para o parâmetro do zNear (após a correção)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1090,47 +1066,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Códigos de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Busca de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Checar Integridade da Partição" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Checando Integridade..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1138,7 +1114,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1146,8 +1122,8 @@ msgstr "" "Escolher um arquivo para ser usado como apploader: (aplicável somente para " "discos construídos de diretórios)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1161,8 +1137,8 @@ msgstr "Clássico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpar" @@ -1174,22 +1150,22 @@ msgstr "" "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " "Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informação do Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1197,95 +1173,95 @@ msgstr "Código:" msgid "Command" msgstr "Comandos" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentário:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimindo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar Controles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Conectando..." @@ -1301,16 +1277,16 @@ msgstr "Controle" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Núcleo" @@ -1319,7 +1295,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "Não pôde criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível inicializar o Backend 5s. %s" @@ -1340,12 +1316,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer o arquivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1354,7 +1330,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1367,11 +1343,11 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1379,17 +1355,17 @@ msgstr "" "Não foi possível iniciar o Núcleo (core). \n" "Cheque suas configurações" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Criar Código AR" @@ -1398,25 +1374,7 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Criado por VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Criador:" @@ -1424,11 +1382,11 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1442,12 +1400,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "O diretório atual mudou de %s para %s depois do wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1455,15 +1413,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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tcheco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1471,36 +1429,36 @@ msgstr "D" msgid "D-Pad" msgstr "Direcional Digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1512,16 +1470,16 @@ msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Arquivos Datel Maxdrive/Pro (*.sav)" @@ -1533,11 +1491,11 @@ msgstr "Arquivos Datel Maxdrive/Pro (*.sav)" msgid "Dead Zone" msgstr "Zona Morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1545,24 +1503,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1571,11 +1529,11 @@ msgid "Default font" msgstr "Fonte Padrão" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Excluir Save" @@ -1584,11 +1542,11 @@ msgstr "Excluir Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descrição" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1601,13 +1559,13 @@ msgstr "" "Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de " "saída. Segurando." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1631,28 +1589,16 @@ msgstr "" "A checagem de diretório falhou\n" " e a checagem de Backup de Diretório falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Desativar Iluminação" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Desativar Profundidade por Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Desativar Texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1666,7 +1612,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1682,17 +1628,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desabilitar Texturas.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1701,11 +1637,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro na leitura do Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1719,20 +1655,24 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "Decoder Dolby Pro Logic II" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configurações %s Gráficas do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Web Site do Dolphin" @@ -1740,32 +1680,32 @@ msgstr "&Web Site do Dolphin" msgid "Dolphin Configuration" msgstr "Configuração do Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração de Wiimote Emulado do Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuração de Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1773,7 +1713,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1781,16 +1721,21 @@ msgstr "" "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" "clique aqui para mostrar todos os jogos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "O Dolphin não conseguiu completar a ação requisitada." + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Para Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Banco de Dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Códigos %lu baixados. (Adicionados %lu)" @@ -1799,27 +1744,27 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Extrair Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1830,7 +1775,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1839,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:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1849,29 +1794,29 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Sair" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Cópias de EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"ERRO: Esta versão do Dolphin precisa de um driver TAP-Win32 no mínimo com a " +"ERRO: Essa versão do Dolphin precisa de um driver TAP-Win32 no mínimo com a " "versão %d.%d -- Se você mudou a versão do Dolphin recentemente, reiniciar o " "PC é provavelmente necessário no momento para que o Windows veja o novo " "driver." @@ -1880,11 +1825,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Atualizações prévias de Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1892,7 +1837,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1900,12 +1845,12 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1913,15 +1858,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Este Segmento de Emulação já está rodando" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1935,7 +1880,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Virtual." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1951,19 +1896,19 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado de Emulação" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1979,72 +1924,67 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Ativar BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Ativar Cálculo de Caixas Limitadoras" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Ativar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ativar Modo de Dois Núcleos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Ativar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2059,7 +1999,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2067,11 +2007,11 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Ativar Paginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2083,7 +2023,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2095,7 +2035,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2103,21 +2043,35 @@ msgstr "" "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " "Princess. Disative para QUALQUER UM outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -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:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Não disponível " +"no OSX." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " +"apenas no backend OpenAL." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " +"apenas no backend OpenAL. Talvez seja necessário renomear o soft_oal.dll " +"para OpenAL32.dll para que funcione." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2129,7 +2083,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2137,7 +2091,7 @@ msgstr "" "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " "(ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2151,14 +2105,14 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Improvisos" @@ -2176,17 +2130,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2226,36 +2180,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sair do Dolphin com o emulador" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar Arquivo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2263,15 +2213,15 @@ msgstr "Exportar todos os saves" msgid "Export failed, try again?" msgstr "Falha na exportação, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar Salvar como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2283,52 +2233,52 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra útil apenas em \"Metroid Other M\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraindo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte do FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Player" @@ -2336,7 +2286,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2344,15 +2294,15 @@ msgstr "Tamanho FST:" msgid "Failed to Connect!" msgstr "Falha ao Conectar\"" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Não foi possível Ouvir!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2388,12 +2338,17 @@ msgstr "Falha ao carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Falha ao carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Falha ao escrever o header para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2470,23 +2425,19 @@ msgstr "Falha ao escrever o header para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever o header para o arquivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Persa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps Rápidos" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2494,23 +2445,23 @@ msgstr "" "Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, " "byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informações do Arquivo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "O arquivo não contém códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Arquivo convertido para .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2527,7 +2478,7 @@ msgstr "" "O arquivo tem a extensão \"%s\"\n" "extensões válidas são (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Arquivo não reconhecido como Memory Card" @@ -2540,47 +2491,47 @@ msgstr "Arquivo não comprimido" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Achar Próximo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Achar Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2593,7 +2544,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2605,7 +2556,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2627,56 +2578,56 @@ msgstr "" msgid "Forward" msgstr "Para frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "%d resultados encontrados para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Quadro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Informação do Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Alcanço do Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limitador de FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Olhar Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francês" @@ -2684,20 +2635,20 @@ msgstr "Francês" msgid "Frets" msgstr "Notas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Tela Cheia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolução da Tela Cheia:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Arquivo GCI(*.gci)" @@ -2705,57 +2656,61 @@ msgstr "Arquivo GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração do GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID do jogo:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "O jogo já está rodando!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "O jogo não está rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2772,41 +2727,41 @@ msgstr "" "processador de código nativo colocando o arquivo codehandler.bin no " "diretório Sys e reiniciando o Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Geral" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Configurações Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemão" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configurações Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maior do que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2824,7 +2779,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grego" @@ -2844,11 +2799,11 @@ msgstr "Verde Direito" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2856,11 +2811,11 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2868,7 +2823,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2885,15 +2840,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Ocultar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder Cursor Do Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2907,8 +2862,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2916,27 +2871,27 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de hotkey" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentou adiquirir dados de um ticket desconhecido: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2949,31 +2904,31 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Definições de IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Ponteiro IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -2981,11 +2936,11 @@ msgstr "Diretórios de ISO" msgid "ITALY" msgstr "ITÃLIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2993,14 +2948,14 @@ msgstr "" "Se isto for ativado, os registradores das caixas de limite serão " "atualizados. Usado pelos jogos do Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3011,11 +2966,11 @@ msgstr "" "consertar cortes no áudio mas pode causar ruído constante dependendo do " "jogo)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3029,7 +2984,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3043,7 +2998,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Save" @@ -3051,7 +3006,7 @@ msgstr "Importar Save" msgid "Import failed, try again?" msgstr "Falha na Importação, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3059,11 +3014,11 @@ msgstr "" "O arquivo importado tem a extensão gsc\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "O arquivo importado tem comprimento inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3071,7 +3026,7 @@ msgstr "" "O arquivo importado tem a extensão sav\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3083,27 +3038,16 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Melhora a performance mas faz a iluminação desaparecer na maioria dos " -"jogos.\n" -"\n" -"Se estiver em dúvida, deixe esta opção desativada." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Funciona" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3111,7 +3055,7 @@ msgstr "Info" msgid "Information" msgstr "Informação" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3123,7 +3067,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3131,11 +3075,11 @@ msgstr "Insira cartão SD" msgid "Insert name here.." msgstr "Insira nome aqui.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3146,23 +3090,23 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Erro na Checagem de Integridade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Checagem de Integridade completa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3171,19 +3115,19 @@ msgstr "" "Checagem de Integridade para a partição %d falhou. Sua cópia deve estar " "corrompida ou foi incorretamente corrigido (patch)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Opções de interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erro Interno do LZO - A compressão falhou" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3192,19 +3136,19 @@ msgstr "" "Erro Interno do LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente recarregar o Estado Salvo" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro Interno do LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3213,11 +3157,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra Mágica(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor Inválido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" @@ -3226,7 +3170,7 @@ msgstr "Bat.map ou entrada de Diretório inválidas" msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Arquivo inválido" @@ -3241,31 +3185,31 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Parâmetros de busca inválidos (nenhum objeto selecionado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "String de busca inválida (não foi possível converter para número)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "String de busca inválida (apenas comprimentos correspondentes de string são " "suportados)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado Salvo Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3273,16 +3217,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonês" @@ -3290,7 +3234,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "CORÉIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3300,17 +3244,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Manter Janela no Topo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3328,19 +3272,23 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Linguagem:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último State sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último State Salvo" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "Latência:" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3350,8 +3298,8 @@ msgstr "Esquerda" msgid "Left Stick" msgstr "Analógico Esquerdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3359,7 +3307,7 @@ msgstr "" "Clique com o botão esquerdo para detectar atalhos de teclado.\n" "Pressione Enter para deixar vazio." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3369,7 +3317,7 @@ msgstr "" "Clique do meio para limpar.\n" "Clique direito para mais opções." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3377,76 +3325,76 @@ msgstr "" "Clique da Esquerda/Direita para mais opções.\n" "Clique do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar por FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar Estado do Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar Estado do Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar Estado do Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar Estado do Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar Estado do Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar Estado do Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar Estado do Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar Estado do Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3461,36 +3409,44 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Separar tarefas em núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuração do Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "Registrar FPS em arquivo" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipo de Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Registra o número de quadros renderizados por segundo em User/Logs/fps.txt. " +"Use este recurso para medir a performance do Dolphin.\n" +"\n" +"Se estiver em dúvida, deixe isto desativado." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Resposta do Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logando" @@ -3498,10 +3454,6 @@ msgstr "Logando" msgid "Lost connection to server!" msgstr "A conexão com o servidor foi perdida!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Emulação do Audio em Low level (LLE) ou high level (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Butão M" @@ -3515,12 +3467,12 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" @@ -3529,33 +3481,33 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Máximo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "O Memory Card já tem um arquivo de salva deste título" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "O Memory Card já está aberto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Cartão de memoria" @@ -3567,7 +3519,7 @@ msgstr "" "AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " "funcionando mas pode corromper coisas!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3592,20 +3544,20 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Microfone" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Opções diversas" @@ -3614,7 +3566,7 @@ msgstr "Opções diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3631,16 +3583,16 @@ msgstr "" msgid "Monospaced font" msgstr "Fonte Monospaced" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3662,7 +3614,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3670,11 +3622,11 @@ msgstr "" "Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em " "Wiimotes Reais. Não faz efeito em Wiimotes Emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOTA: O tamanho do stream não corresponde ao comprimento dos dados\n" @@ -3762,38 +3714,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Arquivos GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próxima Busca" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Nick:" @@ -3801,7 +3753,7 @@ msgstr "Nick:" msgid "No Country (SDK)" msgstr "Sem região (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Sem ISOs ou WADs achados" @@ -3810,8 +3762,8 @@ msgstr "Sem ISOs ou WADs achados" msgid "No banner file found for title %s" msgstr "Nenhum arquivo de banner encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Descrição indisponível" @@ -3819,15 +3771,15 @@ msgstr "Descrição indisponível" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nenhum arquivo carregado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Não há entradas de índice de diretório livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nenhum arquivo gravado" @@ -3836,33 +3788,33 @@ msgstr "Nenhum arquivo gravado" msgid "No save folder found for title %s" msgstr "Nenhuma pasta de salva encontrada para o título %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3871,7 +3823,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Noticía" @@ -3879,28 +3831,28 @@ msgstr "Noticía" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Números dos códigos:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleração do Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Desligado" @@ -3908,60 +3860,56 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "Mostrar Mensagens na Tela" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir Arquivo..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Não foi possível encontrar dispositivos de som" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir o dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abrir o debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abrir o logger" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3970,7 +3918,7 @@ msgstr "Opções" msgid "Orange" msgstr "Laranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3980,8 +3928,8 @@ msgstr "" "Clique com o botão direito e exporte todos os salvas,\n" "e importe-os para um novo Memory Card\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Outros" @@ -3993,19 +3941,19 @@ msgstr "" "Outro Client desconectou enquanto o jogo rodava!! O Netplay foi " "desabilitado. Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Saída" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "R&eproduzir gravação..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Controle" @@ -4021,7 +3969,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Parear" @@ -4033,30 +3981,34 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "Pausar no fim do vídeo" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfeito" @@ -4065,36 +4017,36 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Executar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproduzir Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4106,54 +4058,54 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Porta 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u" @@ -4166,11 +4118,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4178,7 +4130,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4186,7 +4138,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpar o Cache" @@ -4194,8 +4146,8 @@ msgstr "Limpar o Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sair" @@ -4213,7 +4165,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4221,46 +4173,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Russia" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Alcance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimotes Reais" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de reconexão do Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao carregar Estado Salvo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informações de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4276,7 +4228,7 @@ msgstr "Vermelho Esquerdo" msgid "Red Right" msgstr "Vermelho Direito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4290,29 +4242,29 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Atualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Atualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4322,17 +4274,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4349,7 +4301,7 @@ msgstr "Direita" msgid "Right Stick" msgstr "Analógico Direito" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" @@ -4358,116 +4310,112 @@ msgstr "Vibração" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar o DSP LLE em um segmento dedicado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sal&var Instante Atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Taxa de Amostragem:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Salvar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Salvar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Salvar Instante Atual no Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Salvar Instante Atual no Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Salvar Instante Atual no Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Salvar Instante Atual no Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Salvar Instante Atual no Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Salvar Instante Atual no Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Salvar Instante Atual no Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Salvar Instante Atual no Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Salvar Instante Atual..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4475,23 +4423,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Busca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Pesquisar Objeto atual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Buscar valor hexadecimal:" @@ -4502,20 +4450,20 @@ msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Selecionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4532,23 +4480,23 @@ msgstr "Selecione um arquivo de jogo salvo para importar" msgid "Select floating windows" msgstr "Selecionar Janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecione um instante para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecione um instante para salvar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4566,11 +4514,15 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "O perfil de controle especificado não existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Fonte Selecionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4586,7 +4538,7 @@ msgstr "" "Se estiver em dúvida, use a resolução da sua Ãrea de Trabalho.\n" "Se ainda estiver em dúvida, use a maior disponível.." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4602,11 +4554,11 @@ msgstr "" "\n" "Se estiver em dúvida, use o Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posição da Sensor Bar:" @@ -4614,49 +4566,57 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Porta Serial 1 - Esta é a porta usada por dispositivos como o adaptador de " "rede" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"Configura a latência (em ms). Valores mais altos podem reduzir problemas de " +"corte no áudio. Disponível apenas no backend OpenAL." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configurações..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Arquivo de configuração não encontrado" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nome Curto:" @@ -4664,133 +4624,147 @@ msgstr "Nome Curto:" msgid "Shoulder Buttons" msgstr "Botões Superiores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar Janela de &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar barra de &Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Show Barra de &Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma janela de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"Mostra uma menssagem quando erros potencialmente sérios ocorreram. \n" +"Mostra uma mensagem quando erros potencialmente sérios ocorreram. \n" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "Mostar o contador de lag" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" +"Mostra mensagens na área da tela de emulação.\n" +"Essas mensagens incluem acesso ao Memory Card, informações sobre o backend " +"de vídeo e a CPU, e limpeza do cache do JIT." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar título do salva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4802,15 +4776,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra esta menssagem de ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostra desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4820,31 +4790,35 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Não permite o acesso da CPU ao EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4856,7 +4830,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4847,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4891,7 +4865,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de tela" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -4907,11 +4881,11 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configurações de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "O Backend de Som %s não é válido." @@ -4925,17 +4899,17 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanhol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume do Auto-Falante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4955,11 +4929,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifique um Backend de Vídeo" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -4967,51 +4937,55 @@ msgstr "Aumentar a velocidade de transferência do disco" msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Controle Padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Iniciar NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Iniciar Ca&ptura" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Iniciar Captura" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Status" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados Salvos" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "Volante" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Analógico" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5025,7 +4999,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Redimensionar para a Tela" @@ -5046,12 +5020,12 @@ msgstr "Arquivo exportado com sucesso para %s" msgid "Successfully imported save files" msgstr "Arquivos de salva importados com sucesso" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma do Systema:" @@ -5059,7 +5033,7 @@ msgstr "Idioma do Systema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Input do TAS" @@ -5080,30 +5054,30 @@ msgstr "Esquerda da Mesa" msgid "Table Right" msgstr "Direita da Mesa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Testar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5119,13 +5093,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5148,7 +5122,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "O Arquivo %s já foi aberto, o header do arquivo não será escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -5165,7 +5139,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O código AR resultante da derciptação não contém nenhuma linha." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5177,12 +5151,12 @@ msgstr "" "\n" "Se estiver em dúvida, use o o valor mais à direita." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5215,15 +5189,11 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" -msgstr "Tema" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +msgid "Theme:" +msgstr "Tema:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "A seleção do tema deu errado" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5231,7 +5201,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5239,7 +5209,7 @@ msgstr "" "Estas configurações substituem as configurações do núcleo do Dolphin.\n" "Indeterminado significa que o jogo usa as configurações do Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5247,15 +5217,17 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5271,7 +5243,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5283,7 +5255,7 @@ msgstr "" "Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " "também pode causar travamentos/erros ocasionais." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI" @@ -5292,40 +5264,40 @@ msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .IN msgid "Threshold" msgstr "Threshold" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5345,7 +5317,7 @@ msgstr "" "Tentando ler de um SYSCONF inválido\n" "Os Bt IDs do Wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5357,12 +5329,12 @@ msgstr "Turntable" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5370,7 +5342,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO_%02X" @@ -5399,24 +5371,24 @@ msgstr "" "corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i indefinido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Desfazer carregamento de estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Chamada 0x80 inesperada? Abortando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconhecido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando de DVD desconhecido %08x - Erro Fatal" @@ -5442,32 +5414,32 @@ msgstr "" msgid "Up" msgstr "Para cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Atualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Usar Tela Cheia" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5480,7 +5452,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5495,15 +5467,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitário" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5511,23 +5483,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5541,7 +5513,7 @@ msgstr "Falha na instalação da WAD: Erro na criação de %s" msgid "WAD installation failed: error creating ticket" msgstr "Falha na instalação da WAD: Erro na criação do ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5554,16 +5526,16 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" @@ -5583,7 +5555,7 @@ msgstr "" "%s\n" "Deseja continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5596,7 +5568,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5607,7 +5579,7 @@ msgstr "" "(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, " "ou carregar este instante com o modo somente-leitura desligado." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5619,7 +5591,7 @@ msgstr "" "este instante com o modo somente-leitura desligado. Caso contrário você " "provavelmente terá uma desincronização." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5654,7 +5626,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Arquivo não aberto." @@ -5662,49 +5634,49 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de Widescreen" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" -msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" +msgstr "Arquivos de Save do Wii (*.bin)|*.bin" #: Source/Core/DiscIO/Src/WiiWad.cpp:81 msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler o arquivo" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5717,19 +5689,19 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configurações do Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5749,26 +5721,26 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Funcionando..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escrever no Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Escrever no Debugger" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escrever para o Arquivo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escrever na Janela" @@ -5787,7 +5759,7 @@ msgstr "XAudio2 Falha na inicialização: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 Criação de Master Voice falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5808,23 +5780,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Você não pode fechar painéis que têm páginas neles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Você deve escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Você deve digitar um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -5847,25 +5819,25 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Hack do ZTB" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 não é suportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido pelo Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Aguardando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5881,7 +5853,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5900,7 +5872,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5915,11 +5887,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5936,7 +5908,7 @@ msgstr "Falha ao ler dados do arquivo: %s" msgid "failed to read header" msgstr "Falha ao ler o header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." @@ -5948,7 +5920,7 @@ msgstr "" "Não é um save de Wii ou houve erro de leitura no tamanho do header do " "arquivo %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5957,7 +5929,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retornou -1 ao rodar o aplicativo!" @@ -5969,13 +5941,16 @@ msgstr "Correção do zFar:" msgid "zNear Correction: " msgstr "Correção do zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Quadro a Quadro" @@ -6025,9 +6000,37 @@ 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" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula os valores de profundidade dos gráficos 3D por Pixel ao invés de " +#~ "por vetor.\n" +#~ "Ao contrário da Iluminação por Pixels (que é meramente uma melhoria), o " +#~ "cálculo da Profundidade por Pixel é necessário para emular própriamente " +#~ "um pequeno número de jogos.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe isto desativado." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6068,15 +6071,48 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Não pôde criar %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Criado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Criado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache Dlist" #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Lighting" +#~ msgstr "Desativar Iluminação" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desativar Profundidade por Pixel" + +#~ msgid "Disable Textures" +#~ msgstr "Desativar Texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desabilitar o Auto-Falante do Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desabilitar Texturas.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe isto desativado." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6123,6 +6159,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Ativar Throttle de Ãudio" +#~ msgid "Enable BAT" +#~ msgstr "Ativar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" @@ -6147,6 +6186,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Ativar Proteção de tela (redução de \"burn-in\")" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ativar Block Address Translation (BAT); uma função da unidade de " +#~ "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " +#~ "emulado (ON = Compativel, OFF = Rapido)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -6183,6 +6231,12 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erro ao abrir o arquivo %s para gravação" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sair do Dolphin com o emulador" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps Rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6231,6 +6285,16 @@ msgstr "| OR" #~ "Se o jogo trava, funciona apenas no interpretador ou o dophin dá erro, " #~ "essa opção pode corrigir o jogo." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Melhora a performance mas faz a iluminação desaparecer na maioria dos " +#~ "jogos.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe esta opção desativada." + #~ msgid "Input Source" #~ msgstr "Fonte de Entrada" @@ -6266,6 +6330,15 @@ msgstr "| OR" #~ "Carregar os mipmaps nativos é mais preciso todavia, mas pode diminuir a " #~ "perfomance (embora sua mudança possa variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Separar tarefas em núcleos" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Emulação do Audio em Low level (LLE) ou high level (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Console de script lua" @@ -6292,6 +6365,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "Abrir" +#~ msgid "Opens the debugger" +#~ msgstr "Abrir o debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Abrir o logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6326,6 +6405,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Running script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Taxa de Amostragem:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6373,6 +6455,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra o número de quadros por segundo." +#~ msgid "Show this help message" +#~ msgstr "Mostra esta menssagem de ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6414,6 +6499,9 @@ msgstr "| OR" #~ "As outras opções são resoluções fixas para escolher a qualidade visual " #~ "independentemente do tamanho do seu monitor." +#~ msgid "Specify a video backend" +#~ msgstr "Especifique um Backend de Vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifique um Plugin de Ãudio" @@ -6426,6 +6514,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "O arquivo" +#~ msgid "Theme selection went wrong" +#~ msgstr "A seleção do tema deu errado" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 99fefcfc12..7c6149eb30 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-01-20 14:40+0300\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" "Language: Russian\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(Ñлишком много)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Игра : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 #, fuzzy msgid "! NOT" msgstr "! NOT" @@ -46,7 +46,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" неверный образ GCM/ISO, или не ÑвлÑетÑÑ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼ игры Ð´Ð»Ñ GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Гц" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Отключен" @@ -150,159 +143,159 @@ msgstr "%sЭкÑпоритровать GCI%s" msgid "%sImport GCI%s" msgstr "%sИмпортировать GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей каталогов" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 #, fuzzy msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&О программе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&ЗапуÑтить игру Ñ DVD-диÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Выбрать папку Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Менеджер &читов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&ЭмулÑциÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Файл" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 #, fuzzy msgid "&Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Опции видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Помощь" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 #, fuzzy msgid "&Hotkey Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Менеджер карт памÑти (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Па&мÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Выбор &файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Опции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Пауза" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&РегиÑтры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&СброÑить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "З&вук" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&ОÑтановить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ИнÑтрументы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Вид" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -319,27 +312,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(отключен)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 бит" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 бита" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 бит" @@ -347,44 +340,45 @@ msgstr "8 бит" msgid "" msgstr "<Введите название>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<Ðичего>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<СиÑтемный>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Окно Ñетевой игры уже открыто!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Игра не запущена." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -420,13 +414,13 @@ msgstr "" "\n" "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR-коды" @@ -434,19 +428,19 @@ msgstr "AR-коды" msgid "About Dolphin" msgstr "Об ÑмулÑторе Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -455,8 +449,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ДейÑтвие" @@ -470,7 +464,7 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -478,36 +472,37 @@ msgstr "" "Ошибка ActionReplay: неверный размер (%08x : Ð°Ð´Ñ€ÐµÑ = %08x) в добавлÑемом " "коде (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -515,27 +510,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Ðдаптер:" @@ -544,11 +539,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Добавление патча" @@ -556,13 +551,13 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Добавить..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ÐÐ´Ñ€ÐµÑ :" @@ -588,71 +583,78 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " +"играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Сглаживание:" @@ -664,31 +666,31 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Загрузчик:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Применить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -696,12 +698,12 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -709,12 +711,12 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" @@ -723,26 +725,26 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Ðвто" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -752,19 +754,11 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&РегиÑтры" @@ -773,18 +767,18 @@ msgstr "&РегиÑтры" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "СиÑтема вывода" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -797,16 +791,16 @@ msgstr "Взмах" msgid "Bad File Header" msgstr "Ðеверный заголовок файла" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Логотип:" @@ -814,11 +808,11 @@ msgstr "Логотип:" msgid "Bar" msgstr "Панель" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -830,7 +824,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -846,47 +840,53 @@ msgstr "СинÑÑ Ñлева" msgid "Blue Right" msgstr "СинÑÑ Ñправа" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Ñнизу" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ðе работает" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Обзор" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Буфер:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -898,29 +898,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -929,7 +919,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Отмена" @@ -945,7 +935,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -955,7 +945,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -963,18 +953,18 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -982,29 +972,29 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Центр" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Сменить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Сменить &диÑк..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 #, fuzzy msgid "Change Disc" msgstr "Сменить &диÑк..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Сменить игру" @@ -1025,12 +1015,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Чат" @@ -1038,49 +1027,49 @@ msgstr "Чат" msgid "Cheat Code" msgstr "Чит-код" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "ПоиÑк кодов" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1088,14 +1077,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1109,8 +1098,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "ОчиÑтить" @@ -1122,22 +1111,22 @@ msgstr "" "Клиент отÑоединилÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹! Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð° оÑтановлена. Ð’Ñ‹ должны " "оÑтановить игру." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Закрыть" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Код:" @@ -1145,96 +1134,96 @@ msgstr "Код:" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Сжатие образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "ÐаÑтройки" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "ÐаÑтройка" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "ÐаÑтройка управлениÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "ÐаÑтроить контроллеры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Подключить Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Подключить Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Подключить Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Подключить Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Подключение..." @@ -1250,16 +1239,16 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "Конвертировать в GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Ядро" @@ -1268,7 +1257,7 @@ msgstr "Ядро" msgid "Could not create %s" msgstr "Ðе удалоÑÑŒ Ñоздать %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1289,18 +1278,18 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Ðе удалоÑÑŒ определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Ðе удалоÑÑŒ Ñохранить %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1312,27 +1301,27 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Страна:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Создать новый AR-код" @@ -1341,26 +1330,7 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by KDE-Look.org" -msgstr "Стиль от KDE-Look.org" - -#: 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:496 -msgid "Created by VistaIcons.com" -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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Создатель:" @@ -1368,11 +1338,11 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "обрезать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1383,12 +1353,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1398,15 +1368,15 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1414,39 +1384,39 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD-диÑк:" @@ -1458,16 +1428,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Дата:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Файлы Datel MaxDrive/Pro (*.sav)" @@ -1479,11 +1449,11 @@ msgstr "Файлы Datel MaxDrive/Pro (*.sav)" msgid "Dead Zone" msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1492,24 +1462,24 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1518,11 +1488,11 @@ msgid "Default font" msgstr "Шрифт по умолчанию" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Удалить Ñохранение" @@ -1531,12 +1501,12 @@ msgstr "Удалить Ñохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "ВопроÑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Определить" @@ -1547,13 +1517,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1575,30 +1545,17 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Отключить оÑвещение" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Глубина пикÑелÑ" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Отключить текÑтуры" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1607,7 +1564,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1617,14 +1574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "ДиÑк" @@ -1633,11 +1583,11 @@ msgstr "ДиÑк" msgid "Disc Read Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð¸Ñка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Изображение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1648,20 +1598,24 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ÐаÑтройки графики %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Веб-Ñайт ÑмулÑтора" @@ -1669,33 +1623,33 @@ msgstr "&Веб-Ñайт ÑмулÑтора" msgid "Dolphin Configuration" msgstr "ÐаÑтройки ÑмулÑции" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "ÐаÑтройки Ñмулируемого Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "ÐаÑтройка Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1703,7 +1657,7 @@ msgstr "" "Dolphin не нашел образов игр GC/Wii. Щелкните дважды по Ñтой надпиÑи, чтобы " "указать путь..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1711,16 +1665,21 @@ msgstr "" "Dolphin наÑтроен на Ñкрытие вÑех игр. Кликните здеÑÑŒ два раза, чтобы " "показать игры..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Вниз" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Скачать готовые коды (база WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Скачано %lu кодов. (добавлено %lu)" @@ -1729,34 +1688,34 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1764,33 +1723,33 @@ msgid "" "If unsure, leave this unchecked." msgstr "СохранÑет текÑтуры игры в User/Dump/Textures// " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 #, fuzzy msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Закрыть" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "Регионы копии EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1803,11 +1762,11 @@ msgstr "" msgid "EUROPE" msgstr "ЕВРОПÐ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Изменить" @@ -1815,7 +1774,7 @@ msgstr "Изменить" msgid "Edit ActionReplay Code" msgstr "Изменить код ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Править вручную" @@ -1823,12 +1782,12 @@ msgstr "Править вручную" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Изменить..." @@ -1836,15 +1795,15 @@ msgstr "Изменить..." msgid "Effect" msgstr "Эффект" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1853,7 +1812,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1863,19 +1822,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "КачеÑтво ÑмулÑции:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Включить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1885,74 +1844,69 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "Включить BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1965,7 +1919,7 @@ msgstr "" "Повышает визуальное качеÑтво текÑтур, находÑщихÑÑ Ð¿Ð¾Ð´ наклоном\n" "к углу обзора." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1973,11 +1927,11 @@ msgstr "" "Ðктивирует режим быÑтрого доÑтуп к диÑку, необходим Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(отключите Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÑовмеÑтимоÑти)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1985,7 +1939,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1993,7 +1947,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2001,21 +1955,29 @@ msgstr "" "УÑкорÑет игру The Legend of Zelda: Twilight Princess. Ð”Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕÐ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " -"функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2023,7 +1985,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2031,7 +1993,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2043,15 +2005,15 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 #, fuzzy msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "УлучшениÑ" @@ -2069,17 +2031,17 @@ msgstr "ЗапиÑÑŒ %d/%d" msgid "Entry 1/%d" msgstr "ЗапиÑÑŒ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Равно" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Ошибки" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2117,38 +2079,34 @@ msgstr "" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Закрыть Dolphin Ñ ÑмулÑтором" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 #, fuzzy msgid "Export Failed" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 #, fuzzy msgid "Export Recording" msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "ЭкÑпортировать вÑе ÑохранениÑ" @@ -2157,15 +2115,15 @@ msgstr "ЭкÑпортировать вÑе ÑохранениÑ" msgid "Export failed, try again?" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "&ЭкÑпортировать Ñохранение как..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2177,52 +2135,52 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Извлечь вÑе файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "ИзвлеÑÑŒ папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2230,7 +2188,7 @@ msgstr "" msgid "FRANCE" msgstr "ФРÐÐЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2238,15 +2196,15 @@ msgstr "Размер ТФС:" msgid "Failed to Connect!" msgstr "Ошибка подключаниÑ!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2275,6 +2233,11 @@ msgstr "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ hid.dll" msgid "Failed to load hid.dll" msgstr "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ banner.bin" @@ -2344,46 +2307,42 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Файл не Ñодержит кодов." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Файл конвертирован в .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2400,7 +2359,7 @@ msgstr "" "Файл имеет раÑширение \"%s\"\n" "допуÑтимые раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2413,49 +2372,49 @@ msgstr "Файл не Ñжат" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Включить фильтрацию" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2463,7 +2422,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2471,7 +2430,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2490,61 +2449,61 @@ msgstr "" msgid "Forward" msgstr "Вперед" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 #, fuzzy msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Свободный обзор" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "French" msgstr "French" @@ -2553,21 +2512,21 @@ msgstr "French" msgid "Frets" msgstr "Лады" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "ПолнЭкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Файл GCI(*.gci)" @@ -2576,58 +2535,62 @@ msgstr "Файл GCI(*.gci)" msgid "GCMic Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID игры:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Игра уже запущена!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Игра не запущена!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "ПерÑональные наÑтройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ÐаÑтройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "ÐаÑтройка контроллера GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-коды" @@ -2640,43 +2603,43 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Общие" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "German" msgstr "German" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "ÐаÑтройка видео" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Больше чем" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2687,7 +2650,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2708,11 +2671,11 @@ msgstr "Ð—ÐµÐ»ÐµÐ½Ð°Ñ Ñправа" msgid "Guitar" msgstr "Гитара" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Вызван HCI_CMD_INQUIRY, пожалуйÑта Ñообщите!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2720,12 +2683,12 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 #, fuzzy msgid "Hebrew" msgstr "Hebrew" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Ð’Ñ‹Ñота" @@ -2733,7 +2696,7 @@ msgstr "Ð’Ñ‹Ñота" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2750,15 +2713,15 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "СпрÑтать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Скрывать курÑор мыши" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2772,8 +2735,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Создать" @@ -2781,27 +2744,27 @@ msgstr "Создать" msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Hungarian" msgstr "Hungarian" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,31 +2777,31 @@ msgstr "" "TitleID %016llx.\n" " Dolphin cкорее вÑего завиÑнет" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "ИК" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "ИК указатель" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" @@ -2846,17 +2809,17 @@ msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" msgid "ITALY" msgstr "ИТÐЛИЯ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 #, fuzzy msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2864,7 +2827,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2877,12 +2840,12 @@ msgstr "" "Throttle\n" "в опциÑÑ… аудиоплагина." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Эмулировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2891,7 +2854,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2900,7 +2863,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Импортировать Ñохранение" @@ -2908,7 +2871,7 @@ msgstr "Импортировать Ñохранение" msgid "Import failed, try again?" msgstr "Ошибка импорта, попробовать еще раз?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2916,11 +2879,11 @@ msgstr "" "Импортированный файл имеет раÑширение gsc\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Импортиванный неверного размера" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2928,7 +2891,7 @@ msgstr "" "Импортированный файл имеет раÑширение sav\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2939,26 +2902,16 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " -"пропадет в играх, которые его иÑпользуют." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Почти играбельна" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ИнформациÑ" @@ -2966,7 +2919,7 @@ msgstr "ИнформациÑ" msgid "Information" msgstr "ИнформациÑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2978,7 +2931,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -2986,12 +2939,12 @@ msgstr "Ð’Ñтавить SD-карту" msgid "Insert name here.." msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -3001,44 +2954,44 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка ÑжатиÑ" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3047,20 +3000,20 @@ msgstr "" "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка раÑпаковки (%d) (%li, %li) \n" "Попробуйте звгрузить опÑÑ‚ÑŒ" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "ЗаÑтавка" @@ -3069,11 +3022,11 @@ msgstr "ЗаÑтавка" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ðеверное значение!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -3082,7 +3035,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "Ðеверный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ðеверный файл" @@ -3097,29 +3050,29 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ðеверное Ñохранение" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Italian" msgstr "Italian" @@ -3128,16 +3081,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Japanese" msgstr "Japanese" @@ -3146,7 +3099,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "КОРЕЯ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3156,17 +3109,17 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3186,19 +3139,23 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Язык" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "ПоÑледнее перезапиÑанное Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "ПоÑледнее Ñохранение" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3208,21 +3165,21 @@ msgstr "Влево" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3230,86 +3187,86 @@ msgstr "" "Левый/Правый клик Ð´Ð»Ñ Ð´Ð¾Ð¿. опций\n" "Средний-клик - очиÑтить." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#, fuzzy +msgid "Load State Slot 1" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#, fuzzy +msgid "Load State Slot 2" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#, fuzzy +msgid "Load State Slot 3" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +#, fuzzy +msgid "Load State Slot 4" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 #, fuzzy -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 #, fuzzy -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 #, fuzzy -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 #, fuzzy -msgid "Load State Slot 4" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -#, fuzzy -msgid "Load State Slot 5" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -#, fuzzy -msgid "Load State Slot 6" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -#, fuzzy -msgid "Load State Slot 7" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 -#, fuzzy msgid "Load State Slot 8" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3321,40 +3278,42 @@ msgstr "Загрузить текÑтуры выÑокой четкоÑти из msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -#, fuzzy -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "\"ПривÑзать\" потоки данных к Ñдрам" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Лог" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 #, fuzzy msgid "Log Types" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Окно лога" @@ -3362,10 +3321,6 @@ msgstr "Окно лога" msgid "Lost connection to server!" msgstr "Соединение Ñ Ñервером потерÑно!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3379,12 +3334,12 @@ msgstr "" "MD5 не Ñовпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" @@ -3393,34 +3348,34 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID ÑоздателÑ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Создатель:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Ðа карте памÑти уже еÑÑ‚ÑŒ Ñохранение Ñтой игры" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Карта памÑти уже открыта" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Карта памÑти" @@ -3430,7 +3385,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3449,21 +3404,21 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Мик." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Разное" @@ -3472,7 +3427,7 @@ msgstr "Разное" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3484,16 +3439,16 @@ msgstr "" msgid "Monospaced font" msgstr "Моноширный шрифт" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3508,17 +3463,17 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3606,38 +3561,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "ИмÑ:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "ИмÑ:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Стандартные CGI-файлы (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Ðовый поиÑк" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "След. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "ИÑкать далее" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ðик :" @@ -3645,7 +3600,7 @@ msgstr "Ðик :" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "ISO/WAD-файлов не обнаружено" @@ -3654,8 +3609,8 @@ msgstr "ISO/WAD-файлов не обнаружено" msgid "No banner file found for title %s" msgstr "Ðе найден баннер Ð´Ð»Ñ %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3663,15 +3618,15 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "Ðеверный файл запиÑи" @@ -3681,34 +3636,34 @@ msgstr "Ðеверный файл запиÑи" msgid "No save folder found for title %s" msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ðе равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "ÐеизвеÑтно" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Ðе подключено" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ПримечаниÑ" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "ПримечаниÑ:" @@ -3717,7 +3672,7 @@ msgstr "ПримечаниÑ:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "УведомлениÑ" @@ -3725,28 +3680,28 @@ msgstr "УведомлениÑ" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Кол-во кодов:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Выкл" @@ -3754,60 +3709,56 @@ msgstr "Выкл" msgid "Offset:" msgstr "Смещение:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Выбор файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ‚ÐµÐºÑта Ð´Ð»Ñ ÑƒÑтройÑтва %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: не найдена аудио-карта" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Опции" @@ -3816,15 +3767,15 @@ msgstr "Опции" msgid "Orange" msgstr "Оранжевый" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3834,19 +3785,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3862,7 +3813,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Объединить" @@ -3874,31 +3825,35 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Пауза" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Отлично" @@ -3907,38 +3862,38 @@ msgstr "Отлично" msgid "Perspective %d" msgstr "Точка %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "ЗапуÑк" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #, fuzzy msgid "Play Recording" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Играбельна" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Опции" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3950,62 +3905,62 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 #, fuzzy msgid "Port 4" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4019,11 +3974,11 @@ msgstr "<Ðажмите кнопку>" msgid "Prev Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Предыдущее значение" @@ -4031,7 +3986,7 @@ msgstr "Предыдущее значение" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Профиль" @@ -4039,7 +3994,7 @@ msgstr "Профиль" msgid "Properties" msgstr "СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ОчиÑтить кÑш" @@ -4047,8 +4002,8 @@ msgstr "ОчиÑтить кÑш" msgid "Question" msgstr "ВопроÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Выход" @@ -4067,7 +4022,7 @@ msgstr "" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" @@ -4075,50 +4030,50 @@ msgstr "ПамÑÑ‚ÑŒ" msgid "RUSSIA" msgstr "РОССИЯ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "ÐаÑтоÑщий" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Подключить Wiimote 1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4134,7 +4089,7 @@ msgstr "КраÑÐ½Ð°Ñ Ñлева" msgid "Red Right" msgstr "КраÑÐ½Ð°Ñ Ñправа" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4147,30 +4102,30 @@ msgstr "" "Картинки выглÑдит менее \"блочной\", но Ñто Ñильно Ñнижает " "произврдительноÑÑ‚ÑŒ." -#: 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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Обновить" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 #, fuzzy msgid "Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4180,17 +4135,17 @@ msgstr "" "Показывает только ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹.\n" "Полезно только при отладке." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Результаты" @@ -4207,7 +4162,7 @@ msgstr "Вправо" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "ВидбрациÑ" @@ -4216,125 +4171,120 @@ msgstr "ВидбрациÑ" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "ЗапуÑкает обработку DSP LLE в отдельном потоке (не рекомендуетÑÑ)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "РуÑÑкий" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "безопаÑное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -#, fuzzy -msgid "Sample Rate:" -msgstr "ЧаÑтота" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Сохр." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Сохранить CGI-файл как..." +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#, fuzzy +msgid "Save State Slot 1" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#, fuzzy +msgid "Save State Slot 2" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#, fuzzy +msgid "Save State Slot 3" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +#, fuzzy +msgid "Save State Slot 4" +msgstr "БыÑтрое &Ñохранение" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 #, fuzzy -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 #, fuzzy -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 #, fuzzy -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 #, fuzzy -msgid "Save State Slot 4" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -#, fuzzy -msgid "Save State Slot 5" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -#, fuzzy -msgid "Save State Slot 6" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -#, fuzzy -msgid "Save State Slot 7" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 -#, fuzzy msgid "Save State Slot 8" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Скриншот" @@ -4342,25 +4292,25 @@ msgstr "Скриншот" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "ПоиÑк кодов" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4371,21 +4321,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4403,23 +4353,23 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4436,11 +4386,16 @@ msgstr "" "4:3: ПодравнÑÑ‚ÑŒ картинку к Ñоотношению 4:3.\n" "РаÑÑ‚Ñнуть по окну: Размер картинки ÑоответÑтвует размеру окна." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Указанный файл \"%s\" не ÑущеÑтвует" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Выбранный шрифт" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4450,7 +4405,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4460,11 +4415,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "МеÑтораÑположение ÑенÑора:" @@ -4472,49 +4427,55 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ПоÑледовательный порт â„–1 - тип порта, который иÑпользуют такие уÑтройÑтва " "как Ñетевой адаптер." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "УÑтановить картой памÑти по умолчанию %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Settings..." msgstr "ÐаÑтройки конÑоли (IPL)" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Файл наÑтроек не найден" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Короткое имÑ:" @@ -4523,111 +4484,110 @@ msgstr "Короткое имÑ:" msgid "Shoulder Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Отображать &конÑоль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 #, fuzzy msgid "Show &Log" msgstr "Отображать окно &лога" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Отображать панель &ÑтатуÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Отображать панель &инÑтрументов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Показывать FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Франции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 #, fuzzy msgid "Show Input Display" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Отображать Ñзык:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Отображать игры платформ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "ТайванÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "WAD-файлы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Ðктивирует Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± оÑтановке процеÑÑа ÑмулÑции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4637,28 +4597,40 @@ msgstr "" "во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹, однако в Ñлучае вылета ÑмулÑтора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Показать комментарий" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Показать заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4666,49 +4638,49 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Показывает Ñто ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "ÐеизвеÑтные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 #, fuzzy msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4716,7 +4688,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4726,18 +4698,18 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, fuzzy, c-format msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -4746,7 +4718,7 @@ msgstr "Слот" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4758,11 +4730,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4776,18 +4748,18 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 #, fuzzy msgid "Spanish" msgstr "Spanish" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4799,12 +4771,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -#, fuzzy -msgid "Specify a video backend" -msgstr "Ðазначает видео-плагин" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" @@ -4812,53 +4779,57 @@ msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #, fuzzy msgid "Start Recording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "СтатуÑ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 #, fuzzy msgid "State Saves" msgstr "Удалить Ñохранение" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Стоп" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4867,7 +4838,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "РаÑÑ‚Ñнуть по окну" @@ -4888,12 +4859,12 @@ msgstr "Файл уÑпешно ÑкÑпортирован в %s" msgid "Successfully imported save files" msgstr "Сохранение уÑпешно импортировано" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Язык ÑиÑтемы:" @@ -4901,7 +4872,7 @@ msgstr "Язык ÑиÑтемы:" msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4922,31 +4893,31 @@ msgstr "Ð›ÐµÐ²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Сделать Ñкриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Проверить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "ТекÑтура" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "ОчиÑтить кÑш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -4963,13 +4934,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4992,7 +4963,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Файл %s уже открыт, Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ð¸Ñать заголовок." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не ÑущеÑтвует" @@ -5009,7 +4980,7 @@ msgstr "Ð˜Ð¼Ñ Ð½Ðµ может Ñодержать знак ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5017,11 +4988,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Сохранение, которое вы пытаетеÑÑŒ Ñкопировать имеет неверный размер" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5053,15 +5024,12 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5069,7 +5037,7 @@ msgstr "" "Ðе найден билет Ð´Ð»Ñ 00000001/00000002. Ваша ÐºÐ¾Ð¿Ð¸Ñ NAND Ñкорее вÑего не " "полнаÑ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5081,7 +5049,7 @@ msgstr "" "включена, выключена и неопределена (применÑетÑÑ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¾Ðµ значение данной " "опции)." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5089,16 +5057,17 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " "некоторых играх." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5106,7 +5075,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -5119,7 +5088,7 @@ msgstr "" "ÑмулÑтора на многоÑдерных ÑиÑтемах. Побочным Ñффектом данной опции\n" "ÑвлÑетÑÑ Ð¿Ð¾ÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… багов и/или ошибок в ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Это позволит вам вручную править INI файл Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹" @@ -5128,43 +5097,43 @@ msgstr "Это позволит вам вручную править INI фай msgid "Threshold" msgstr "Порог" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Ðаклон" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Ðазвание" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 #, fuzzy msgid "Toggle All Log Types" msgstr "Включить вÑе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." @@ -5182,7 +5151,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5195,12 +5164,12 @@ msgstr "" msgid "Type" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Порт UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -5208,7 +5177,7 @@ msgstr "" msgid "UNKNOWN" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ÐЕИЗВЕСТÐО" @@ -5231,24 +5200,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Отменить загрузку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "ÐеизвеÑтно" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð¼Ð°Ð½Ð´Ð° DVD %08x - критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -5273,34 +5242,34 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d о msgid "Up" msgstr "Вверх" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Обновить" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 #, fuzzy msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5308,7 +5277,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5317,15 +5286,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Утилиты" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Значение" @@ -5333,23 +5302,23 @@ msgstr "Значение" msgid "Value:" msgstr "Значение:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" @@ -5364,7 +5333,7 @@ msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" msgid "WAD installation failed: error creating ticket" msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5373,16 +5342,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуÑк DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуÑк ELF в неправильном режиме!" @@ -5400,7 +5369,7 @@ msgstr "" "Предупреждение: Советуем Ñоздать резервную копию файлов папки: %s\n" "Хотите продолжить?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5413,7 +5382,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5421,7 +5390,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5429,7 +5398,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5449,7 +5418,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - файл не открыт." @@ -5457,32 +5426,32 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5490,17 +5459,17 @@ msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ файл" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5509,19 +5478,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote подключен" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Включить поддержку мотора" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "ÐаÑтройка Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5545,27 +5514,27 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Выводить в конÑоль" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "СохранÑÑ‚ÑŒ в файл" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "СохранÑÑ‚ÑŒ в файл" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 #, fuzzy msgid "Write to Window" msgstr "Выводить в окно ->" @@ -5585,7 +5554,7 @@ msgstr "XAudio2 ошибка инициализации: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ master voice: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5603,23 +5572,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Ð’Ñ‹ не можете закрыть панель, в которой еÑÑ‚ÑŒ Ñтраницы." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Выберите игру!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Введите название!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцатиричное чиÑло." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5640,25 +5609,25 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Включить ZTP-хак" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ жду ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5670,7 +5639,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5681,7 +5650,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5690,12 +5659,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 #, fuzzy msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5712,7 +5681,7 @@ msgstr "Ðевозможно прочеÑÑ‚ÑŒ данные из файла: %s" msgid "failed to read header" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Чтение кода операции из %x. ПожалуйÑта Ñообщите." @@ -5722,7 +5691,7 @@ msgstr "iCacheJIT: Чтение кода операции из %x. Пожалу msgid "not a wii save or read failure for file header size %x" msgstr "Ñто Ñохранение не от Wii или ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° размером %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5731,7 +5700,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -5743,7 +5712,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 #, fuzzy msgid "| OR" msgstr "| OR" @@ -5754,6 +5723,9 @@ msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Гц" + #~ msgid "&Frame Stepping" #~ msgstr "По&кадровый режим" @@ -5860,10 +5832,36 @@ msgstr "| OR" #~ msgid "Count: %i" #~ msgstr "Счетчик: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Стиль от KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Стиль от VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" + #, fuzzy #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "Отключить оÑвещение" + +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Глубина пикÑелÑ" + +#~ msgid "Disable Textures" +#~ msgstr "Отключить текÑтуры" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5904,6 +5902,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Включить аудиотроттлинг" +#~ msgid "Enable BAT" +#~ msgstr "Включить BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Включить доÑтуп CPU к EFB" @@ -5928,6 +5929,14 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Включить хранитель Ñкрана" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну " +#~ "из функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -5947,6 +5956,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Закрыть Dolphin Ñ ÑмулÑтором" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Ошибка загрузки DSP ROM: %s" @@ -5980,6 +5992,15 @@ msgstr "| OR" #~ "ЕÑли игра завиÑает, или работает только в режиме Интерпретатора,\n" #~ "или вообще приводит к вылету ÑмулÑтора - Ð´Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ *может* помочь." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " +#~ "пропадет в играх, которые его иÑпользуют." + #~ msgid "Input Source" #~ msgstr "ИÑточник ввода" @@ -5999,6 +6020,14 @@ msgstr "| OR" #~ msgid "Load Script..." #~ msgstr "Загрузить Ñкрипт..." +#, fuzzy +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO)" + +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "\"ПривÑзать\" потоки данных к Ñдрам" + #~ msgid "Lua Script Console" #~ msgstr "LUA-конÑоль" @@ -6033,6 +6062,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "Открыть" +#~ msgid "Opens the debugger" +#~ msgstr "Открывает отладчик" + +#~ msgid "Opens the logger" +#~ msgstr "Открывает окно лога" + #~ msgid "Plugins" #~ msgstr "Плагины" @@ -6055,6 +6090,10 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "ЗапуÑк Ñкрипта...\n" +#, fuzzy +#~ msgid "Sample Rate:" +#~ msgstr "ЧаÑтота" + #~ msgid "Scale:" #~ msgstr "МаÑштаб:" @@ -6083,6 +6122,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Показывать кол-во отриÑовываемых кадров в Ñекунду." +#~ msgid "Show this help message" +#~ msgstr "Показывает Ñто ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6100,6 +6142,10 @@ msgstr "| OR" #~ msgid "Sonic and the Black Knight" #~ msgstr "Sonic and the Black Knight" +#, fuzzy +#~ msgid "Specify a video backend" +#~ msgstr "Ðазначает видео-плагин" + #~ msgid "Specify an audio plugin" #~ msgstr "Выберите аудио-плагин" @@ -6112,6 +6158,9 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать Ñкриншот\t" +#~ msgid "Theme selection went wrong" +#~ msgstr "Ошибка выбора темы" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index f3bba97086..b5d3a61487 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "&" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Igra" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NE" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -55,14 +55,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -142,156 +135,156 @@ msgstr "%sExportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&O" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Bootuj sa DVD drajvera" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Trazi \"ISO\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Chit Meneger " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulacija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Graficke Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Hotkey Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Loaduj Savestate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memorijska kartica (Meneger za GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memorija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otvori..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Pribor/Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Refresuj listu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Alat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Pogledaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -307,27 +300,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEPOZNAT/O)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(iskljucen/o)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -335,44 +328,45 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Netplay prozor je vec otvoren!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Nijedna igra trenutno nije pokrenuta." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -391,13 +385,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodovi" @@ -405,19 +399,19 @@ msgstr "AR Kodovi" msgid "About Dolphin" msgstr "O Dolphin-u" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -426,8 +420,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Akcija" @@ -441,42 +435,43 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -484,27 +479,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter" @@ -513,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Dodaj Patch " @@ -525,13 +520,13 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Dodaj..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresa :" @@ -557,68 +552,74 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -630,31 +631,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Primeni " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -662,12 +663,12 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -675,12 +676,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -688,24 +689,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -714,19 +715,11 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registri" @@ -735,17 +728,17 @@ msgstr "&Registri" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Nazad " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -758,16 +751,16 @@ msgstr "U nazad" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Baner:" @@ -775,11 +768,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -791,7 +784,7 @@ msgstr "Bas" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -807,47 +800,53 @@ msgstr "Blue left " msgid "Blue Right" msgstr "Blue right " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Donji deo/dno" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ostecen/a/nje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Trazi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -860,29 +859,19 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -891,7 +880,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Odustani" @@ -907,7 +896,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -915,24 +904,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -940,28 +929,28 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centar " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Promeni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Promeni &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Promeni Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Promeni Igru" @@ -982,11 +971,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat/Caskanje" @@ -994,47 +982,47 @@ msgstr "Chat/Caskanje" msgid "Cheat Code" msgstr "Chit kod" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Trazi Chit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1042,14 +1030,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1063,8 +1051,8 @@ msgstr "Klasik/a" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Ocisti" @@ -1076,22 +1064,22 @@ msgstr "" "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras " "manualno zaustaviti igru." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zatvori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1099,95 +1087,95 @@ msgstr "Kod:" msgid "Command" msgstr "Komanda" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Podesi" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Povezivanje..." @@ -1203,16 +1191,16 @@ msgstr "Kontrola" msgid "Convert to GCI" msgstr "Konvertuj u GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1221,7 +1209,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1239,18 +1227,18 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1259,27 +1247,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Zemlja:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Kreiraj AR Kod" @@ -1288,24 +1276,7 @@ msgstr "Kreiraj AR Kod" 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:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Kreator " @@ -1313,11 +1284,11 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Izseci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1328,12 +1299,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1341,15 +1312,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1357,36 +1328,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1398,16 +1369,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1419,11 +1390,11 @@ msgstr "" msgid "Dead Zone" msgstr "Mrtva Zona " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1431,24 +1402,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1457,11 +1428,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Obrisi save" @@ -1470,12 +1441,12 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Pitanje " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detekuj" @@ -1486,13 +1457,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1514,29 +1485,17 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Onemoguci \"Lighting\"" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Onemoguci \"Textures\" " - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1545,7 +1504,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1555,14 +1514,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1571,11 +1523,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Error tokom ucitavanje diska" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1586,20 +1538,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Graficka Podesavanja " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sajt" @@ -1607,54 +1563,59 @@ msgstr "Dolphin &Web Sajt" msgid "Dolphin Configuration" msgstr "Dolphin podesavanja/konfiguracija" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1663,65 +1624,65 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1731,11 +1692,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1743,7 +1704,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1751,12 +1712,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1764,15 +1725,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1781,7 +1742,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1791,19 +1752,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1813,72 +1774,67 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1887,17 +1843,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1905,7 +1861,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1913,24 +1869,34 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1938,13 +1904,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1955,14 +1921,14 @@ msgstr "" msgid "End" msgstr "Kraj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1980,17 +1946,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2025,36 +1991,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2062,15 +2024,15 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2082,52 +2044,52 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2135,7 +2097,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2143,15 +2105,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2179,6 +2141,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2248,47 +2215,42 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Ucitaj Native Mipmaps" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2301,7 +2263,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2314,47 +2276,47 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2362,7 +2324,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2370,7 +2332,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2387,57 +2349,57 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2445,21 +2407,21 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2468,57 +2430,61 @@ msgstr "" msgid "GCMic Configuration" msgstr "Dolphin podesavanja/konfiguracija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Igra je vec pokrenuta!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Igra nije pokrenuta!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2531,42 +2497,42 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Opcije Uredjaja " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Nemacki " -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Graficke opcije/podesavanja/konfiguracije..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2577,7 +2543,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2597,11 +2563,11 @@ msgstr "" msgid "Guitar" msgstr "Gitara " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2609,11 +2575,11 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2621,7 +2587,7 @@ msgstr "" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2631,15 +2597,15 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2652,8 +2618,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2661,26 +2627,26 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2689,31 +2655,31 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2721,33 +2687,33 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2756,7 +2722,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2765,7 +2731,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2773,23 +2739,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2799,26 +2765,16 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " -"\"lightning\" nestane u igrama koje ga koriste." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info " @@ -2826,7 +2782,7 @@ msgstr "Info " msgid "Information" msgstr "Informacija " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2838,7 +2794,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2846,12 +2802,12 @@ msgstr "" msgid "Insert name here.." msgstr "Ubaci ime ovde..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2860,62 +2816,62 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Uvod" @@ -2924,11 +2880,11 @@ msgstr "Uvod" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2937,7 +2893,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2949,29 +2905,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italianski " @@ -2979,16 +2935,16 @@ msgstr "Italianski " msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanski " @@ -2996,7 +2952,7 @@ msgstr "Japanski " msgid "KOREA" msgstr "KOREA " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3005,17 +2961,17 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korejski " @@ -3033,19 +2989,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3055,98 +3015,98 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Ucitaj State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Ucitaj State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Ucitaj State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Ucitaj State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Ucitaj State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Uci State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Ucitaj State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Ucitaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3157,36 +3117,40 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3194,10 +3158,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3209,12 +3169,12 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3223,34 +3183,34 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3260,7 +3220,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3279,20 +3239,20 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3301,7 +3261,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3313,16 +3273,16 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3337,17 +3297,17 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3435,38 +3395,38 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3474,7 +3434,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3483,8 +3443,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3492,15 +3452,15 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3509,33 +3469,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3544,7 +3504,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3552,28 +3512,28 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Izskljucen/o" @@ -3581,60 +3541,56 @@ msgstr "Izskljucen/o" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otvori fajl..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcije " @@ -3643,15 +3599,15 @@ msgstr "Opcije " msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3661,19 +3617,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3689,7 +3645,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3701,31 +3657,35 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauza " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfektno " @@ -3734,37 +3694,37 @@ msgstr "Perfektno " msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Opcije " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3776,54 +3736,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3836,11 +3796,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3848,7 +3808,7 @@ msgstr "" msgid "Print" msgstr "Stampaj " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -3856,7 +3816,7 @@ msgstr "Profil" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3864,8 +3824,8 @@ msgstr "" msgid "Question" msgstr "Pitanje " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Izadji " @@ -3883,7 +3843,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM " @@ -3891,48 +3851,48 @@ msgstr "RAM " msgid "RUSSIA" msgstr "Rusija" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3948,7 +3908,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3957,46 +3917,46 @@ msgid "" "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 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset/Restart " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Rezultati " @@ -4013,7 +3973,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4022,116 +3982,112 @@ msgstr "" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Siguran " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Snimaj" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Snimaj GCI kao..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Snimaj State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Snimaj State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Snimaj State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Snimaj State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Snimaj State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Snimaj State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Snimaj State Slot 7 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Snimaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4139,24 +4095,24 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Trazi Chit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4167,21 +4123,21 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Izaberi " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4199,23 +4155,23 @@ msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4226,11 +4182,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Odabrani font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4240,7 +4200,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4250,11 +4210,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Isprati" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4262,46 +4222,52 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4310,130 +4276,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4441,47 +4418,47 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4489,7 +4466,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4499,17 +4476,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4517,7 +4494,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4529,11 +4506,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4547,17 +4524,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4569,11 +4546,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4581,51 +4554,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Pokreni &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Pokreni Sni&manje" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Pokreni Snimanje" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr " Zaustavi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4634,7 +4611,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4655,12 +4632,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4668,7 +4645,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4689,32 +4666,32 @@ msgstr "" 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 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "Texture" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4730,13 +4707,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4755,7 +4732,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4772,7 +4749,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4780,11 +4757,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4815,40 +4792,37 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4856,7 +4830,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4864,7 +4838,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4873,40 +4847,40 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4924,7 +4898,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4936,12 +4910,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4949,7 +4923,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "(NEPOZNAT/O)" @@ -4972,24 +4946,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Nepoznat/o" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -5014,33 +4988,33 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Updejt " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5048,7 +5022,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5057,15 +5031,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5073,23 +5047,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Jacina zvuka " @@ -5103,7 +5077,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5112,16 +5086,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" @@ -5137,7 +5111,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5151,7 +5125,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5159,7 +5133,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5167,7 +5141,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5187,7 +5161,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5195,31 +5169,31 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5227,17 +5201,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5246,19 +5220,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "&Wiimote Opcije" @@ -5279,26 +5253,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Radi..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5317,7 +5291,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5335,23 +5309,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5369,25 +5343,25 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ cekanje ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5399,7 +5373,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5410,7 +5384,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5419,11 +5393,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5440,7 +5414,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5450,7 +5424,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5459,7 +5433,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5471,7 +5445,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ILI" @@ -5493,6 +5467,12 @@ msgstr "| ILI" #~ msgid "Danish" #~ msgstr "Danski" +#~ msgid "Disable Lighting" +#~ msgstr "Onemoguci \"Lighting\"" + +#~ msgid "Disable Textures" +#~ msgstr "Onemoguci \"Textures\" " + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5507,6 +5487,10 @@ msgstr "| ILI" #~ "Onemoguci alpha-setting pass.\n" #~ "Onemogucava neke efekte ali moze pomoci performansu/brzini" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Ucitaj Native Mipmaps" + #~ msgid "GFX Config" #~ msgstr "GFX podesavanja" @@ -5514,6 +5498,15 @@ msgstr "| ILI" #~ msgid "Hide Shader Errors" #~ msgstr "Error tokom ucitavanje diska" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " +#~ "\"lightning\" nestane u igrama koje ga koriste." + #~ msgid "OK" #~ msgstr "OK" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 7bfe0fe02b..15643f38d3 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2012-06-11 23:41+0200\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Turkish\n" "X-Poedit-Country: TURKEY\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(Göstermek için çok fazla)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Oyun :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! YOK" @@ -48,7 +48,7 @@ msgstr "" "\"%s\" hatalı bir GCM veya ISO dosyası, veya herhangi bir GC veya Wii kalıbı " "deÄŸil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -58,14 +58,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i baÄŸlandı" @@ -154,156 +147,156 @@ msgstr "%sGCI Ver%s" msgid "%sImport GCI%s" msgstr "%sGCI Al%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& VE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Hakkında... (&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVD Sürücüden Önyükle... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "Kesme noktaları (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "Kalıplara Gözat... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Hile Yöneti&cisi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emülasyon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "Dosya (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "GeliÅŸmiÅŸ Kareleme (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "Tam Ekran (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "Yardım (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "TuÅŸ ayarları (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Durumu Yük&le" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GC Hafıza Kartı Yönetici (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Hafıza (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Aç...(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "Seçenekler (&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Duraklat (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "Özellikler (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Salt okunu&r mod" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "Listeyi Yenile (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "Kayıtla&r" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "Sıfı&rla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Ses" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Durdur (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Araçlar (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "Görüntü (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "Görünüm (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -319,27 +312,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(BÄ°LÄ°NMEYEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(kapalı)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -347,46 +340,48 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Bir NetPlay penceresi zaten açık!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Bir oyun ÅŸu anda düzgün çalışmıyor." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Desteklenen bir BlueTooth sürücüsü bulunamadı!\n" "(Sadece Microsoft bluetooth stack desteklenir.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -420,13 +415,13 @@ msgstr "" "\n" "TCP baÄŸlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodları" @@ -434,19 +429,19 @@ msgstr "AR Kodları" msgid "About Dolphin" msgstr "Dolphin Hakkında" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "DoÄŸruluk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Emin deÄŸilseniz, bunun yerine EFB'den Doku'ya seçeneÄŸini iÅŸaretleyin." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Eylem" @@ -479,14 +474,14 @@ msgstr "" "Suçlu Kod:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "Action Replay Hatası: Kod eklemede (%08x : adres = %08x) hatalı boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -495,7 +490,7 @@ msgstr "" "Action Replay Hatası: Doldurma ve kaydırmada (%08x : adres = %08x) hatalı " "boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -504,7 +499,7 @@ msgstr "" "Action Replay Hatası: Anabellek yazma ve doldurmasında (%08x : adres = %08x) " "hatalı boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -513,15 +508,16 @@ msgstr "" "Action Replay Hatası: Ä°ÅŸaretleyiciye yazarken (%08x : address = %08x) hatalı " "boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Hatası: Hafıza kopyalamada (%08x) hatalı deÄŸer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -529,27 +525,27 @@ msgstr "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Hatası: Hatalı AR kod satırı: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Åžartlı Kod: Hatalı Boyut %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Hatalı Normal Kod Türü %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kod %i: Hatalı alt tür %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kod 0: Hatalı alt tür %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Dönüştürücü:" @@ -558,11 +554,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Yama Ekle" @@ -570,13 +566,13 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Ekle..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -616,55 +612,56 @@ msgstr "" "\n" "NOT: Ulaşılan deÄŸerler için GiriÅŸ Penceresi veya Konsolu denetleyin." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -673,19 +670,23 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analiz et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtreleme:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "KeskinleÅŸtirme:" @@ -697,15 +698,15 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Uygula" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -715,16 +716,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arapça" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,14 +733,14 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -747,12 +748,12 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En az bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" @@ -760,24 +761,24 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Otomatik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Otomatik (640x528'in katları)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Otomatik (Pencere Boyutu)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Pencere Boyutunu Otomatik Ayarla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -787,23 +788,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"MipMap'leri hafızadan çözmek yerine otomatik olarak oluÅŸtur. \n" -"Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretli bırakın." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP kaydı" @@ -811,16 +800,16 @@ msgstr "BP kaydı" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Çözücü Ayarları" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Çözücü:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Arkaplanda GiriÅŸ" @@ -833,16 +822,16 @@ msgstr "Geri" msgid "Bad File Header" msgstr "Kötü Dosya Başı" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "AfiÅŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "AfiÅŸ Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "AfiÅŸ:" @@ -850,11 +839,11 @@ msgstr "AfiÅŸ:" msgid "Bar" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -866,7 +855,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blok Ayırma Tablosu saÄŸlaması baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloklar" @@ -882,47 +871,53 @@ msgstr "Mavi Sol" msgid "Blue Right" msgstr "Mavi SaÄŸ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Alt" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "BaÄŸlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Bozuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Tampon:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Düğmeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -934,35 +929,19 @@ msgstr "C ÇubuÄŸu" msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP kaydı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel olarak " -"hesapla. \n" -"Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok azında " -"piksel başına derinlik hesaplaması gereklidir.\n" -"\n" -"Emin deÄŸilseniz, iÅŸaretli bırakın." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -977,7 +956,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Ä°ptal" @@ -993,7 +972,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1004,7 +983,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1012,18 +991,18 @@ msgstr "" "Bu dosya bir hafıza kartı olarak kullanılamıyor.\n" "2 slot için de aynı dosyayı deniyor olabilir misiniz?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" @@ -1031,28 +1010,28 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalanca" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Merkez" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "&Diski DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Diski DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Oyunu DeÄŸiÅŸtir" @@ -1073,12 +1052,11 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Sohbet" @@ -1086,47 +1064,47 @@ msgstr "Sohbet" msgid "Cheat Code" msgstr "Hile Kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Hile Arama" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Bölüm Düzgünlüğünü Denetle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Düzgünlük denetleniyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1134,7 +1112,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1142,8 +1120,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp: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" @@ -1157,8 +1135,8 @@ msgstr "Klasik" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Temizle" @@ -1170,22 +1148,22 @@ msgstr "" "Oyun çalışırken istemci baÄŸlantısı kesildi!! NetPlay iptal edildi. Oyunu " "elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Kapat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Yapıla&ndır" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kod Bilgisi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1193,95 +1171,95 @@ msgstr "Kod:" msgid "Command" msgstr "Komut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Yapılandırma" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Yapılandır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Denetimleri Yapılandır" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Kolları Yapılandır" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote'u BaÄŸla : %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1'i BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2'yi BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1297,16 +1275,16 @@ msgstr "Denetim" msgid "Convert to GCI" msgstr "GCI'ya dönüştür" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Çekirdek" @@ -1315,7 +1293,7 @@ msgstr "Çekirdek" msgid "Could not create %s" msgstr "%s oluÅŸturulamadı." -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Çözücü %s baÅŸlatılamadı." @@ -1336,12 +1314,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1349,7 +1327,7 @@ msgstr "" "Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun ÅŸu anda çalışıyor! \n" "(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1361,11 +1339,11 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1373,17 +1351,17 @@ msgstr "" "Çekirdek baÅŸlatılamadı. \n" "Yapılandırmanızı denetleyin." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Ãœlke:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR Kodu OluÅŸtur" @@ -1392,28 +1370,7 @@ msgstr "AR Kodu OluÅŸtur" msgid "Create new perspective" msgstr "Yeni perspektif oluÅŸtur" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." - -#: 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 " -"yayınlanmıştır." - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "OluÅŸturan:" @@ -1421,11 +1378,11 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Kırp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1439,13 +1396,13 @@ msgstr "" msgid "Crossfade" msgstr "GeçiÅŸli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "wx Dosya Seçiciden sonra ÅŸu anki konum %s 'den %s 'ye deÄŸiÅŸtirilmiÅŸtir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1453,15 +1410,15 @@ msgstr "Özel Görüntüleme Hilesi" msgid "Custom Projection Hack Settings" msgstr "Özel Görüntüleme Hilesi Ayarları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Çekçe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1469,36 +1426,36 @@ msgstr "D" msgid "D-Pad" msgstr "Yön TuÅŸları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1510,16 +1467,16 @@ msgstr "DVDLowRead - Kritik Hata: Birimden okuma baÅŸarısız." msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Kritik Hata: Birimden okuma baÅŸarısız." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Tarih:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro dosyaları (*.sav)" @@ -1531,11 +1488,11 @@ msgstr "Datel MaxDrive/Pro dosyaları (*.sav)" msgid "Dead Zone" msgstr "Ölü Bölge" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Hata ayıklama" @@ -1543,24 +1500,24 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1569,11 +1526,11 @@ msgid "Default font" msgstr "Varsayılan yazı tipi" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Kaydı sil" @@ -1582,11 +1539,11 @@ msgstr "Kaydı sil" msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediÄŸinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Açıklama" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Belirle" @@ -1598,13 +1555,13 @@ msgid "" msgstr "" "DVD'nin alabileceÄŸi veriden daha fazlasını sığdırma giriÅŸimi algılandı." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1628,28 +1585,16 @@ msgstr "" "Konum doÄŸrulama baÅŸarısız \n" "ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Işıklandırmayı Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -msgid "Disable Per-Pixel Depth" -msgstr "Piksel DerinliÄŸini Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Dokuları Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1663,7 +1608,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1679,17 +1624,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Dokulandırmayı iptal et. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretsiz bırakın." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1698,11 +1633,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Disk Okuma Hatası" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1716,20 +1651,24 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Görüntü Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sitesi" @@ -1737,32 +1676,32 @@ msgstr "Dolphin &Web Sitesi" msgid "Dolphin Configuration" msgstr "Dolphin Yapılandırması" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Taklit Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1770,7 +1709,7 @@ msgstr "" "Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1778,16 +1717,21 @@ msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " "oyunları görebilirsiniz." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "AÅŸağı" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu kod indirildi. (%lu eklendi.)" @@ -1796,27 +1740,27 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dokuları Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1827,7 +1771,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1837,7 +1781,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1847,24 +1791,24 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Flemenkçe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Çıkış (&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Kopyaları" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1877,11 +1821,11 @@ msgstr "" msgid "EUROPE" msgstr "AVRUPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Erken Hafıza Güncellemeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Düzen" @@ -1889,7 +1833,7 @@ msgstr "Düzen" msgid "Edit ActionReplay Code" msgstr "Action Replay Kodunu Düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" @@ -1897,12 +1841,12 @@ msgstr "Yapılandırmayı Düzenle" msgid "Edit Patch" msgstr "Yamayı Düzenle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Düzenle..." @@ -1910,15 +1854,15 @@ msgstr "Düzenle..." msgid "Effect" msgstr "Etki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Gömülü Çerçeve Tamponu" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emülasyon Ä°ÅŸlem Birimi zaten çalışıyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1932,7 +1876,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, bunun yerine sanal XFB emülasyonunu seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1948,19 +1892,19 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emülasyon Durumu:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ä°zin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1976,72 +1920,67 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "BAT'a Ä°zin Ver" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "BoÅŸta Atlamaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2055,7 +1994,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2063,11 +2002,11 @@ msgstr "" "Disk eriÅŸimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Sayfalara izin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2081,7 +2020,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2093,7 +2032,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2101,21 +2040,28 @@ msgstr "" "The Legend of Zelda: Twilight Princess oyununu hızlandırır. DiÄŸer tüm " "oyunlarda iptal edin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ãœnitesi " -"iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " -"Kapalı = Hızlı)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2127,7 +2073,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2135,7 +2081,7 @@ msgstr "" "Hafıza Yönetim Ãœnitesini etkinleÅŸtirir. Bazı oyunlarda gereklidir. (Açık = " "Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2149,14 +2095,14 @@ msgstr "" msgid "End" msgstr "Son" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Ä°ngilizce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "GeliÅŸtirmeler" @@ -2174,17 +2120,17 @@ msgstr "GiriÅŸ %d/%d" msgid "Entry 1/%d" msgstr "GiriÅŸ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "EÅŸit" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Hata" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2223,36 +2169,32 @@ msgstr "Özel durum iÅŸleyicisi - bellek alanı altında eriÅŸim. %08llx%08llx" msgid "Execute" msgstr "Yürüt" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphin Emülatöründen Çık" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Verme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Dosya Ver" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Çekimi Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2260,15 +2202,15 @@ msgstr "Tüm Kayıtları Ver" msgid "Export failed, try again?" msgstr "Verme baÅŸarısız, tekrar dene?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Kaydı farklı ver..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2280,52 +2222,52 @@ msgstr "Ä°lave Parametre" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ä°lave Parametre sadece \"Metroid: Other M\" oyununda kullanışlıdır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Tüm Dosyaları GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader'i GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL'ü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Konumu GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Dosyayı GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Bayt'ı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Oynatıcısı" @@ -2333,7 +2275,7 @@ msgstr "FIFO Oynatıcısı" msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2341,15 +2283,15 @@ msgstr "FST Boyutu:" msgid "Failed to Connect!" msgstr "BaÄŸlantı baÅŸarısız!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Dinleme baÅŸarısız!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Kod indirme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2385,6 +2327,11 @@ msgstr "bthprops.cpl yüklenemedi." msgid "Failed to load hid.dll" msgstr "hid.dll yükleme baÅŸarısız." +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "%s için baÅŸlık yazılamadı." + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "banner.bin okunamadı." @@ -2467,23 +2414,19 @@ msgstr "%s için baÅŸlık yazılamadı." msgid "Failed to write header for file %d" msgstr "%d dosyası için baÅŸlık yazılamadı." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Farsça" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Hızlı MipMap'ler" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2491,23 +2434,23 @@ msgstr "" "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, " "bayt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Dosya Bilgisi" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Dosya kod içermemektedir." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Dosya .gci 'ye dönüştürüldü." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2524,7 +2467,7 @@ msgstr "" "Dosya \"%s\" uzantısına sahip \n" "doÄŸru uzantılar .raw ve .gcp 'dir." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Dosya bir hafıza kartı olarak tanınamadı." @@ -2537,47 +2480,47 @@ msgstr "Dosya sıkıştırılmadı." msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Sonrakini bul" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Öncekini bul" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Ä°lk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9 'a zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Doku Filtrelemesine Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2589,7 +2532,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2601,7 +2544,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2623,56 +2566,56 @@ msgstr "" msgid "Forward" msgstr "Ä°leri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Bunun için %d sonuçlarını bul: '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Çerçeve" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Çerçeve" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Çerçeve Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Çerçeve Aralığı" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Serbest Bakış" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Fransızca" @@ -2680,20 +2623,20 @@ msgstr "Fransızca" msgid "Frets" msgstr "Perdeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Buradan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Tam Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Tam Ekran Çözünürlüğü:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" @@ -2701,57 +2644,61 @@ msgstr "GCI Dosyası (*.gci)" msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Oyun ID'si:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Oyun zaten çalışıyor!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Oyun çalışmıyor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Kodları" @@ -2768,41 +2715,41 @@ msgstr "" "bin dosyası ekleyerek Dolphin'i yeniden baÅŸlatıp, yerel kod iÅŸleyicini " "kullanmayı deneyebilirsiniz.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Genel" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Genel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Almanca" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Ana sayfa kod liste boyutundan (%lu) daha büyük." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Daha Büyük" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2818,7 +2765,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Yunanca" @@ -2838,11 +2785,11 @@ msgstr "YeÅŸil SaÄŸ" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY çaÄŸrıldı, lütfen bildirin!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hack'ler" @@ -2850,11 +2797,11 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Ä°branice" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Yükseklik" @@ -2862,7 +2809,7 @@ msgstr "Yükseklik" msgid "Help" msgstr "Yardım" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2878,15 +2825,15 @@ msgstr "" "\n" "Sayanora!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Fare Ä°ÅŸaretçisini Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2900,8 +2847,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Barındırma" @@ -2909,26 +2856,26 @@ msgstr "Barındırma" msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Macarca" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Bilinmeyen biletten veri alma denemesi: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2941,31 +2888,31 @@ msgstr "" "BaÅŸlık ID %016llx.\n" " Dolphin çakılacak gibi gözüküyor." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Ayarları" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "Kızılötesi" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Kızılötesi Ä°ÅŸaretleyici" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -2973,11 +2920,11 @@ msgstr "Kalıp Konumları" msgid "ITALY" msgstr "Ä°TALYA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2985,14 +2932,14 @@ msgstr "" "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " "Mario oyunları tarafından kullanılır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " "= Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3002,11 +2949,11 @@ msgstr "" "ile Ses hızlandırıcısı kullanın. (Ses takılmalarını düzeltebilir, ancak " "(oyuna baÄŸlı olarak) sürekli gürültüye de neden olabilir.)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Birim deÄŸiÅŸimini yoksay" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3020,7 +2967,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3034,7 +2981,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Kayıt Al" @@ -3042,7 +2989,7 @@ msgstr "Kayıt Al" msgid "Import failed, try again?" msgstr "Alma baÅŸarısız,tekrar dene?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3050,11 +2997,11 @@ msgstr "" "Alınan dosya gsc uzantısına sahip\n" "ama baÅŸlığı düzgün deÄŸil." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Alınan dosyanın uzunluÄŸu hatalı." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3062,7 +3009,7 @@ msgstr "" "Alınan dosya sav uzantısına sahip\n" "ama baÅŸlığı düzgün deÄŸil." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3074,27 +3021,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakır." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Performansı artırır ancak bazı oyunların karanlık kalmasına neden " -"olabilir. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretsiz bırakın." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Oyun İçi" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Oyun-İçi" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Bilgi" @@ -3102,7 +3038,7 @@ msgstr "Bilgi" msgid "Information" msgstr "Bilgilendirme" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "GiriÅŸ" @@ -3114,7 +3050,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3122,11 +3058,11 @@ msgstr "SD Kart Ekle" msgid "Insert name here.." msgstr "Adı buraya yazın..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3137,23 +3073,23 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Düzgünlük Denetleme Hatası" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Düzgünlük denetlemesi tamamlandı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3162,19 +3098,19 @@ msgstr "" "Bölüntü %d için düzgünlük denetlemesi baÅŸarısız. Dökümünüz hasar görmüş veya " "yanlış yamanmış olabilir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Arabirim Ayarları" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "İç LZO Hatası - Sıkıştırma baÅŸarısız." -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3183,19 +3119,19 @@ msgstr "" "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%li, %li) \n" "Durumu tekrar yüklemeyi deneyin." -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Ä°ntro" @@ -3204,11 +3140,11 @@ msgstr "Ä°ntro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Yanlış boyut (%x) veya Sihirli kelime (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Hatalı DeÄŸer!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum giriÅŸi" @@ -3217,7 +3153,7 @@ msgstr "Hatalı bat.map veya konum giriÅŸi" msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Hatalı dosya" @@ -3232,29 +3168,29 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Geçersiz arama parametre(ler)i (nesne seçilmedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "Geçersiz arama dizesi (sadece düz dize uzunluÄŸu destekleniyor)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Hatalı durum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Ä°talyanca" @@ -3262,16 +3198,16 @@ msgstr "Ä°talyanca" msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonca" @@ -3279,7 +3215,7 @@ msgstr "Japonca" msgid "KOREA" msgstr "KORE" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3289,17 +3225,17 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Pencereyi üstte tut" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korece" @@ -3317,19 +3253,23 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Dil:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Son Ãœzerine Yazılan Durum" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Son Kayıtlı Durum" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3339,8 +3279,8 @@ msgstr "Sol" msgid "Left Stick" msgstr "Sol Çubuk" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3348,7 +3288,7 @@ msgstr "" "TuÅŸ belirlemek için sol tıklatın. \n" "Temizlemek için space'ye basın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3358,7 +3298,7 @@ msgstr "" "temizlemek için orta, \n" "daha çok seçenek için saÄŸ tıklatın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3366,76 +3306,76 @@ msgstr "" "Daha çok seçenek için sol veya saÄŸ, \n" "temizlemek için orta tıklatın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPS Sınırlaması" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Durumu Yükle : 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Durumu Yükle : 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Durumu Yükle : 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Durumu Yükle : 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Durumu Yükle : 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Durumu Yükle : 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Durumu Yükle : 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Durumu Yükle : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3449,36 +3389,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -msgid "Lock Threads to Cores" -msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "GeçmiÅŸ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "GeçmiÅŸ Yapılandırması" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "GeçmiÅŸ Türü" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını " +"göster. \n" +"\n" +"Emin deÄŸilseniz, iÅŸaretsiz bırakın." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "GeçmiÅŸ" @@ -3486,10 +3435,6 @@ msgstr "GeçmiÅŸ" msgid "Lost connection to server!" msgstr "Sunucu baÄŸlantısı kayboldu!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Düşük düzeyde (LLE) veya Yüksek düzeyde (HLE) ses." - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Düğmesi" @@ -3503,12 +3448,12 @@ msgstr "" "MD5 eÅŸleÅŸmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" @@ -3517,33 +3462,33 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Yapımcı:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "En fazla" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Hafıza kartı bu baÅŸlık için zaten bir kayda sahip. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Hafıza kartı zaten açık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3555,7 +3500,7 @@ msgstr "" "Hafıza Kartı Yöneticisi Uyarısı-Kullanmadan önce yedekleme yapın, " "düzeltilmiÅŸ olması gerekiyor ama bozuk ÅŸeyler olabilir." -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3580,20 +3525,20 @@ msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3602,7 +3547,7 @@ msgstr "ÇeÅŸitli Ayarlar" msgid "Modifier" msgstr "DeÄŸiÅŸtirici" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3618,16 +3563,16 @@ msgstr "" msgid "Monospaced font" msgstr "BoÅŸluklu yazı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3649,7 +3594,7 @@ msgstr "" msgid "Multiply" msgstr "Çarp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3657,11 +3602,11 @@ msgstr "" "WiiMote hoparlörünün sesini kapatır. Gerçek WiiMote'lardaki rastgele " "baÄŸlantı kesilmelerini önler. Taklit WiiMote'ları etkilemez." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOT: Yayın boyutu asıl veri boyutuyla eÅŸleÅŸmiyor.\n" @@ -3749,38 +3694,38 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Ä°sim:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Ä°sim:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "DoÄŸal GCI Dosyaları(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Sonraki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Sonraki Tarama" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Takma Ad :" @@ -3788,7 +3733,7 @@ msgstr "Takma Ad :" msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Kalıp bulunamadı" @@ -3797,8 +3742,8 @@ msgstr "Kalıp bulunamadı" msgid "No banner file found for title %s" msgstr "BaÅŸlık %s için afiÅŸ dosyası bulunamadı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Açıklama yok" @@ -3806,15 +3751,15 @@ msgstr "Açıklama yok" msgid "No docking" msgstr "YerleÅŸtirme yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Dosya Yüklenmedi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "BoÅŸ dizin indeks giriÅŸi yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "ÇekilmiÅŸ Dosya Yok" @@ -3823,33 +3768,33 @@ msgstr "ÇekilmiÅŸ Dosya Yok" msgid "No save folder found for title %s" msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "EÅŸit DeÄŸil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "BaÄŸlı deÄŸil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notlar" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notlar:" @@ -3858,7 +3803,7 @@ msgstr "Notlar:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Duyuru" @@ -3866,28 +3811,28 @@ msgstr "Duyuru" msgid "Num Lock" msgstr "Sayı Kilidi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Kod Sayısı:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuck" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuck Hızlandırma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Nesne" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Kapalı" @@ -3895,60 +3840,56 @@ msgstr "Kapalı" msgid "Offset:" msgstr "Uzantı:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Sadece %d blok kullanılabilir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Dosya aç..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Sürücü %s için baÄŸlam oluÅŸturulamıyor" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Ses sürücüleri bulunamıyor" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Sürücü %s açılamıyor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Hata ayıklayıcıyı açar" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "GeçmiÅŸi açar" - -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Seçenekler" @@ -3957,7 +3898,7 @@ msgstr "Seçenekler" msgid "Orange" msgstr "Turuncu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3967,8 +3908,8 @@ msgstr "" "Tüm kayıtları vermek için saÄŸ tıklatın, \n" "ve kayıtları yeni bir hafıza kartına alın.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "DiÄŸer" @@ -3980,19 +3921,19 @@ msgstr "" "Oyun çalışırken diÄŸer istemcinin baÄŸlantısı kesildi!! NetPlay iptal edildi. " "Oyunu elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Çıkış" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Çekimi Oynat... (&L)" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Kol" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Kol" @@ -4008,7 +3949,7 @@ msgstr "Sayfa AÅŸağı" msgid "Page Up" msgstr "Sayfa Yukarı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "EÅŸleÅŸtir" @@ -4020,30 +3961,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametreler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Duraklat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Mükemmel" @@ -4052,36 +3997,36 @@ msgstr "Mükemmel" msgid "Perspective %d" msgstr "Perspektif %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Oynat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Çekimi Oynat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Oynanabilir" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Oynatma Seçenekleri" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4093,54 +4038,54 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluÅŸturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" @@ -4153,11 +4098,11 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Önceki DeÄŸer" @@ -4165,7 +4110,7 @@ msgstr "Önceki DeÄŸer" msgid "Print" msgstr "Yazdır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4173,7 +4118,7 @@ msgstr "Profil" msgid "Properties" msgstr "Özellikler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ÖnbelleÄŸi Temizle" @@ -4181,8 +4126,8 @@ msgstr "ÖnbelleÄŸi Temizle" msgid "Question" msgstr "Soru" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Çık" @@ -4200,7 +4145,7 @@ msgstr "R Düğmesi" msgid "R-Analog" msgstr "R Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "Anabellek" @@ -4208,46 +4153,46 @@ msgstr "Anabellek" msgid "RUSSIA" msgstr "RUSYA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Aralık" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Gerçek" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Gerçek Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Gerçek Wiimote'lar" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Tekrar BaÄŸlama Onayı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Durum yüklemesinde Wiimote'u yeniden baÄŸla" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Çek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Çekim Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Çekim Seçenekleri" @@ -4263,7 +4208,7 @@ msgstr "Kırmızı Sol" msgid "Red Right" msgstr "Kırmızı SaÄŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4277,29 +4222,29 @@ msgstr "" "\n" "Emin deÄŸilseniz, hiçbiri seçin." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Yenile" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Listeyi Yenile" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Kaldır" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4309,17 +4254,17 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Ana pencerede yorumla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Sıfırla" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Sonuçlar" @@ -4336,7 +4281,7 @@ msgstr "SaÄŸ" msgid "Right Stick" msgstr "SaÄŸ Çubuk" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Gümbürtü" @@ -4345,116 +4290,112 @@ msgstr "Gümbürtü" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSPLLE'yi ayrı iÅŸlem biriminde çalıştır (önerilmez)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rusça" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Güvenli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "Örnek Oran:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Kaydet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI'yı farklı kaydet..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Durumu Kaydet : 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Durumu Kaydet : 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Durumu Kaydet : 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Durumu Kaydet : 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Durumu Kaydet : 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Durumu Kaydet : 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Durumu Kaydet : 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Durumu Kaydet : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Åžu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Taranıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Ekran Görüntüsü" @@ -4462,23 +4403,23 @@ msgstr "Ekran Görüntüsü" msgid "Scroll Lock" msgstr "Kaydırma Kilidi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Ara" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Åžu anki nesneyi ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Hex deÄŸerini ara:" @@ -4489,20 +4430,20 @@ msgid "Section %s not found in SYSCONF" msgstr "SYSCONF içinde %s bölümü bulunamadı" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4520,23 +4461,23 @@ msgstr "Almak için bir kayıt dosyası seçin" msgid "Select floating windows" msgstr "Sabit olmayan pencereyi seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4554,11 +4495,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, otomatik seçin." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Belirtilen dosya \"%s\" bulunamadı" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Seçilen yazı tipi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4574,7 +4520,7 @@ msgstr "" "Emin deÄŸilseniz, masaüstü çözünürlüğünüzü seçin.\n" "Hala emin deÄŸilseniz, kullanabildiÄŸiniz en yüksek çözünürlüğü seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4590,11 +4536,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, DirectX 9 seçin." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Gönder" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensör Çubuk Konumu:" @@ -4602,47 +4548,53 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Seri BaÄŸ.Nok. 1 - Bu baÄŸlantı noktasına aÄŸ adaptörü gibi sürücüler baÄŸlanır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ayarlar..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Ayar dosyası bulunamadı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kısa Ä°sim:" @@ -4650,105 +4602,105 @@ msgstr "Kısa Ä°sim:" msgid "Shoulder Buttons" msgstr "Shoulder Düğmeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Konsolu Göster (&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "GeçmiÅŸi Göster (&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Durum ÇubuÄŸunu Gö&ster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Araç ÇubuÄŸunu Gös&ter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Kare Sayısını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Fransızları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Ä°talyanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Japonları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Gösterme Dili:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "GeçmiÅŸ Yapılandırmasını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Platformları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Tayvanlıları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Amerikanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "WAD'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Oyunu durdurmadan önce onay kutusu görüntüle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4756,27 +4708,39 @@ msgstr "" "Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde " "hiçbir uyarı vermeden aniden kapanır." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Ä°lk bloÄŸu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "Kayıt yorumunu göster" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4788,15 +4752,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Bu yardım mesajını göster." - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Bilinmeyenleri göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4806,31 +4766,35 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "CPU'dan EFB'ye eriÅŸimi atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4841,7 +4805,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4856,17 +4820,17 @@ msgstr "" "doÄŸruluÄŸunu artırmayı deneyin.\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4874,7 +4838,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Enstantene" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Yazılımsal Yorumlayıcı" @@ -4890,11 +4854,11 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ses Ayarları" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Ses arkaucu %s geçerli deÄŸil." @@ -4908,17 +4872,17 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Ä°spanyolca" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hoparlör Ses Seviyesi:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4938,11 +4902,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 640x528'i seçin." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Bir görüntü arka ucu belirtin" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -4950,51 +4910,55 @@ msgstr "Disk Aktarım Oranını Hızlandır" msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&NetPlay'i BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Çekimi BaÅŸlat (&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Çekimi BaÅŸlat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Durum" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Durum Kayıtları" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Durdur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5008,7 +4972,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Pencereye Göre Ayarla" @@ -5029,12 +4993,12 @@ msgstr "Dosya %s 'ye baÅŸarıyla verildi" msgid "Successfully imported save files" msgstr "Kayıt dosyaları baÅŸarıyla alındı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Sistem Dili:" @@ -5042,7 +5006,7 @@ msgstr "Sistem Dili:" msgid "TAIWAN" msgstr "TAYVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS GiriÅŸi" @@ -5063,30 +5027,30 @@ msgstr "Tablo Sol" msgid "Table Right" msgstr "Tablo SaÄŸ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Sınama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Doku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Doku Ön BelleÄŸi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5102,13 +5066,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "SaÄŸlama baÅŸarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5131,7 +5095,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Dosya %s zaten açık, dosya baÅŸlığı yazılmayacaktır." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -5148,7 +5112,7 @@ msgstr "Ä°sim ',' karakterini içeremez" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Ortaya çıkan ÅŸifresi çözülmüş AR kodu herhangi bir satır içermiyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5160,11 +5124,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, en saÄŸdaki deÄŸeri kullanın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Kopyalamayı denediÄŸiniz kaydın boyutu hatalı" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5197,15 +5161,12 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 -msgid "Theme selection went wrong" -msgstr "Tema seçiminde hata" - -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5213,7 +5174,7 @@ msgstr "" "Burada 00000001/00000002 için bir bilet olmalıdır. NAND dökümünüz " "tamamlanmamış olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5221,21 +5182,23 @@ msgstr "" "Bu ayarlar Dolphin'in kendi ayarları yerine kullanılır. \n" "Dolu kareler oyunun Dolphin'in ayarlarını kullandığını gösterir." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaÅŸlamaya neden olabilir." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5250,7 +5213,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5262,7 +5225,7 @@ msgstr "" "Bilgisayarınızda çift çekirdek varsa hızınızı büyük oranda artırır,ama bazı " "çökme ve hatalara neden olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." @@ -5271,40 +5234,40 @@ msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." msgid "Threshold" msgstr "EÅŸik" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "EÄŸim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "BaÅŸlık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Buraya" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." @@ -5324,7 +5287,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Türkçe" @@ -5336,12 +5299,12 @@ msgstr "Döner Tabla" msgid "Type" msgstr "Tür" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP BaÄŸ.Nok.:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5349,7 +5312,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "BÄ°LÄ°NMEYEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "BÄ°LÄ°NMEYEN_%02X" @@ -5377,24 +5340,24 @@ msgstr "" "kod olarak ayrıştırılamadı. Kodu doÄŸru yazdığınızdan emin olun.\n" "Bu satırı yoksayıp ayrıştırmaya devam etmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Belirsiz %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Durum Yüklemeyi Geri Al" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Beklenmedik 0x80 çaÄŸrısı? Çıkılıyor..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Bilinmeyen" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Bilinmeyen DVD komutu %08x - önemli hata" @@ -5419,32 +5382,32 @@ msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" msgid "Up" msgstr "Yukarı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Güncelle" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Tam Ekran Kullan" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5456,7 +5419,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5470,15 +5433,15 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Gereçler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Dikey EÅŸitleme" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "DeÄŸer" @@ -5486,23 +5449,23 @@ msgstr "DeÄŸer" msgid "Value:" msgstr "DeÄŸer:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "DeÄŸer:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Ses" @@ -5516,7 +5479,7 @@ msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" msgid "WAD installation failed: error creating ticket" msgstr "WAD kurulumu baÅŸarısız: Ticket oluÅŸturma hatası." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5529,16 +5492,16 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Uyarı - DOL yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda baÅŸlatılıyor!" @@ -5557,7 +5520,7 @@ msgstr "" "%s\n" "Devam edilsin mi?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5571,7 +5534,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5583,7 +5546,7 @@ msgstr "" "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5595,7 +5558,7 @@ msgstr "" "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5630,7 +5593,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - dosya açılamadı." @@ -5638,31 +5601,31 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5670,17 +5633,17 @@ msgstr "Wii kayıt dosyaları (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Dosyadan okuma baÅŸarısız" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5693,19 +5656,19 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motoru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote ayarları" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimote'lar" @@ -5725,26 +5688,26 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Çalışıyor..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Konsola Yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Hata ayıklayıcıya yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Dosyaya Yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Pencereye Yaz" @@ -5763,7 +5726,7 @@ msgstr "XAudio2 baÅŸlatılamadı: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ana ses oluÅŸturulamadı: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF kaydı" @@ -5783,23 +5746,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Sayfalı bölmeleri kapatamazsınız." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Bir oyun seçmelisiniz!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Bir isim girmelisiniz!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "DoÄŸru bir sekizlik,onluk veya onaltılık deÄŸer girmelisiniz." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "DeÄŸiÅŸikliÄŸin etkili olması için Dolphin'i yeniden baÅŸlatmalısınız." @@ -5822,25 +5785,25 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluÅŸturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP Hilesi" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Sıfır-Üç kodu desteklenmemektedir." -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Dolphin Sıfır kodu bilinmiyor: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ bekleniyor ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5856,7 +5819,7 @@ msgstr "" msgid "[Custom]" msgstr "[Özel]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5874,7 +5837,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5888,11 +5851,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5909,7 +5872,7 @@ msgstr "%s dosyasından veri okunamadı" msgid "failed to read header" msgstr "baÅŸlık okunamadı" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." @@ -5919,7 +5882,7 @@ msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." msgid "not a wii save or read failure for file header size %x" msgstr "Bir Wii kaydı deÄŸil veya bu baÅŸlık boyutu için okuma hatası: %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5928,7 +5891,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -5940,13 +5903,16 @@ msgstr "zFar Düzeltmesi:" msgid "zNear Correction: " msgstr "zNear Düzeltmesi:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| VEYA" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "Çerçeve Atlama(&K)" @@ -6015,12 +5981,38 @@ msgstr "| VEYA" #~ "En iyisi bunu kullanırken en-boy oranını \"pencereye göre\" olarak " #~ "ayarlamaktır." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "MipMap'leri hafızadan çözmek yerine otomatik olarak oluÅŸtur. \n" +#~ "Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." + #~ msgid "Bad gameini filename" #~ msgstr "Kötü oyun .ini dosya adı" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel olarak " +#~ "hesapla. \n" +#~ "Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok " +#~ "azında piksel başına derinlik hesaplaması gereklidir.\n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6082,6 +6074,24 @@ msgstr "| VEYA" #~ msgid "Could not get info about plugin %s" #~ msgstr "%s oluÅŸturulamadı." +#~ msgid "Created by KDE-Look.org" +#~ msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " +#~ "oluÅŸturulmuÅŸtur." + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " +#~ "yayınlanmıştır." + #~ msgid "DList Cache" #~ msgstr "D Listesi ÖnbelleÄŸi" @@ -6093,9 +6103,27 @@ msgstr "| VEYA" #~ msgid "Danish" #~ msgstr "Ä°spanyolca" +#~ msgid "Disable Lighting" +#~ msgstr "Işıklandırmayı Ä°ptal Et" + +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Piksel DerinliÄŸini Ä°ptal Et" + +#~ msgid "Disable Textures" +#~ msgstr "Dokuları Ä°ptal Et" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "WiiMote Hoparlörünü Ä°ptal Et" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Dokulandırmayı iptal et. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6162,6 +6190,9 @@ msgstr "| VEYA" #~ msgid "Enable Audio Throttle" #~ msgstr "Ses Hızlandırmasına Ä°zin Ver" +#~ msgid "Enable BAT" +#~ msgstr "BAT'a Ä°zin Ver" + #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6192,6 +6223,15 @@ msgstr "| VEYA" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Ekran Koruyucusuna Ä°zin Ver" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ãœnitesi " +#~ "iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " +#~ "Kapalı = Hızlı)" + #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6247,6 +6287,9 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphin Emülatöründen Çık" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6260,6 +6303,9 @@ msgstr "| VEYA" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Kod indirme baÅŸarısız." +#~ msgid "Fast Mipmaps" +#~ msgstr "Hızlı MipMap'ler" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6310,6 +6356,16 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Performansı artırır ancak bazı oyunların karanlık kalmasına neden " +#~ "olabilir. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" @@ -6354,6 +6410,15 @@ msgstr "| VEYA" #~ "Mipmap'leri oluÅŸturmak yerine doÄŸal olanlarını yükler. \n" #~ "DoÄŸruluÄŸu artırır ama performansı düşürebilir." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" + +#~ msgid "Lock Threads to Cores" +#~ msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Düşük düzeyde (LLE) veya Yüksek düzeyde (HLE) ses." + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "Konsola Yaz" @@ -6392,6 +6457,12 @@ msgstr "| VEYA" #~ msgid "OpenGL" #~ msgstr "Aç" +#~ msgid "Opens the debugger" +#~ msgstr "Hata ayıklayıcıyı açar" + +#~ msgid "Opens the logger" +#~ msgstr "GeçmiÅŸi açar" + #~ msgid "Plugins" #~ msgstr "Eklentiler" @@ -6431,6 +6502,9 @@ msgstr "| VEYA" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" +#~ msgid "Sample Rate:" +#~ msgstr "Örnek Oran:" + #~ msgid "Scale:" #~ msgstr "Boyut:" @@ -6480,6 +6554,9 @@ msgstr "| VEYA" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Saniyede kaç karenin görüntülendiÄŸini göster." +#~ msgid "Show this help message" +#~ msgstr "Bu yardım mesajını göster." + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6520,6 +6597,9 @@ msgstr "| VEYA" #~ "DiÄŸer seçenekler görüntü boyutundan bağımsız olarak seçilen düzeltilmiÅŸ " #~ "çözünürlüklerdir." +#~ msgid "Specify a video backend" +#~ msgstr "Bir görüntü arka ucu belirtin" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "Bir görüntü arka ucu belirtin" @@ -6533,6 +6613,9 @@ msgstr "| VEYA" #~ msgid "The file " #~ msgstr "Dosya" +#~ msgid "Theme selection went wrong" +#~ msgstr "Tema seçiminde hata" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index f0fef85cee..1bc46e4231 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-01-09 13:55-0800\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: thegfw \n" "Language-Team: \n" "Language: Simplified Chinese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (è¦æ˜¾ç¤ºçš„项目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " æ¸¸æˆ : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! éž" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii é•œåƒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "未连接" @@ -148,156 +141,156 @@ msgstr "%s导出 GCI%s" msgid "%sImport GCI%s" msgstr "%s导入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区å—; %u 空闲目录项目" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& 与" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "关于(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "光驱å¯åŠ¨(&V)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "断点(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "æµè§ˆé•œåƒ(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "作弊ç ç®¡ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "模拟(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "文件(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "帧数步进(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "图形设置(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "帮助(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "热键设置(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "å³æ—¶ç¼–译器(&J)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "载入状æ€(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "内存å¡ç®¡ç†å™¨(&GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "内存(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "打开镜åƒ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "选项(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "æš‚åœæ¸¸æˆ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "属性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "åªè¯»æ¨¡å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "刷新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "é‡ç½®æ¸¸æˆ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "声音(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢æ¸¸æˆ(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "视频(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "视图(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "百科(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -313,27 +306,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(å…³)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ä½" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ä½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ä½" @@ -341,46 +334,48 @@ msgstr "8 ä½" msgid "" msgstr "<在这里æ’å…¥å称>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<æ— >" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<系统>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "网上对战窗å£å·²ç»æ‰“å¼€!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ç›®å‰æ²¡æœ‰æ¸¸æˆè¿è¡Œ." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "没有找到支æŒçš„è“牙设备!\n" "(åªæœ‰å¾®è½¯çš„è“牙产å“支æŒ.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -414,13 +409,13 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "动作回放代ç " @@ -428,19 +423,19 @@ msgstr "动作回放代ç " msgid "About Dolphin" msgstr "关于 Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -449,8 +444,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "æ“作" @@ -469,42 +464,43 @@ msgstr "" "错误代ç :\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 æ·»åŠ ä»£ç  (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 填充和滑动 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 内存写入和填充 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 写入到指针 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "动作回放错误: 无效数值 (%08x) 于 内存å¤åˆ¶ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "动作回放错误: 主代ç å’Œå†™å…¥åˆ° CCXXXXXX ä¸æ”¯æŒ (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -512,27 +508,27 @@ msgstr "动作回放错误: 主代ç å’Œå†™å…¥åˆ° CCXXXXXX ä¸æ”¯æŒ (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "动作回放错误: 无效动作回放代ç è¡Œ: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "动作回放: æ¡ä»¶ä»£ç : æ— æ•ˆå¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "动作回放: 无效正常代ç ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  %i: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  0: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "适é…器:" @@ -541,11 +537,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "添加补ä¸" @@ -553,13 +549,13 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "添加..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "åœ°å€ :" @@ -585,71 +581,76 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "高级设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "抗锯齿:" @@ -661,31 +662,31 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "应用载入器:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "应用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -693,12 +694,12 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -706,12 +707,12 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "音频åŽç«¯:" @@ -719,26 +720,26 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自动" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -746,19 +747,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -767,17 +760,17 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "音频åŽç«¯:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "åŽå°è¾“å…¥" @@ -790,16 +783,16 @@ msgstr "Backward" msgid "Bad File Header" msgstr "无效文件头" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "标志详细信æ¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "标志:" @@ -807,11 +800,11 @@ msgstr "标志:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本 设置" @@ -823,7 +816,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum failed" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "区å—" @@ -839,47 +832,53 @@ msgstr "è“ å·¦" msgid "Blue Right" msgstr "è“ å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "底部" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "æŸå" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "æµè§ˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "æµè§ˆè¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "缓冲区:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -892,30 +891,20 @@ msgstr "C-摇æ†" msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -924,7 +913,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -940,7 +929,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -950,7 +939,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -958,18 +947,18 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" @@ -977,28 +966,28 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Center" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "切æ¢" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "切æ¢å…‰ç›˜(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "切æ¢å…‰ç›˜" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" @@ -1019,11 +1008,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "金手指" @@ -1031,48 +1019,48 @@ msgstr "金手指" msgid "Cheat Code" msgstr "作弊ç " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "作弊ç æœç´¢" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "金手指管ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1080,7 +1068,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1088,8 +1076,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1103,8 +1091,8 @@ msgstr "ç»å…¸" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "清除" @@ -1116,22 +1104,22 @@ msgstr "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "关闭" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "程åºè®¾ç½®(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "代ç :" @@ -1139,96 +1127,96 @@ msgstr "代ç :" msgid "Command" msgstr "命令" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "设置" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "设置" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "设置é¢æ¿" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "设置手柄" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "连接 Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "连接 Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "连接 Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "连接 Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "连接中..." @@ -1244,16 +1232,16 @@ msgstr "控制" msgid "Convert to GCI" msgstr "转æ¢åˆ° GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "核心" @@ -1262,7 +1250,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "ä¸èƒ½åˆ›å»º %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "ä¸èƒ½åˆå§‹åŒ–åŽç«¯ %s" @@ -1283,12 +1271,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ä¸èƒ½è¯†åˆ« ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "ä¸èƒ½ä¿å­˜ %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1296,7 +1284,7 @@ msgstr "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1308,11 +1296,11 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1320,17 +1308,17 @@ msgstr "" "ä¸èƒ½åˆå§‹åŒ–核心.\n" "检查你的é…ç½®." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "æ•°é‡:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "国家:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "创建动作回放代ç " @@ -1339,25 +1327,7 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: 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: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:496 -msgid "Created by VistaIcons.com" -msgstr "Created by VistaIcons.com" - -#: 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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "创建者:" @@ -1365,11 +1335,11 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "è£åˆ‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1380,12 +1350,12 @@ msgstr "" msgid "Crossfade" msgstr "淡入淡出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1393,15 +1363,15 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "æ·å…‹è¯­" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1409,37 +1379,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1451,16 +1421,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "æ•°æ®å¤§å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "日期:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro files(*.sav)" @@ -1472,11 +1442,11 @@ msgstr "Datel MaxDrive/Pro files(*.sav)" msgid "Dead Zone" msgstr "死区" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1485,24 +1455,24 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "默认镜åƒ:" @@ -1511,11 +1481,11 @@ msgid "Default font" msgstr "默认字体" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "删除存档" @@ -1524,12 +1494,12 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "询问" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "检测" @@ -1542,13 +1512,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "设备设置" @@ -1572,30 +1542,17 @@ msgstr "" "目录校检失败\n" "和目录备份校检失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ç¦ç”¨å…‰çº¿" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "åƒç´ æ·±åº¦" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "ç¦ç”¨æè´¨" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1604,7 +1561,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1614,14 +1571,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "光盘" @@ -1630,11 +1580,11 @@ msgstr "光盘" msgid "Disc Read Error" msgstr "光盘读å–错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "显示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1646,20 +1596,24 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 图形设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin 网站(&W)" @@ -1667,54 +1621,59 @@ msgstr "Dolphin 网站(&W)" msgid "Dolphin Configuration" msgstr "Dolphin é…ç½®" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模拟 Wiimote 设置" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote é…ç½®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin 于 &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin ä¸èƒ½æ‰¾åˆ°ä»»ä½• GC/Wii é•œåƒ. åŒå‡»è¿™é‡Œæµè§ˆæ–‡ä»¶..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸æˆ..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ä¸‹è½½ä»£ç  (WiiRD æ•°æ®åº“)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下载 %lu 代ç (已添加 %lu)" @@ -1723,34 +1682,34 @@ msgstr "已下载 %lu 代ç (已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "转储æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1758,32 +1717,32 @@ msgid "" "If unsure, leave this unchecked." msgstr "转储游æˆæ质到 User/Dump/Textures/<æ¸¸æˆ ID>/" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "è·å…°è¯­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "退出模拟(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1797,11 +1756,11 @@ msgstr "" msgid "EUROPE" msgstr "欧版" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "编辑" @@ -1809,7 +1768,7 @@ msgstr "编辑" msgid "Edit ActionReplay Code" msgstr "编辑动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "编辑设置" @@ -1817,12 +1776,12 @@ msgstr "编辑设置" msgid "Edit Patch" msgstr "编辑补ä¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "编辑..." @@ -1830,15 +1789,15 @@ msgstr "编辑..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "模拟线程已ç»åœ¨è¿è¡Œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1847,7 +1806,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1857,19 +1816,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "模拟器状æ€: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "å¯ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1879,74 +1838,69 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "å¯ç”¨ BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "å¯ç”¨ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1958,17 +1912,17 @@ msgstr "" "Enables anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "å¯ç”¨å¿«é€Ÿå…‰ç›˜è®¿é—®. 部分游æˆéœ€è¦. (ON = 快速, OFF = 兼容)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Enable pages" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1976,7 +1930,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1984,7 +1938,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1992,21 +1946,28 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2014,13 +1975,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "å¯ç”¨å†…存管ç†å•å…ƒ,一些游æˆéœ€è¦(ON = 兼容,OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2031,14 +1992,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "英语" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "增强" @@ -2056,17 +2017,17 @@ msgstr "项目 %d/%d" msgid "Entry 1/%d" msgstr "项目 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "等于" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "错误" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2103,36 +2064,32 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "执行" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Exit Dolphin with emulator" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "导出文件" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "导出录制" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "导出所有存档" @@ -2140,15 +2097,15 @@ msgstr "导出所有存档" msgid "Export failed, try again?" msgstr "导出失败,需è¦é‡è¯•å—?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "导出存档为..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2161,52 +2118,52 @@ msgstr "外部å‚æ•°" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "解压缩中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2215,7 +2172,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST 大å°:" @@ -2223,15 +2180,15 @@ msgstr "FST 大å°:" msgid "Failed to Connect!" msgstr "连接失败!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "监å¬å¤±è´¥!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2260,6 +2217,11 @@ msgstr "ä¸èƒ½è½½å…¥ hid.dll" msgid "Failed to load hid.dll" msgstr "ä¸èƒ½è½½å…¥ hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "写入文件头到 %s 失败" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "è¯»å– banner.bin 失败" @@ -2342,48 +2304,43 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "载人原始纹ç†" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "文件未包å«ä»£ç ." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "文件已转æ¢åˆ° .cgi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2400,7 +2357,7 @@ msgstr "" "File has the extension \"%s\"\n" "valid extensions are (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "文件ä¸èƒ½è¢«è¯†åˆ«æˆå†…å­˜å¡" @@ -2413,49 +2370,49 @@ msgstr "文件ä¸æ˜¯å·²åŽ‹ç¼©æ–‡ä»¶" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "第一个区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "修正校检和" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "强制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2467,7 +2424,7 @@ msgstr "" "Improves texture quality (especially when using a high internal resolution) " "but causes glitches in some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2478,7 +2435,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:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2497,61 +2454,61 @@ msgstr "" msgid "Forward" msgstr "Forward" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "自由视点" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "法语" @@ -2559,21 +2516,21 @@ msgstr "法语" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "å…¨å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 文件(*.gci)" @@ -2582,57 +2539,61 @@ msgstr "GCI 文件(*.gci)" msgid "GCMic Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "æ¸¸æˆ ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "游æˆå·²ç»è¿è¡Œ!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "游æˆæ²¡æœ‰è¿è¡Œ!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "游æˆæ²¡æ‰¾åˆ°!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "游æˆç‰¹æ®Šè®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "游æˆé…ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代ç " @@ -2647,42 +2608,42 @@ msgstr "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "常规" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "德语" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "图形" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "图形设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "大于" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2693,7 +2654,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "希腊语" @@ -2713,11 +2674,11 @@ msgstr "绿 å³" msgid "Guitar" msgstr "å‰å®ƒ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2725,11 +2686,11 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "希伯æ¥è¯­" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "高度" @@ -2737,7 +2698,7 @@ msgstr "高度" msgid "Help" msgstr "帮助" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2753,15 +2714,15 @@ msgstr "" "\n" "æ€å‘¦å•¦å•¦(å†è§)!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éšè—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "éšè—鼠标光标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2773,8 +2734,8 @@ msgstr "按模拟器显示输入读å–" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "主机" @@ -2782,26 +2743,26 @@ msgstr "主机" msgid "Hotkey Configuration" msgstr "热键设置" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "匈牙利语" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,31 +2775,31 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 设置" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "红外线" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR 指针" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "红外çµæ•åº¦:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" @@ -2846,23 +2807,23 @@ msgstr "é•œåƒç›®å½•" msgid "ITALY" msgstr "æ„大利" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2872,12 +2833,12 @@ msgstr "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "模拟格å¼ä¿®æ”¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2886,7 +2847,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2895,7 +2856,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "导入存档" @@ -2903,7 +2864,7 @@ msgstr "导入存档" msgid "Import failed, try again?" msgstr "导入失败,è¦é‡è¯•å—?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2911,11 +2872,11 @@ msgstr "" "导入的文件有一个 gcs 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "导入的文件长度ä¸æ­£ç¡®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2923,7 +2884,7 @@ msgstr "" "导入的文件有一个 sav 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2934,26 +2895,16 @@ msgstr "" "Disable fog. Improves performance but causes glitches in games which rely on " "proper fog emulation." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Disable lighting. Improves performance but causes lighting to disappear in " -"games which use it." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "进游æˆ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "进游æˆ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ä¿¡æ¯" @@ -2961,7 +2912,7 @@ msgstr "ä¿¡æ¯" msgid "Information" msgstr "ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "输入" @@ -2973,7 +2924,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -2981,12 +2932,12 @@ msgstr "æ’å…¥SDå¡" msgid "Insert name here.." msgstr "在这里æ’å…¥å称..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -2996,44 +2947,44 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "内部 LZO 错误 - 压缩失败" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3042,20 +2993,20 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "内部 LZO 错误 - lzo_init() 失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "片头" @@ -3064,11 +3015,11 @@ msgstr "片头" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "无效大å°(%x) 或 魔字(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "无效值!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" @@ -3077,7 +3028,7 @@ msgstr "无效 bat.map 或 目录项目" msgid "Invalid event type %i" msgstr "无效事件类型 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "无效文件" @@ -3092,29 +3043,29 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Invalid state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "æ„大利语" @@ -3122,16 +3073,16 @@ msgstr "æ„大利语" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "日语" @@ -3139,7 +3090,7 @@ msgstr "日语" msgid "KOREA" msgstr "韩国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3147,17 +3098,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "韩语" @@ -3175,19 +3126,23 @@ msgstr "L é”®" msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最åŽè¦†ç›–状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最åŽä¿å­˜çŠ¶æ€" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3197,8 +3152,8 @@ msgstr "å·¦" msgid "Left Stick" msgstr "左摇æ†" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3206,7 +3161,7 @@ msgstr "" "左键å•å‡»æ£€æµ‹çƒ­é”®.\n" "按空格清除." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3216,7 +3171,7 @@ msgstr "" "中键å•å‡»æ¸…除.\n" "å³é”®å•å‡»å¾—到更多选项." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3224,78 +3179,78 @@ msgstr "" "å·¦/å³å•å‡»å¾—到更多选项.\n" "中键å•å‡»æ¸…除" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "载入存档æ’槽 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "载入存档æ’槽 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "载入存档æ’槽 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "载入存档æ’槽 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "载入存档æ’槽 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "载入存档æ’槽 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "载入存档æ’槽 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "载入存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3307,37 +3262,40 @@ msgstr "Load high-resolution textures from User/Load/Textures//" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "é”定线程到核心" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "日志" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "记录类型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "记录输出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "记录中" @@ -3345,10 +3303,6 @@ msgstr "记录中" msgid "Lost connection to server!" msgstr "丢失æœåŠ¡å™¨è¿žæŽ¥!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "低级(LLE)或者高级(HLE)音频" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M é”®" @@ -3362,12 +3316,12 @@ msgstr "" "MD5 ä¸åŒ¹é…\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 速度破解" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" @@ -3376,34 +3330,34 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇æ†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "制作者:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Memcard already has a save for this title" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "内存å¡å·²ç»æ‰“å¼€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "内存å¡" @@ -3413,7 +3367,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3438,21 +3392,21 @@ msgstr "" msgid "Menu" msgstr "èœå•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "其它设置" @@ -3461,7 +3415,7 @@ msgstr "其它设置" msgid "Modifier" msgstr "修改者" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3473,16 +3427,16 @@ msgstr "" msgid "Monospaced font" msgstr "等宽字体" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3497,17 +3451,17 @@ msgstr "" msgid "Multiply" msgstr "多人游æˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3595,38 +3549,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "å称:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "å称:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "内部 GCI 文件(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "新建扫æ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "下一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "下一扫æ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "昵称 :" @@ -3634,7 +3588,7 @@ msgstr "昵称 :" msgid "No Country (SDK)" msgstr "无国家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "未找到镜åƒæˆ–者WAD" @@ -3643,8 +3597,8 @@ msgstr "未找到镜åƒæˆ–者WAD" msgid "No banner file found for title %s" msgstr "没有找到标题为 %s 的标志文件" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3652,15 +3606,15 @@ msgstr "" msgid "No docking" msgstr "No docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "没有空闲目录索引项目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "无效录制文件" @@ -3670,33 +3624,33 @@ msgstr "无效录制文件" msgid "No save folder found for title %s" msgstr "No save folder found for title %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未连接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "说明" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "说明: " @@ -3705,7 +3659,7 @@ msgstr "说明: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "æ示" @@ -3713,28 +3667,28 @@ msgstr "æ示" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "代ç æ•°é‡: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "关闭" @@ -3742,60 +3696,56 @@ msgstr "关闭" msgid "Offset:" msgstr "å移é‡:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "打开文件..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: ä¸èƒ½åˆ›å»ºè®¾å¤‡ %s 上下文" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "选项" @@ -3804,7 +3754,7 @@ msgstr "选项" msgid "Orange" msgstr "æ©™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3814,8 +3764,8 @@ msgstr "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3827,19 +3777,19 @@ msgstr "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "输出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "播放录制(&L)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "手柄" @@ -3855,7 +3805,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "é…对" @@ -3867,31 +3817,35 @@ msgstr "Paragraph" msgid "Parameters" msgstr "å‚æ•°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš‚åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "完美" @@ -3900,37 +3854,37 @@ msgstr "完美" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "开始" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "开始/æš‚åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "å¯ä»¥çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "选项" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "请确认..." @@ -3942,55 +3896,55 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ç«¯å£ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4003,11 +3957,11 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "上一个值" @@ -4015,7 +3969,7 @@ msgstr "上一个值" msgid "Print" msgstr "打å°" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "é…ç½®" @@ -4023,7 +3977,7 @@ msgstr "é…ç½®" msgid "Properties" msgstr "属性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "清除缓存" @@ -4031,8 +3985,8 @@ msgstr "清除缓存" msgid "Question" msgstr "询问" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "退出" @@ -4050,7 +4004,7 @@ msgstr "R é”®" msgid "R-Analog" msgstr "R-摇æ†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "内存" @@ -4058,50 +4012,50 @@ msgstr "内存" msgid "RUSSIA" msgstr "俄语" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "范围" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "真实" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "真实 Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "真实 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "确认 Wiimote é‡è¿ž" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Reconnect Wiimote On Load State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4117,7 +4071,7 @@ msgstr "红 å·¦" msgid "Red Right" msgstr "红 å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4130,29 +4084,29 @@ msgstr "" "This makes the rendered picture look less blocky but also heavily decreases " "performance." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "刷新" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "刷新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4162,17 +4116,17 @@ msgstr "" "Render the scene as a wireframe.\n" "This is only useful for debugging purposes." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "附加到主窗å£" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "结果" @@ -4189,7 +4143,7 @@ msgstr "å³" msgid "Right Stick" msgstr "å³æ‘‡æ†" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震动" @@ -4198,117 +4152,113 @@ msgstr "震动" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (not recommended)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "俄语" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "采样率:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ä¿å­˜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "ä¿å­˜GCI为..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "存档æ’槽 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "存档æ’槽 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "存档æ’槽 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "存档æ’槽 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "存档æ’槽 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "存档æ’槽 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "存档æ’槽 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "截图" @@ -4316,25 +4266,25 @@ msgstr "截图" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "作弊ç æœç´¢" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4345,21 +4295,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "选择" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4377,23 +4327,23 @@ msgstr "选择è¦å¯¼å…¥çš„存档" msgid "Select floating windows" msgstr "选择浮动窗å£" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4410,11 +4360,16 @@ msgstr "" "Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n" "Stretch to window: Stretch the picture to the window size." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "所选字体" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4424,7 +4379,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4434,11 +4389,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "å‘é€" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "传感器æ ä½ç½®" @@ -4446,47 +4401,53 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - This is the port which devices such as the net adapter use" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "设置..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "短å称:" @@ -4495,107 +4456,107 @@ msgstr "短å称:" msgid "Shoulder Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "显示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "显示日志(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "显示状æ€æ (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "显示工具æ (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "显示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "显示法国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "显示输入显示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "显示æ„大利" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "显示日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "显示语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "显示日志设置(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "显示PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "显示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "显示å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "显示美国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "显示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "åœæ­¢æ¸¸æˆæ—¶æ˜¾ç¤ºç¡®è®¤å¯¹è¯æ¡†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4603,27 +4564,39 @@ msgstr "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "显示第一区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "显示存档注释" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "显示存档区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "显示存档标题" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4631,48 +4604,48 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "显示这个帮助消æ¯" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "显示未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4680,7 +4653,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4690,17 +4663,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "æ’槽 B" @@ -4708,7 +4681,7 @@ msgstr "æ’槽 B" msgid "Snapshot" msgstr "截图" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4720,11 +4693,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "声音设置" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "声音åŽç«¯ %s 无效." @@ -4738,17 +4711,17 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "西ç­ç‰™è¯­" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "扬声器音é‡:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4760,11 +4733,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "指定一个视频åŽç«¯" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "æå‡å…‰ç›˜ä¼ è¾“率" @@ -4772,51 +4741,55 @@ msgstr "æå‡å…‰ç›˜ä¼ è¾“率" msgid "Square Stick" msgstr "æ–¹å—é”®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "标准控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "开始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "开始网络对战(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "开始录制(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "开始录制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "状æ€" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "State Saves" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4825,7 +4798,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "附加到窗å£" @@ -4846,12 +4819,12 @@ msgstr "æˆåŠŸå¯¼å‡ºæ–‡ä»¶åˆ° %s" msgid "Successfully imported save files" msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "系统语言" @@ -4859,7 +4832,7 @@ msgstr "系统语言" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4881,31 +4854,31 @@ msgstr "Table Left" msgid "Table Right" msgstr "Table Right" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "测试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -4922,13 +4895,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4951,7 +4924,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "The file %s was already open, the file header will not be written." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s ä¸å­˜åœ¨" @@ -4968,7 +4941,7 @@ msgstr "å称ä¸èƒ½åŒ…å«å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4976,11 +4949,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "The save you are trying to copy has an invalid file size" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5013,15 +4986,12 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5029,7 +4999,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5037,7 +5007,7 @@ msgstr "" "这些设置将覆盖Dolphi核心设置.\n" "未决设置将使用Dolphi的设置." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5045,14 +5015,15 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5060,7 +5031,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5072,7 +5043,7 @@ msgstr "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "This will let you Manually Edit the INI config file" @@ -5081,41 +5052,41 @@ msgstr "This will let you Manually Edit the INI config file" msgid "Threshold" msgstr "闸值" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "标题" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "顶部" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." @@ -5135,7 +5106,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "土耳其语" @@ -5147,12 +5118,12 @@ msgstr "Turntable" msgid "Type" msgstr "类型" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP 端å£:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5160,7 +5131,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5183,24 +5154,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未定义的 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "撤销载入状æ€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "未知" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "未知 DVD 命令 %08x - 致命错误" @@ -5225,33 +5196,33 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "æ›´æ–°" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "使用警告程åº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5259,7 +5230,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5268,15 +5239,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "实用扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "值" @@ -5284,23 +5255,23 @@ msgstr "值" msgid "Value:" msgstr "值:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "值: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5315,7 +5286,7 @@ msgstr "WAD 安装失败: 创建 %s 错误" msgid "WAD installation failed: error creating ticket" msgstr "WAD 安装失败: 创建 %s 错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5324,16 +5295,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" @@ -5352,7 +5323,7 @@ msgstr "" "%s\n" "Do you wish to continue?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5365,7 +5336,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5373,7 +5344,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5381,7 +5352,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5401,7 +5372,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "波形文件写入器 - 文件未打开." @@ -5409,32 +5380,32 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5442,17 +5413,17 @@ msgstr "Wii 存档文件 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ä¸èƒ½ä»Žæ–‡ä»¶è¯»å–" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5465,19 +5436,19 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote 已连接" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote 马达" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote 设置" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5498,27 +5469,27 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "工作中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "写入到控制å°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "写入到文件" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "写入到文件" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "写入到窗å£" @@ -5537,7 +5508,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5555,23 +5526,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "You can't close panes that have pages in them." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "您必须选择一个游æˆ!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "您必须输入一个å称!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必须输入一个å进制或者å六进制值." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5592,25 +5563,25 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 破解" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 代ç ä¸æ”¯æŒ" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 等待中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5622,7 +5593,7 @@ msgstr "" msgid "[Custom]" msgstr "[自定义]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5633,7 +5604,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5642,11 +5613,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -5663,7 +5634,7 @@ msgstr "从 %s 文件读å–æ•°æ®å¤±è´¥." msgid "failed to read header" msgstr "读å–头部失败" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5673,7 +5644,7 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "not a wii save or read failure for file header size %x" msgstr "not a wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5682,7 +5653,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5694,13 +5665,16 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| 或" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "帧数跳跃(&K)" @@ -5818,6 +5792,22 @@ msgstr "| 或" #~ msgid "Could not get info about plugin %s" #~ msgstr "ä¸èƒ½åˆ›å»º %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Created by KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Created by VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList 缓存" @@ -5828,6 +5818,16 @@ msgstr "| 或" #~ msgid "Danish" #~ msgstr "丹麦语" +#~ msgid "Disable Lighting" +#~ msgstr "ç¦ç”¨å…‰çº¿" + +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "åƒç´ æ·±åº¦" + +#~ msgid "Disable Textures" +#~ msgstr "ç¦ç”¨æè´¨" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5887,6 +5887,9 @@ msgstr "| 或" #~ msgid "Enable Audio Throttle" #~ msgstr "å¯ç”¨éŸ³é¢‘调节" +#~ msgid "Enable BAT" +#~ msgstr "å¯ç”¨ BAT" + #~ msgid "Enable CPU Access" #~ msgstr "å¯ç”¨CPU访问" @@ -5914,6 +5917,15 @@ msgstr "| 或" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "å¯ç”¨å±å¹•ä¿æŠ¤(内部é™åˆ¶)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" + #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -5960,6 +5972,9 @@ msgstr "| 或" #~ msgid "Error opening file %s for recording" #~ msgstr "Error opening file %s for recording" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Exit Dolphin with emulator" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -5973,6 +5988,10 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "下载代ç å¤±è´¥." +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "载人原始纹ç†" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6022,6 +6041,15 @@ msgstr "| 或" #~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this " #~ "option may fix the game." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Disable lighting. Improves performance but causes lighting to disappear " +#~ "in games which use it." + #~ msgid "Input Source" #~ msgstr "输入æ¥æº" @@ -6065,6 +6093,16 @@ msgstr "| 或" #~ "Loading native mipmaps is the more accurate behavior, but might also " #~ "decrease performance (your mileage might vary though)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" + +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "é”定线程到核心" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "低级(LLE)或者高级(HLE)音频" + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "写入到控制å°" @@ -6100,6 +6138,12 @@ msgstr "| 或" #~ msgid "OpenGL" #~ msgstr "打开" +#~ msgid "Opens the debugger" +#~ msgstr "打开调试器" + +#~ msgid "Opens the logger" +#~ msgstr "打开日志" + #~ msgid "Plugins" #~ msgstr "æ’件" @@ -6134,6 +6178,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "è¿è¡Œè„šæœ¬ä¸­...\n" +#~ msgid "Sample Rate:" +#~ msgstr "采样率:" + #~ msgid "Scale:" #~ msgstr "比例:" @@ -6170,6 +6217,9 @@ msgstr "| 或" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Show the number of frames rendered per second." +#~ msgid "Show this help message" +#~ msgstr "显示这个帮助消æ¯" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6212,6 +6262,9 @@ msgstr "| 或" #~ "The other options are fixed resolutions for choosing a visual quality " #~ "independent of your display size." +#~ msgid "Specify a video backend" +#~ msgstr "指定一个视频åŽç«¯" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "指定一个视频åŽç«¯" @@ -6225,6 +6278,9 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "The file " +#~ msgid "Theme selection went wrong" +#~ msgstr "选择主题出现错误" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index d04d0447d1..9e1f1bb04f 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" -"PO-Revision-Date: 2011-03-15 02:51+0800\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" "Language: Traditional Chinese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (è¦é¡¯ç¤ºçš„項目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " éŠæˆ²ï¼š" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! éž" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "已斷開連接" @@ -148,156 +141,156 @@ msgstr "%s匯出 GCI%s" msgid "%sImport GCI%s" msgstr "%s匯入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "å’Œ(&&)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "關於(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "從 DVD 光碟機啟動(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "中斷點(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ç€è¦½ ISO 檔(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "作弊檔管ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "模擬器(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "檔案(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "畫格步進(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "å½±åƒè¨­å®š(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "說明(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "å¿«æ·éµè¨­å®š(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "讀å–進度(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GC 記憶å¡ç®¡ç†å™¨(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "記憶å¡(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "é–‹å•Ÿ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "é¸é …(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "æš«åœ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "屬性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "唯讀模å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "更新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "é‡æ–°å•Ÿå‹•(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "è²éŸ³(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "å½±åƒ(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "檢視(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -313,27 +306,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(關閉)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ä½å…ƒ" @@ -341,46 +334,48 @@ msgstr "8 ä½å…ƒ" msgid "" msgstr "<æ’å…¥å稱>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<無解æžåº¦è¨­å®š>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<ç„¡>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<系統>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "已經開啟一個網路å°æˆ°è¦–窗ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ç›®å‰æ²’有執行éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "找ä¸åˆ°æ”¯æ´çš„è—牙è£ç½®ï¼\n" "(åƒ…æ”¯æ´ Microsoft bluetooth stack 。)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -412,13 +407,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠å£é€²è¡Œè¨­å®šï¼ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 代碼" @@ -426,19 +421,19 @@ msgstr "AR 代碼" msgid "About Dolphin" msgstr "關於 Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -447,8 +442,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "æ“作" @@ -467,20 +462,20 @@ msgstr "" "兇手代碼：\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於添加的代碼 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於輸入 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -488,7 +483,7 @@ msgid "" msgstr "" "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) æ–¼ Ram å¯«å…¥åŠ è¼¸å…¥ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -496,15 +491,16 @@ msgid "" msgstr "" "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於寫入至 指示器 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay 錯誤：無效的數值 (%08x) 於記憶體複製 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 -#, c-format +#: Source/Core/Core/Src/ActionReplay.cpp:682 +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay 錯誤：主碼åŠå¯«å…¥è‡³ CCXXXXXX 沒有執行 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -512,27 +508,27 @@ msgstr "Action Replay 錯誤：主碼åŠå¯«å…¥è‡³ CCXXXXXX 沒有執行 (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay 錯誤：無效的 AR 代碼行： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay：有æ¢ä»¶çš„ä»£ç¢¼ï¼šç„¡æ•ˆçš„å¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay：無效的一般代碼類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "é…接器：" @@ -541,11 +537,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "新增修正" @@ -553,13 +549,13 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "新增..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ä½å€..." @@ -598,71 +594,76 @@ msgstr "" "\n" "注æ„：檢查日誌/控制å°è¦–窗檢視å–得的值。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "進階設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy 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 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘異性éŽæ¿¾ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "邊緣抗鋸齒：" @@ -674,31 +675,31 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "程å¼è®€å–器：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "套用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -706,12 +707,12 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -719,12 +720,12 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -732,26 +733,26 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -759,19 +760,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -780,17 +773,17 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "背景輸入" @@ -803,16 +796,16 @@ msgstr "å‘後" msgid "Bad File Header" msgstr "æ壞的檔頭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "æ©«å¹…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "橫幅：" @@ -820,11 +813,11 @@ msgstr "橫幅：" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本設定" @@ -836,7 +829,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "å€å¡Šåˆ†é…表校驗失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "å€å¡Š" @@ -852,47 +845,53 @@ msgstr "è— å·¦" msgid "Blue Right" msgstr "è— å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "下方" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "ç ´æ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "ç€è¦½" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "ç·©è¡ï¼š" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -905,30 +904,20 @@ msgstr "C-æ–æ¡¿" msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 -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:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -937,7 +926,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -953,7 +942,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -963,7 +952,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -971,18 +960,18 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" @@ -990,28 +979,28 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "中心" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "更改" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "æ›´æ›å…‰ç¢Ÿ(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "æ›´æ›å…‰ç¢Ÿ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" @@ -1032,11 +1021,10 @@ msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear åƒæ•¸çš„符號 (在修正後)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此é¸é …在模擬器執行時沒有效果ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "èŠå¤©" @@ -1044,48 +1032,48 @@ msgstr "èŠå¤©" msgid "Cheat Code" msgstr "作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "尋找作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "作弊代碼管ç†å™¨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1093,14 +1081,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "é¸æ“‡ä½œç‚ºç¨‹å¼è®€å–器的檔案：(åƒ…ç”¨æ–¼ä¾†è®€å– å…‰ç¢Ÿçš„ç›®éŒ„çµæ§‹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1114,8 +1102,8 @@ msgstr "Classic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "清除" @@ -1125,22 +1113,22 @@ msgid "" "manually stop the game." msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉。您必須手動åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "關閉" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "設定(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "代碼：" @@ -1148,96 +1136,96 @@ msgstr "代碼：" msgid "Command" msgstr "命令" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "正在壓縮 ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "設定" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "連接 Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "連接 Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "連接 Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "連接 Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "正在連接..." @@ -1253,16 +1241,16 @@ msgstr "控制器" msgid "Convert to GCI" msgstr "轉æ›ç‚º GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "核心" @@ -1271,7 +1259,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "無法建立 %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "無法åˆå§‹åŒ– backend %s。" @@ -1292,12 +1280,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1305,7 +1293,7 @@ msgstr "" "無法設置控制器。有玩家存留或者éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼\n" "(é‚„ä¸æ”¯æ´åœ¨éŠæˆ²åŸ·è¡Œæ™‚設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1317,11 +1305,11 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1329,17 +1317,17 @@ msgstr "" "無法åˆå§‹åŒ–核心。\n" "請檢查您的設定。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "數é‡ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "國別：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "建立 AR 代碼" @@ -1348,24 +1336,7 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by KDE-Look.org" -msgstr "ç”± KDE-Look.org 製åš" - -#: 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:496 -msgid "Created by VistaIcons.com" -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" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "作者：" @@ -1373,11 +1344,11 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "剪è£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1388,12 +1359,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1401,15 +1372,15 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Czech" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1417,37 +1388,37 @@ msgstr "" msgid "D-Pad" msgstr "åå­—æ–¹å‘éµ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD 根：" @@ -1459,16 +1430,16 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "資料大å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "日期：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro 檔案(*.sav)" @@ -1480,11 +1451,11 @@ msgstr "Datel MaxDrive/Pro 檔案(*.sav)" msgid "Dead Zone" msgstr "éžä½œç”¨å€" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1493,24 +1464,24 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO 解壓中" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" @@ -1519,11 +1490,11 @@ msgid "Default font" msgstr "é è¨­çš„å­—åž‹" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "刪除存檔" @@ -1532,12 +1503,12 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "å•é¡Œ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "檢測" @@ -1550,13 +1521,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1580,30 +1551,17 @@ msgstr "" "目錄校驗失敗\n" " 並且目錄備份校驗失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "關閉光æº" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "åƒç´ æ·±åº¦" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "關閉紋ç†" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1612,7 +1570,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1622,14 +1580,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "光碟" @@ -1638,11 +1589,11 @@ msgstr "光碟" msgid "Disc Read Error" msgstr "光碟讀å–錯誤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "顯示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1654,20 +1605,24 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin 官網(&W)" @@ -1675,54 +1630,59 @@ msgstr "Dolphin 官網(&W)" msgid "Dolphin Configuration" msgstr "Dolphin 模擬器設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模擬 Wiimote 設定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote 設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin 找ä¸åˆ°ä»»ä½• GC/Wii ISO。按兩下這裡ç€è¦½æª”案..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所有éŠæˆ²..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "下載代碼 (WiiRD 數據庫)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" @@ -1731,34 +1691,34 @@ msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "轉儲紋ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1766,32 +1726,32 @@ msgid "" "If unsure, leave this unchecked." msgstr "轉儲éŠæˆ²ç´‹ç†è‡³ User/Dump/Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "離開(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB 複製範åœ" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1803,11 +1763,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPE" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "編輯" @@ -1815,7 +1775,7 @@ msgstr "編輯" msgid "Edit ActionReplay Code" msgstr "編輯 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "編輯 ini 設定檔" @@ -1823,12 +1783,12 @@ msgstr "編輯 ini 設定檔" msgid "Edit Patch" msgstr "編輯修正" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "編輯..." @@ -1836,15 +1796,15 @@ msgstr "編輯..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1853,7 +1813,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1863,19 +1823,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "模擬狀態：" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1885,74 +1845,69 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enable BAT" -msgstr "é–‹å•Ÿ BAT" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "開啟線框" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1964,17 +1919,17 @@ msgstr "" "é–‹å•Ÿå„ç•°å‘性éŽæ¿¾ã€‚\n" "通éŽæŸ”化å¯è¦‹çš„多邊形增強紋ç†çš„視覺å“質。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "開啟快速光碟存å–。部份éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "開啟分é ç€è¦½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1982,7 +1937,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1990,26 +1945,34 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "é–‹å•Ÿæ­¤é¸é …將加速塞爾é”傳說：曙光公主，請勿在其它éŠæˆ²ä¸­ä½¿ç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" -"速度會變慢。(ON = 兼容ã€OFF = 快速)" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2017,13 +1980,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2034,14 +1997,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "增強" @@ -2059,17 +2022,17 @@ msgstr "é …ç›® %d/%d" msgid "Entry 1/%d" msgstr "é …ç›® 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "等於" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "錯誤" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2105,36 +2068,32 @@ msgstr "處ç†ç•°å¸¸ - å­˜å–下列記憶體空間。 %08llx%08llx" msgid "Execute" msgstr "執行" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "離開 Dolphin" - -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "匯出檔案" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "匯出錄åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "匯出錄åƒ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2142,15 +2101,15 @@ msgstr "匯出所有存檔" msgid "Export failed, try again?" msgstr "匯出失敗，è¦é‡è©¦å—Žï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "匯出存檔為..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2163,52 +2122,52 @@ msgstr "é¡å¤–åƒæ•¸" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：å¦ä¸€å€‹ M'' 中有效的é¡å¤–åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "æå–所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "æå–程å¼è®€å–器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "æå– DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "æå–資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "æå–檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "æå–中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2217,7 +2176,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST 大å°" @@ -2225,15 +2184,15 @@ msgstr "FST 大å°" msgid "Failed to Connect!" msgstr "連接失敗ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "監è½å¤±æ•—ï¼ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2262,6 +2221,11 @@ msgstr "è®€å– hid.dll 失敗" msgid "Failed to load hid.dll" msgstr "è®€å– hid.dll 失敗" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "檔案 %s 寫入檔頭失敗" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "è®€å– banner.bin 失敗" @@ -2344,48 +2308,43 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "讀å–原始紋ç†" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "檔案未å«æœ‰ä»£ç¢¼ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "檔案已轉æ›ç‚º .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2402,7 +2361,7 @@ msgstr "" "檔案有副檔å \"%s\"\n" "有效的副檔å是 (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "檔案未被識別為一張記憶å¡" @@ -2415,49 +2374,49 @@ msgstr "檔案未壓縮" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "首數據å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "修正校驗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "強制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "強制éŽæ¿¾" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2468,7 +2427,7 @@ msgstr "" "強制雙線型紋ç†éŽæ¿¾ç„¡è«–éŠæˆ²æ˜¯å¦æ˜Žç¢ºè¡¨ç¤ºæ˜¯å¦ç¦ç”¨å®ƒã€‚\n" "改進紋ç†å“質 (特別是使用高解æžåº¦ç´‹ç†æ™‚)但是å¯èƒ½å°Žè‡´æŸäº›éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2479,7 +2438,7 @@ msgstr "" "強制éŠæˆ²è¼¸å‡ºå¯¬èž¢å¹•è§£æžåº¦çš„å½±åƒã€‚\n" "注æ„這å¯èƒ½å°Žè‡´åœ–å½¢å•é¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2498,61 +2457,61 @@ msgstr "" msgid "Forward" msgstr "å‘å‰" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "自由視點" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "French" @@ -2560,21 +2519,21 @@ msgstr "French" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "全螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 檔案(*.gci)" @@ -2583,57 +2542,61 @@ msgstr "GCI 檔案(*.gci)" msgid "GCMic Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "éŠæˆ² ID ：" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "éŠæˆ²æœªåŸ·è¡Œï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "找ä¸åˆ°éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "éŠæˆ²è¦æ ¼è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代碼" @@ -2648,42 +2611,42 @@ msgstr "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "一般" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "German" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "大於" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2694,7 +2657,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Greek" @@ -2714,11 +2677,11 @@ msgstr "綠 å³" msgid "Guitar" msgstr "Guitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被調用，請回報ï¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2726,11 +2689,11 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebrew" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "高度" @@ -2738,7 +2701,7 @@ msgstr "高度" msgid "Help" msgstr "說明" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2754,15 +2717,15 @@ msgstr "" "\n" "å†è¦‹ï¼\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éš±è—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "éš±è—滑鼠游標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2774,8 +2737,8 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "主機" @@ -2783,26 +2746,26 @@ msgstr "主機" msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hungarian" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS：試圖å–得資料從未知的標簽： %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,31 +2777,31 @@ msgstr "" "標題 ID %016llx.\n" " Dolphin å¯èƒ½æœƒç•¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 設定" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR 指示器" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR éˆæ•åº¦ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2846,22 +2809,22 @@ msgstr "ISO 資料夾" msgid "ITALY" msgstr "ITALY" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2871,12 +2834,12 @@ msgstr "" "如果您è¦è¨­å®šç•«æ ¼æ•¸é™åˆ¶å¤§æ–¼éŠæˆ²çš„速度 (NTSC:60, PAL:50)，您就需è¦åŒæ™‚關閉 DSP " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "模擬格å¼è®ŠåŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2885,7 +2848,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2894,7 +2857,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "匯入存檔" @@ -2902,7 +2865,7 @@ msgstr "匯入存檔" msgid "Import failed, try again?" msgstr "匯入失敗，是å¦é‡è©¦ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2910,11 +2873,11 @@ msgstr "" "匯入的檔案有 gsc 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "匯入的檔案有無效的長度" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2922,7 +2885,7 @@ msgstr "" "匯入的檔案有 sav 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2931,24 +2894,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉霧化。改善效能，但是å¯èƒ½å°Žè‡´éœ€è¦é©ç•¶éœ§åŒ–模擬的éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "éŠæˆ²ä¸­" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "éŠæˆ²ä¸­" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "訊æ¯" @@ -2956,7 +2911,7 @@ msgstr "訊æ¯" msgid "Information" msgstr "訊æ¯" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "輸入" @@ -2968,7 +2923,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -2976,11 +2931,11 @@ msgstr "æ’å…¥ SD å¡" msgid "Insert name here.." msgstr "在這裡æ’å…¥å稱.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -2989,43 +2944,43 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "內部 LZO 錯誤 - 壓縮失敗" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3034,20 +2989,20 @@ msgstr "" "內部 LZO 錯誤 - 解壓縮失敗 (%d) (%li, %li) \n" "è«‹é‡è©¦è®€å–" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "內部 LZO 錯誤 - lzo_init() 失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "標題" @@ -3056,11 +3011,11 @@ msgstr "標題" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "無效大å°(%x) 或 Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "無效的數值ï¼" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" @@ -3069,7 +3024,7 @@ msgstr "無效的 bat.map 或目錄項目" msgid "Invalid event type %i" msgstr "無效的事件類型 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "無效的檔案" @@ -3084,29 +3039,29 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "無效的狀態" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italian" @@ -3114,16 +3069,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanese" @@ -3131,7 +3086,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3139,17 +3094,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korean" @@ -3167,19 +3122,23 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最後覆蓋的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最後使用的進度" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3189,8 +3148,8 @@ msgstr "å·¦" msgid "Left Stick" msgstr "å·¦ æ–æ¡¿" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3198,7 +3157,7 @@ msgstr "" "按左éµæª¢æ¸¬å¿«æ·éµã€‚\n" "按éµç›¤ç©ºç™½éµç‚ºæ¸…除。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3208,7 +3167,7 @@ msgstr "" "中éµæ¸…除。\n" "å³éµå–得更多é¸é …。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3216,78 +3175,78 @@ msgstr "" "å·¦/å³éµå–得更多é¸é …。\n" "中éµæ¸…除。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "讀å–儲存格 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "讀å–儲存格 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "讀å–儲存格 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "讀å–儲存格 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "讀å–儲存格 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "讀å–儲存格 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "讀å–儲存格 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "讀å–儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3299,37 +3258,40 @@ msgstr "從 User/Load/Textures// 讀å–高解æžåº¦ç´‹ç†" msgid "Load preset values from hack patterns available." msgstr "讀å–å¯ç”¨çš„修正設定é è¨­æª”" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" - -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "鎖定線程至內核" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "記錄" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 +msgid "Log FPS to file" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "記錄類型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "記錄輸出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "日誌" @@ -3337,10 +3299,6 @@ msgstr "日誌" msgid "Lost connection to server!" msgstr "éºå¤±èˆ‡ä¼ºæœå™¨çš„連接" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "指定低階 (LLE) 或高階 (HLE) è²éŸ³æ¨¡æ“¬å™¨" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M 鈕" @@ -3354,12 +3312,12 @@ msgstr "" "MD5 ä¸ç¬¦åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 速度修正" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" @@ -3368,34 +3326,34 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "廠商：" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "記憶å¡ä¸­å·²ç¶“存在一個此標題的存檔" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "記憶å¡å·²ç¶“é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "記憶å¡" @@ -3405,7 +3363,7 @@ msgid "" "could mangle stuff!" msgstr "記憶å¡ç®¡ç†å™¨è­¦å‘Š-在使用å‰è«‹å…ˆå‚™ä»½ï¼Œä»¥é˜²æ­¢å‡ºç¾æ毀時無法復原ï¼" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3430,21 +3388,21 @@ msgstr "" msgid "Menu" msgstr "é¸å–®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "其它設定" @@ -3453,7 +3411,7 @@ msgstr "其它設定" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3465,16 +3423,16 @@ msgstr "" msgid "Monospaced font" msgstr "等寬字型" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3489,17 +3447,17 @@ msgstr "" msgid "Multiply" msgstr "多é‡åˆ†æ’" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3587,38 +3545,38 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "å稱：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "å稱：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "原始 GCI 檔案(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "æ–°çš„æœå°‹" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "下一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "尋找下一個" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "暱稱：" @@ -3626,7 +3584,7 @@ msgstr "暱稱：" msgid "No Country (SDK)" msgstr "無國家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "找ä¸åˆ° ISO 或 WAD" @@ -3635,8 +3593,8 @@ msgstr "找ä¸åˆ° ISO 或 WAD" msgid "No banner file found for title %s" msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的圖示檔案" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3644,15 +3602,15 @@ msgstr "" msgid "No docking" msgstr "ä¸åœé " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "沒有剩餘的目錄索引項目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "無效的錄åƒæª”" @@ -3662,33 +3620,33 @@ msgstr "無效的錄åƒæª”" msgid "No save folder found for title %s" msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未連接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "註釋" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "注æ„：" @@ -3697,7 +3655,7 @@ msgstr "注æ„：" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "注æ„" @@ -3705,28 +3663,28 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "代碼數é‡ï¼š" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "關閉" @@ -3734,60 +3692,56 @@ msgstr "關閉" msgid "Offset:" msgstr "å移：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +msgid "On-Screen Display Messages" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format 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/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "開啟檔案..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL：無法關è¯è‡³è£ç½® %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 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/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "é¸é …" @@ -3796,7 +3750,7 @@ msgstr "é¸é …" msgid "Orange" msgstr "橘" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3806,8 +3760,8 @@ msgstr "" "按å³éµåŒ¯å‡ºæ‰€æœ‰å­˜æª”，\n" "並匯入存檔至一張新的記憶å¡ä¸­\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3817,19 +3771,19 @@ msgid "" "manually stop the game." msgstr "其它客戶端在éŠæˆ²åŸ·è¡Œæ™‚連接埠å£ï¼ï¼å·²é—œé–‰ç¶²è·¯å°æˆ°ã€‚您需è¦æ‰‹å‹•åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "輸出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "播放錄åƒ(&L)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "控制器" @@ -3845,7 +3799,7 @@ msgstr "下一é " msgid "Page Up" msgstr "上一é " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "é…å°" @@ -3857,31 +3811,35 @@ msgstr "段è½" msgid "Parameters" msgstr "åƒæ•¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "åˆ†å‰²å€ %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš«åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "完美" @@ -3890,37 +3848,37 @@ msgstr "完美" msgid "Perspective %d" msgstr "ç‰ˆå¼ %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "執行" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "執行/æš«åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "å¯çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "é¸é …" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "請確èª..." @@ -3932,55 +3890,55 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "åŸ å£ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3993,11 +3951,11 @@ msgstr "é è¨­ï¼š" msgid "Prev Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "上一個數值" @@ -4005,7 +3963,7 @@ msgstr "上一個數值" msgid "Print" msgstr "列å°" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "設定檔" @@ -4013,7 +3971,7 @@ msgstr "設定檔" msgid "Properties" msgstr "屬性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "清ç†å¿«å–" @@ -4021,8 +3979,8 @@ msgstr "清ç†å¿«å–" msgid "Question" msgstr "å•é¡Œ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "離開" @@ -4040,7 +3998,7 @@ msgstr "R 鈕" msgid "R-Analog" msgstr "R-類比" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4048,50 +4006,50 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "範åœ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "實體" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "實體 Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "實體 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "確èªé‡æ–°é€£æŽ¥ Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "讀å–進度後é‡æ–°é€£æŽ¥ Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4107,7 +4065,7 @@ msgstr "ç´… å·¦" msgid "Red Right" msgstr "ç´… å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4119,29 +4077,29 @@ msgstr "" "減少圖形失真形æˆçš„光柵化 3D 圖形。\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/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "æ›´æ–°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "更新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4151,17 +4109,17 @@ msgstr "" "場景渲染線框。\n" "這個僅用於除錯的目的使用。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "渲染至主視窗" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "çµæžœ" @@ -4178,7 +4136,7 @@ msgstr "å³" msgid "Right Stick" msgstr "å³ æ–æ¡¿" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震動" @@ -4187,117 +4145,113 @@ msgstr "震動" msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在ç¨ç«‹çš„線程中執行 DSP LLE (ä¸æŽ¨è–¦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russian" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 -msgid "Sample Rate:" -msgstr "å–樣率：" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "儲存" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "å¦å­˜ GCI ..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "儲存至儲存格 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "儲存至儲存格 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "儲存至儲存格 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "儲存至儲存格 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "儲存至儲存格 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "儲存至儲存格 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "儲存至儲存格 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "儲存至儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "截圖" @@ -4305,25 +4259,25 @@ msgstr "截圖" msgid "Scroll Lock" msgstr "滾動鎖定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "尋找作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4334,20 +4288,20 @@ msgid "Section %s not found in SYSCONF" msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "é¸æ“‡" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4365,23 +4319,23 @@ msgstr "é¸æ“‡è¦åŒ¯å…¥çš„存檔" msgid "Select floating windows" msgstr "é¸æ“‡æµ®å‹•è¦–窗" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4398,11 +4352,16 @@ msgstr "" "強制 4:3：拉伸畫é¢è‡³ 4:3。\n" "拉伸至視窗：拉伸畫é¢å……滿視窗。" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "é¸æ“‡å­—åž‹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4412,7 +4371,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4422,11 +4381,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "傳é€" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "傳感器ä½ç½®ï¼š" @@ -4434,46 +4393,52 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "設定..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem：無法找到設定檔" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "æ–晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "短å：" @@ -4482,107 +4447,107 @@ msgstr "短å：" msgid "Shoulder Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "顯示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "顯示日誌視窗(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "顯示狀態欄(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "顯示工具列(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "顯示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "顯示 France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "輸入顯示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "顯示 Italy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "顯示 JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "顯示語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "日誌記錄設定(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "顯示 PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "顯示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "顯示 Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "顯示 USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "顯示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "在åœæ­¢éŠæˆ²å¾Œé¡¯ç¤ºä¸€å€‹ç¢ºèªæ¡†ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4590,27 +4555,39 @@ msgstr "" "關閉此é¸é …å¯ä»¥é˜»æ­¢å…¨éƒ¨éžé—œéµçš„錯誤訊æ¯ï¼Œä½†æ˜¯å®ƒå¯èƒ½å°Žè‡´ Dolphin 在沒有任何徵兆" "的情æ³ä¸‹å´©æ½°ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "顯示第一個å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#, fuzzy +msgid "Show lag counter" +msgstr "顯示存檔æè¿°" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "顯示存檔å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "顯示存檔標題" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4618,48 +4595,48 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "顯示此說明訊æ¯" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "顯示 未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4667,7 +4644,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4677,17 +4654,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "æ’槽 B" @@ -4695,7 +4672,7 @@ msgstr "æ’槽 B" msgid "Snapshot" msgstr "截圖" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4707,11 +4684,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "è²éŸ³ backend %s 是無效的。" @@ -4725,17 +4702,17 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanish" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "æšè²å™¨éŸ³é‡ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4747,11 +4724,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "指定影åƒæ’件" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -4759,51 +4732,55 @@ msgstr "加速光碟傳輸率" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "標準控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "開始網路å°æˆ°(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "開始錄製(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "開始錄製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "狀態" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "å³æ™‚存檔" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: 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:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4812,7 +4789,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "拉伸至視窗" @@ -4833,12 +4810,12 @@ msgstr "æˆåŠŸåŒ¯å‡ºæª”案至 %s" msgid "Successfully imported save files" msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "系統語系：" @@ -4846,7 +4823,7 @@ msgstr "系統語系：" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4868,31 +4845,31 @@ msgstr "Table å·¦" msgid "Table Right" msgstr "Table å³" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "截å–ç•«é¢" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "測試" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "ç´‹ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "清ç†å¿«å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -4909,13 +4886,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4936,7 +4913,7 @@ msgstr "檔案 %s 無法開啟進行寫入。請確èªæ˜¯å¦æœ‰åˆ¥çš„程å¼æ­£ msgid "The file %s was already open, the file header will not be written." msgstr "檔案 %s 已經開啟，檔頭無法被寫入。" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) ä¸å­˜åœ¨" @@ -4953,7 +4930,7 @@ msgstr "å稱ä¸èƒ½å«æœ‰å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4961,11 +4938,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "您嘗試複製的檔案有一個無效的檔案大å°" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4996,21 +4973,18 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#, fuzzy +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:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "必須有 00000001/00000002 的標簽。這個 NAND dump å¯èƒ½æ˜¯ä¸å®Œæ•´çš„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5018,20 +4992,21 @@ msgstr "" "這些設定將替代核心 Dolphin 設定。\n" "未確定表示éŠæˆ²ä½¿ç”¨ Dolphin 的設定。" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5039,7 +5014,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5049,7 +5024,7 @@ msgstr "" "這將分離影åƒå’Œ CPU 線程，所以它們å¯ä»¥åŸ·è¡Œæ–¼ç¨ç«‹çš„內核中。\n" "å¯ä»¥åœ¨å¤šæ ¸å¿ƒçš„ PC 上å–å¾—éžå¸¸å¤§çš„加速，但是也å¯èƒ½å°Žè‡´å¶çˆ¾å´©æ½°æˆ–圖片å•é¡Œã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "這將å…許您手工編輯 INI 設定檔案" @@ -5058,41 +5033,41 @@ msgstr "這將å…許您手工編輯 INI 設定檔案" msgid "Threshold" msgstr "閾值" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "傾斜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "標題" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "上方" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" @@ -5112,7 +5087,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turkish" @@ -5124,12 +5099,12 @@ msgstr "Turntable" msgid "Type" msgstr "é¡žåž‹" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP 埠å£ï¼š" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5137,7 +5112,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5160,24 +5135,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未指定 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "å–消讀å–進度" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "未知" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "未知的 DVD 命令 %08x - 致命錯誤" @@ -5202,33 +5177,33 @@ msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "æ›´æ–°" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5236,7 +5211,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5245,15 +5220,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "工具" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "數值" @@ -5261,23 +5236,23 @@ msgstr "數值" msgid "Value:" msgstr "數值：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "數值：" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5292,7 +5267,7 @@ msgstr "WAD installation 失敗：錯誤於建立 %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installation 失敗：錯誤於建立 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5301,16 +5276,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模å¼ï¼" @@ -5329,7 +5304,7 @@ msgstr "" "%s\n" "您è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5342,7 +5317,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5350,7 +5325,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5358,7 +5333,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5378,7 +5353,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - 檔案無法開啟。" @@ -5386,32 +5361,32 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "寬螢幕修正" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5419,17 +5394,17 @@ msgstr "Wii 存檔 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD：無法從檔案中讀å–" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5442,19 +5417,19 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote 已連接" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote 馬é”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote 設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5475,27 +5450,27 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "執行中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "寫入至控制å°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "寫入至檔案" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "寫入至檔案" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "寫入至視窗" @@ -5514,7 +5489,7 @@ msgstr "XAudio2 åˆå§‹åŒ–失敗： %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 主è²éŸ³å»ºç«‹å¤±æ•—： %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5532,23 +5507,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "您ä¸èƒ½é—œé–‰æœ‰é é¢çš„é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "您必須é¸æ“‡ä¸€å€‹éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "您必須輸入一個å稱ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數值。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5571,25 +5546,25 @@ msgstr "" "應該是 0x%04x (è€Œéž 0x%04llx)\n" "是å¦è¦å»ºç«‹æ–°çš„檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 修正" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "ä¸æ”¯æ´ Zero 3 代碼" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code 未知於 dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 等候中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5601,7 +5576,7 @@ msgstr "" msgid "[Custom]" msgstr "[自訂]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5612,7 +5587,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5621,11 +5596,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5642,7 +5617,7 @@ msgstr "無法讀å–資料，從檔案： %s" msgid "failed to read header" msgstr "讀å–檔頭失敗" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" @@ -5652,7 +5627,7 @@ msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" msgid "not a wii save or read failure for file header size %x" msgstr "ä¸æ˜¯ä¸€å€‹ wii 存檔或讀å–檔案頭部大å°å¤±æ•— %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5661,7 +5636,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -5673,13 +5648,16 @@ msgstr "zFar 修正：" msgid "zNear Correction: " msgstr "zNear 修正：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| 或" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "畫格步進(&F)" @@ -5784,12 +5762,37 @@ msgstr "| 或" #~ msgid "Could not get info about plugin %s" #~ msgstr "無法å–得關於æ’件 %s 的訊æ¯" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ç”± KDE-Look.org 製åš" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ç”± Milosz Wlazlo è£½åš [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ç”± VistaIcons.com 製åš" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList å¿«å–" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "關閉光æº" + +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "åƒç´ æ·±åº¦" + +#~ msgid "Disable Textures" +#~ msgstr "關閉紋ç†" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5852,6 +5855,9 @@ msgstr "| 或" #~ msgid "Enable Audio Throttle" #~ msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" +#~ msgid "Enable BAT" +#~ msgstr "é–‹å•Ÿ BAT" + #~ msgid "Enable CPU Access" #~ msgstr "é–‹å•Ÿ CPU å­˜å–" @@ -5876,6 +5882,14 @@ msgstr "| 或" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "開啟螢幕ä¿è­· (內部é™åˆ¶)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模" +#~ "擬速度會變慢。(ON = 兼容ã€OFF = 快速)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" @@ -5918,6 +5932,9 @@ msgstr "| 或" #~ msgid "Error opening file %s for recording" #~ msgstr "開啟檔案 %s 用於錄製出錯" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "離開 Dolphin" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -5930,6 +5947,10 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "è®€å– DSP ROM 失敗： %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "讀å–原始紋ç†" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5976,6 +5997,13 @@ msgstr "| 或" #~ "如果一個éŠæˆ²æŽ›èµ·, 僅在解釋器或者 Dolphin 崩潰時有效，此é¸é …å¯èƒ½æœƒä¿®å¾©æŸäº›" #~ "éŠæˆ²ã€‚" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" + #~ msgid "Input Source" #~ msgstr "輸入æº" @@ -6015,6 +6043,16 @@ msgstr "| 或" #~ "讀å–原始的系列紋ç†ã€‚\n" #~ "讀å–原始的系列紋ç†æ˜¯è¼ƒç²¾æº–çš„æ–¹å¼ï¼Œä½†å®ƒå¯èƒ½æœƒé™ä½Žæ•ˆèƒ½ã€‚" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" + +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "鎖定線程至內核" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "指定低階 (LLE) 或高階 (HLE) è²éŸ³æ¨¡æ“¬å™¨" + #~ msgid "Lua Script Console" #~ msgstr "Lua 腳本控制å°" @@ -6043,6 +6081,12 @@ msgstr "| 或" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "開啟除錯器" + +#~ msgid "Opens the logger" +#~ msgstr "開啟日誌記錄器" + #~ msgid "Plugins" #~ msgstr "æ’件" @@ -6075,6 +6119,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "執行腳本...\n" +#~ msgid "Sample Rate:" +#~ msgstr "å–樣率：" + #~ msgid "Scale:" #~ msgstr "縮放：" @@ -6116,6 +6163,9 @@ msgstr "| 或" #~ msgid "Show the number of frames rendered per second." #~ msgstr "顯示æ¯ç§’的畫格數。" +#~ msgid "Show this help message" +#~ msgstr "顯示此說明訊æ¯" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6152,6 +6202,9 @@ msgstr "| 或" #~ "是較慢。\n" #~ "其它é¸é …åªæ˜¯ç”¨ä¾†ä¿®æ­£ç”¨ï¼Œç•¶ä½¿ç”¨äº†å…¶å®ƒçš„顯示/視窗 尺寸。" +#~ msgid "Specify a video backend" +#~ msgstr "指定影åƒæ’件" + #~ msgid "Specify an audio plugin" #~ msgstr "指定è²éŸ³æ’件" @@ -6164,6 +6217,9 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "檔案" +#~ msgid "Theme selection went wrong" +#~ msgstr "佈景主題é¸æ“‡éŒ¯èª¤" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Readme.txt b/Readme.txt index 3659d729d0..e23d0e0ec1 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,6 +1,6 @@ Dolphin-emu - The Gamecube / Wii Emulator ========================================== -Homesite: http://dolphin-emulator.com/ +Homesite: http://dolphin-emu.org/ Project Site: http://code.google.com/p/dolphin-emu Dolphin-emu is a emulator for Gamecube, Wii, Triforce that lets @@ -14,13 +14,14 @@ Team members: http://code.google.com/p/dolphin-emu/people/ Please read the FAQ before use: -http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions +http://dolphin-emu.org/docs/faq/ System Requirements: -* OS: Microsoft Windows (2000/XP/Vista or higher) or Linux or Apple Mac OS X. +* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X (10.6 or higher). + Windows XP x64 is NOT supported. * Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz). Dual Core for speed boost. -* Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1. +* Graphics: Any reasonably modern graphics card (Direct3D9/OpenGL 2.1, shader model 3.0). [Command line usage] Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] @@ -30,20 +31,22 @@ Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] -e, --exec= Loads the specified file (DOL,ELF,WAD,GCM,ISO) -b, --batch Exit Dolphin with emulator -V, --video_backend= Specify a video plugin - -A, --audio_emulation= Low level (LLE) or high level (HLE) audio + -A, --audio_emulation= Low level (LLE) or high level (HLE) audio [Libraries] Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html) *.pdb = Program Debug Database (use these symbols with a program debugger) -[DSP Plugins] -Plugin_DSP_HLE: High Level DSP Emulation -Plugin_DSP_LLE: Low Level DSP Emulation +[DSP Emulator Engines] +HLE: High Level DSP Emulation +LLE: Low Level DSP Emulation (requires DSP dumps) + Recompiler is faster than interpreter but may be buggy. [Video Backends] Direct3D9: Render with Direct3D 9 Direct3D11: Render with Direct3D 11 OpenGL: Render with OpenGL + Cg Shader Language +Software Renderer: Render using the CPU only (for devs only) [Sys Files] totaldb.dsy: Database of symbols (for devs only) @@ -54,9 +57,9 @@ setting-usa/jpn/usa.txt: config files for Wii Cache: used to cache the ISO list Config: emulator configuration files Dump: anything dumped from dolphin will go here -GC: Gamecube memory cards GameConfig: holds the INI game config files -Load: high resolution textures +GC: Gamecube memory cards +Load: custom textures Logs: logs go here Maps: symbol tables go here (dev only) OpenCL: OpenCL code diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 0c5f256c19..abb5dbf505 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -109,78 +109,89 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true - + + SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) + - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true - + + SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) + - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true true true - + + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) + - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true true true - + + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) + - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true true true - + + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) + - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true true true - + + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) + - - true - true - true - true - true - true - + - + @@ -189,17 +200,10 @@ - - true - true - true - true - true - true - + - + @@ -212,6 +216,14 @@ + + {68a5dd20-7057-448b-8fe0-b6ac8d205509} + true + true + false + true + false + {c87a4178-44f6-49b2-b7aa-c79af1b8c534} true diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index 7e098ecb85..30ff35a073 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -3,7 +3,6 @@ - @@ -21,11 +20,11 @@ SoundStreams + - @@ -44,6 +43,7 @@ SoundStreams + diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index be8c58d14a..939956460d 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -1,11 +1,16 @@ set(SRCS Src/AudioCommon.cpp - Src/AudioCommonConfig.cpp + Src/DPL2Decoder.cpp Src/Mixer.cpp Src/WaveFile.cpp Src/NullSoundStream.cpp) set(LIBS "") +if(ANDROID) + set(SRCS ${SRCS} Src/OpenSLESStream.cpp) + set(LIBS ${LIBS} OpenSLES) +endif(ANDROID) + if(ALSA_FOUND) set(SRCS ${SRCS} Src/AlsaSoundStream.cpp) set(LIBS ${LIBS} ${ALSA_LIBRARIES}) @@ -18,7 +23,7 @@ endif(AO_FOUND) if(OPENAL_FOUND) set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp) - set(LIBS ${LIBS} ${OPENAL_LIBRARY}) + set(LIBS ${LIBS} ${OPENAL_LIBRARY} SoundTouch ) endif(OPENAL_FOUND) if(PULSEAUDIO_FOUND) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index b73757cad5..2f299d0edb 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -26,6 +26,12 @@ #include "CoreAudioSoundStream.h" #include "OpenALStream.h" #include "PulseAudioStream.h" +#include "OpenSLESStream.h" +#include "../../Core/Src/Movie.h" +#include "../../Core/Src/ConfigManager.h" + +// This shouldn't be a global, at least not here. +SoundStream *soundStream; namespace AudioCommon { @@ -33,7 +39,7 @@ namespace AudioCommon { // TODO: possible memleak with mixer - std::string backend = ac_Config.sBackend; + std::string backend = SConfig::GetInstance().sBackend; if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); else if (backend == BACKEND_NULLSOUND && NullSound::isValid()) @@ -50,13 +56,14 @@ namespace AudioCommon soundStream = new CoreAudioSound(mixer); else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) soundStream = new PulseAudio(mixer); - + else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid()) + soundStream = new OpenSLESStream(mixer); if (soundStream != NULL) { - ac_Config.Update(); + UpdateSoundStream(); if (soundStream->Start()) { - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) { std::string audio_file_name = File::GetUserPath(D_DUMPAUDIO_IDX) + "audiodump.wav"; File::CreateFullPath(audio_file_name); @@ -81,7 +88,7 @@ namespace AudioCommon if (soundStream) { soundStream->Stop(); - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) soundStream->GetMixer()->StopLogAudio(); //soundStream->StopLogAudio(); delete soundStream; @@ -95,28 +102,34 @@ namespace AudioCommon { std::vector backends; - if (NullSound::isValid()) + if (NullSound::isValid()) backends.push_back(BACKEND_NULLSOUND); - if (DSound::isValid()) + if (DSound::isValid()) backends.push_back(BACKEND_DIRECTSOUND); - if (XAudio2::isValid()) + if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); + if (AOSound::isValid()) + backends.push_back(BACKEND_AOSOUND); + if (AlsaSound::isValid()) + backends.push_back(BACKEND_ALSA); + if (CoreAudioSound::isValid()) + backends.push_back(BACKEND_COREAUDIO); + if (PulseAudio::isValid()) + backends.push_back(BACKEND_PULSEAUDIO); if (OpenALStream::isValid()) backends.push_back(BACKEND_OPENAL); - if (AOSound::isValid()) - backends.push_back(BACKEND_AOSOUND); - if (AlsaSound::isValid()) - backends.push_back(BACKEND_ALSA); - if (CoreAudioSound::isValid()) - backends.push_back(BACKEND_COREAUDIO); - if (PulseAudio::isValid()) - backends.push_back(BACKEND_PULSEAUDIO); - + if (OpenSLESStream::isValid()) + backends.push_back(BACKEND_OPENSLES); return backends; } - bool UseJIT() { - return ac_Config.m_EnableJIT; + bool UseJIT() + { + if (!Movie::IsDSPHLE() && Movie::IsPlayingInput() && Movie::IsConfigSaved()) + { + return true; + } + return SConfig::GetInstance().m_EnableJIT; } void PauseAndLock(bool doLock, bool unpauseOnUnlock) @@ -137,4 +150,12 @@ namespace AudioCommon } } } + void UpdateSoundStream() + { + if (soundStream) + { + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); + soundStream->SetVolume(SConfig::GetInstance().m_Volume); + } + } } diff --git a/Source/Core/AudioCommon/Src/AudioCommon.h b/Source/Core/AudioCommon/Src/AudioCommon.h index e7a111b0a1..b7b32e7498 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.h +++ b/Source/Core/AudioCommon/Src/AudioCommon.h @@ -19,14 +19,12 @@ #define _AUDIO_COMMON_H_ #include "Common.h" -#include "AudioCommonConfig.h" #include "SoundStream.h" class CMixer; extern SoundStream *soundStream; -extern AudioCommonConfig ac_Config; // UDSPControl union UDSPControl @@ -60,6 +58,7 @@ namespace AudioCommon std::vector GetSoundBackends(); bool UseJIT(); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); + void UpdateSoundStream(); } #endif // _AUDIO_COMMON_H_ diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp deleted file mode 100644 index 08902e1c3f..0000000000 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "AudioCommon.h" -#include "CommonPaths.h" -#include "FileUtil.h" -#include "../../Core/Src/ConfigManager.h" - -AudioCommonConfig ac_Config; - -// This shouldn't be a global, at least not here. -SoundStream *soundStream; - -// Load from given file -void AudioCommonConfig::Load() -{ - IniFile file; - file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - - file.Get("Config", "EnableJIT", &m_EnableJIT, true); - file.Get("Config", "DumpAudio", &m_DumpAudio, false); -#if defined __linux__ && HAVE_ALSA - file.Get("Config", "Backend", &sBackend, BACKEND_ALSA); -#elif defined __APPLE__ - file.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO); -#elif defined _WIN32 - file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); -#else - file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); -#endif - file.Get("Config", "Frequency", &iFrequency, 48000); - file.Get("Config", "Volume", &m_Volume, 100); -} - -// Set the values for the file -void AudioCommonConfig::SaveSettings() -{ - IniFile file; - file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - - file.Set("Config", "EnableJIT", m_EnableJIT); - file.Set("Config", "DumpAudio", m_DumpAudio); - file.Set("Config", "Backend", sBackend); - file.Set("Config", "Frequency", iFrequency); - file.Set("Config", "Volume", m_Volume); - - file.Save(File::GetUserPath(F_DSPCONFIG_IDX)); -} - -// Update according to the values (stream/mixer) -void AudioCommonConfig::Update() { - if (soundStream) { - soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); - soundStream->SetVolume(m_Volume); - } -} diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp index d09bce85f9..f6d5d31bed 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp @@ -87,6 +87,13 @@ bool CoreAudioSound::Start() return false; } + err = AudioUnitSetParameter(audioUnit, + kHALOutputParam_Volume, + kAudioUnitParameterFlag_Output, 0, + m_volume / 100., 0); + if (err != noErr) + ERROR_LOG(AUDIO, "error setting volume"); + err = AudioUnitInitialize(audioUnit); if (err != noErr) { ERROR_LOG(AUDIO, "error initializing audiounit"); @@ -105,6 +112,7 @@ bool CoreAudioSound::Start() void CoreAudioSound::SetVolume(int volume) { OSStatus err; + m_volume = volume; err = AudioUnitSetParameter(audioUnit, kHALOutputParam_Volume, diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h index b7f7d96f53..581e4aabd8 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h @@ -47,6 +47,7 @@ public: private: AudioUnit audioUnit; + int m_volume; static OSStatus callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp new file mode 100644 index 0000000000..6a63f696de --- /dev/null +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -0,0 +1,400 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// Dolby Pro Logic 2 decoder from ffdshow-tryout +// * Copyright 2001 Anders Johansson ajh@atri.curtin.edu.au +// * Copyright (c) 2004-2006 Milan Cutka +// * based on mplayer HRTF plugin by ylai + +#include +#include +#include +#include +#include +#include "DPL2Decoder.h" + +#define M_PI 3.14159265358979323846 +#define M_SQRT1_2 0.70710678118654752440 + +int olddelay = -1; +unsigned int oldfreq = 0; +unsigned int dlbuflen; +int cyc_pos; +float l_fwr, r_fwr, lpr_fwr, lmr_fwr; +std::vector fwrbuf_l, fwrbuf_r; +float adapt_l_gain, adapt_r_gain, adapt_lpr_gain, adapt_lmr_gain; +std::vector lf, rf, lr, rr, cf, cr; +float LFE_buf[256]; +unsigned int lfe_pos; +float *filter_coefs_lfe; +unsigned int len125; + +template static _ftype_t dotproduct(int count,const T *buf,const _ftype_t *coefficients) +{ + float sum0=0,sum1=0,sum2=0,sum3=0; + for (;count>=4;buf+=4,coefficients+=4,count-=4) + { + sum0+=buf[0]*coefficients[0]; + sum1+=buf[1]*coefficients[1]; + sum2+=buf[2]*coefficients[2]; + sum3+=buf[3]*coefficients[3]; + } + while (count--) sum0+= *buf++ * *coefficients++; + return sum0+sum1+sum2+sum3; +} + +template static T firfilter(const T *buf, int pos, int len, int count, const float *coefficients) +{ + int count1, count2; + + if (pos >= count) + { + pos -= count; + count1 = count; count2 = 0; + } + else + { + count2 = pos; + count1 = count - pos; + pos = len - count1; + } + + // high part of window + const T *ptr = &buf[pos]; + + float r1=dotproduct(count1,ptr,coefficients);coefficients+=count1; + float r2=dotproduct(count2,buf,coefficients); + return T(r1+r2); +} + +template inline const T& limit(const T& val, const T& min, const T& max) +{ + if (val < min) { + return min; + } else if (val > max) { + return max; + } else { + return val; + } +} + +/* +// Hamming +// 2*pi*k +// w(k) = 0.54 - 0.46*cos(------), where 0 <= k < N +// N-1 +// +// n window length +// w buffer for the window parameters +*/ +void hamming(int n, float* w) +{ + int i; + float k = float(2*M_PI/((float)(n-1))); // 2*pi/(N-1) + + // Calculate window coefficients + for (i=0; i Fs/2 +flags window and filter type as defined in filter.h +variables are ored together: i.e. LP|HAMMING will give a +low pass filter designed using a hamming window +opt beta constant used only when designing using kaiser windows + +returns 0 if OK, -1 if fail +*/ +float* design_fir(unsigned int *n, float* fc, float opt) +{ + unsigned int o = *n & 1; // Indicator for odd filter length + unsigned int end = ((*n + 1) >> 1) - o; // Loop end + unsigned int i; // Loop index + + float k1 = 2 * float(M_PI); // 2*pi*fc1 + float k2 = 0.5f * (float)(1 - o);// Constant used if the filter has even length + float g = 0.0f; // Gain + float t1; // Temporary variables + float fc1; // Cutoff frequencies + + // Sanity check + if(*n==0) return NULL; + fc[0]=limit(fc[0],float(0.001),float(1)); + + float *w=(float*)calloc(sizeof(float),*n); + + // Get window coefficients + hamming(*n,w); + + fc1=*fc; + // Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2 + fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1/2 : 0.25f; + k1 *= fc1; + + // Low pass filter + + // If the filter length is odd, there is one point which is exactly + // in the middle. The value at this point is 2*fCutoff*sin(x)/x, + // where x is zero. To make sure nothing strange happens, we set this + // value separately. + if (o) + { + w[end] = fc1 * w[end] * 2.0f; + g=w[end]; + } + + // Create filter + for (i=0 ; i M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr; + float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr); + float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); + float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr); + float lpr, lmr; + float l_agc, r_agc, lpr_agc, lmr_agc; + float f, d_gain, c_gain, c_agc_cfk; + + /*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/ + /* AGC adaption */ + d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f; + f = d_gain * (1.0f / MATAGCTRIG); + f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); + *_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain; + *_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain; + /* Matrix */ + l_agc = in[il] * passive_lock(*_adapt_l_gain); + r_agc = in[ir] * passive_lock(*_adapt_r_gain); + _cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; + if (decode_rear) + { + _lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; + /* Stereo rear channel is steered with the same AGC steering as + the decoding matrix. Note this requires a fast updating AGC + at the order of 20 ms (which is the case here). */ + _lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr); + _rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr); + } + + /*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/ + lpr = (in[il] + in[ir]) * (float)M_SQRT1_2; + lmr = (in[il] - in[ir]) * (float)M_SQRT1_2; + /* AGC adaption */ + d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain); + f = d_gain * (1.0f / MATAGCTRIG); + f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); + *_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain; + *_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain; + /* Matrix */ + lpr_agc = lpr * passive_lock(*_adapt_lpr_gain); + lmr_agc = lmr * passive_lock(*_adapt_lmr_gain); + _lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; + _rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; + + /*** CENTER FRONT CANCELLATION ***/ + /* A heuristic approach exploits that Lt + Rt gain contains the + information about Lt, Rt correlation. This effectively reshapes + the front and rear "cones" to concentrate Lt + Rt to C and + introduce Lt - Rt in L, R. */ + /* 0.67677 is the empirical lower bound for lpr_gain. */ + c_gain = 8 * (*_adapt_lpr_gain - 0.67677f); + c_gain = c_gain > 0 ? c_gain : 0; + /* c_gain should not be too high, not even reaching full + cancellation (~ 0.50 - 0.55 at current AGC implementation), or + the center will sound too narrow. */ + c_gain = MATCOMPGAIN / (1 + c_gain * c_gain); + c_agc_cfk = c_gain * _cf[k]; + _lf[k] -= c_agc_cfk; + _rf[k] -= c_agc_cfk; + _cf[k] += c_agc_cfk + c_agc_cfk; +} + +void dpl2decode(float *samples, int numsamples, float *out) +{ + static const unsigned int FWRDURATION = 240; /* FWR average duration (samples) */ + static const int cfg_delay = 0; + static const unsigned int fmt_freq = 48000; + static const unsigned int fmt_nchannels = 2; // input channels + + int cur = 0; + + if (olddelay != cfg_delay || oldfreq != fmt_freq) + { + done(); + olddelay = cfg_delay; + oldfreq = fmt_freq; + dlbuflen = std::max(FWRDURATION, (fmt_freq * cfg_delay / 1000)); //+(len7000-1); + cyc_pos = dlbuflen - 1; + fwrbuf_l.resize(dlbuflen); + fwrbuf_r.resize(dlbuflen); + lf.resize(dlbuflen); + rf.resize(dlbuflen); + lr.resize(dlbuflen); + rr.resize(dlbuflen); + cf.resize(dlbuflen); + cr.resize(dlbuflen); + filter_coefs_lfe = calc_coefficients_125Hz_lowpass(fmt_freq); + lfe_pos = 0; + memset(LFE_buf, 0, sizeof(LFE_buf)); + } + + float *in = samples; // Input audio data + float *end = in + numsamples * fmt_nchannels; // Loop end + + while (in < end) + { + const int k = cyc_pos; + + const int fwr_pos = (k + FWRDURATION) % dlbuflen; + /* Update the full wave rectified total amplitude */ + /* Input matrix decoder */ + l_fwr += fabs(in[0]) - fabs(fwrbuf_l[fwr_pos]); + r_fwr += fabs(in[1]) - fabs(fwrbuf_r[fwr_pos]); + lpr_fwr += fabs(in[0] + in[1]) - fabs(fwrbuf_l[fwr_pos] + fwrbuf_r[fwr_pos]); + lmr_fwr += fabs(in[0] - in[1]) - fabs(fwrbuf_l[fwr_pos] - fwrbuf_r[fwr_pos]); + + /* Matrix encoded 2 channel sources */ + fwrbuf_l[k] = in[0]; + fwrbuf_r[k] = in[1]; + matrix_decode(in, k, 0, 1, true, dlbuflen, + l_fwr, r_fwr, + lpr_fwr, lmr_fwr, + &adapt_l_gain, &adapt_r_gain, + &adapt_lpr_gain, &adapt_lmr_gain, + &lf[0], &rf[0], &lr[0], &rr[0], &cf[0]); + + out[cur + 0] = lf[k]; + out[cur + 1] = rf[k]; + out[cur + 2] = cf[k]; + LFE_buf[lfe_pos] = (out[0] + out[1]) / 2; + out[cur + 3] = firfilter(LFE_buf, lfe_pos, len125, len125, filter_coefs_lfe); + lfe_pos++; + if (lfe_pos == len125) + { + lfe_pos = 0; + } + out[cur + 4] = lr[k]; + out[cur + 5] = rr[k]; + // Next sample... + in += 2; + cur += 6; + cyc_pos--; + if (cyc_pos < 0) + { + cyc_pos += dlbuflen; + } + } +} + +void dpl2reset() +{ + olddelay = -1; + oldfreq = 0; + filter_coefs_lfe = NULL; +} diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.h b/Source/Core/AudioCommon/Src/DPL2Decoder.h new file mode 100644 index 0000000000..eee8fbf15e --- /dev/null +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.h @@ -0,0 +1,24 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _DPL2DECODER_H_ +#define _DPL2DECODER_H_ + +void dpl2decode(float *samples, int numsamples, float *out); +void dpl2reset(); + +#endif // _DPL2DECODER_H_ diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h index da456d5bf7..a9de2cee72 100644 --- a/Source/Core/AudioCommon/Src/Mixer.h +++ b/Source/Core/AudioCommon/Src/Mixer.h @@ -92,6 +92,9 @@ public: std::mutex& MixerCritical() { return m_csMixing; } + float GetCurrentSpeed() const { return m_speed; } + void UpdateSpeed(volatile float val) { m_speed = val; } + protected: unsigned int m_sampleRate; unsigned int m_aiSampleRate; @@ -113,6 +116,8 @@ protected: bool m_AIplaying; std::mutex m_csMixing; + + volatile float m_speed; // Current rate of the emulation (1.0 = 100% speed) private: }; diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 99220f0ed2..7d1c45175b 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -15,13 +15,14 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include - #include "aldlist.h" #include "OpenALStream.h" +#include "DPL2Decoder.h" #if defined HAVE_OPENAL && HAVE_OPENAL +soundtouch::SoundTouch soundTouch; + // // AyuanX: Spec says OpenAL1.1 is thread safe already // @@ -35,14 +36,21 @@ bool OpenALStream::Start() pDeviceList = new ALDeviceList(); if ((pDeviceList) && (pDeviceList->GetNumDevices())) { - char *defDevName = pDeviceList-> \ - GetDeviceName(pDeviceList->GetDefaultDevice()); + char *defDevName = pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()); + + WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName); + pDevice = alcOpenDevice(defDevName); if (pDevice) { pContext = alcCreateContext(pDevice, NULL); if (pContext) { + // Used to determine an appropriate period size (2x period = total buffer size) + //ALCint refresh; + //alcGetIntegerv(pDevice, ALC_REFRESH, 1, &refresh); + //period_size_in_millisec = 1000 / refresh; + alcMakeContextCurrent(pContext); thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this); bReturn = true; @@ -50,8 +58,7 @@ bool OpenALStream::Start() else { alcCloseDevice(pDevice); - PanicAlertT("OpenAL: can't create context " - "for device %s", defDevName); + PanicAlertT("OpenAL: can't create context for device %s", defDevName); } } else @@ -65,6 +72,10 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } + // Initialise DPL2 parameters + dpl2reset(); + + soundTouch.clear(); return bReturn; } @@ -74,6 +85,8 @@ void OpenALStream::Stop() // kick the thread if it's waiting soundSyncEvent.Set(); + soundTouch.clear(); + thread.join(); alSourceStop(uiSource); @@ -82,7 +95,7 @@ void OpenALStream::Stop() // Clean up buffers and sources alDeleteSources(1, &uiSource); uiSource = 0; - alDeleteBuffers(OAL_NUM_BUFFERS, uiBuffers); + alDeleteBuffers(numBuffers, uiBuffers); ALCcontext *pContext = alcGetCurrentContext(); ALCdevice *pDevice = alcGetContextsDevice(pContext); @@ -111,6 +124,7 @@ void OpenALStream::Clear(bool mute) if(m_muted) { + soundTouch.clear(); alSourceStop(uiSource); } else @@ -123,67 +137,216 @@ void OpenALStream::SoundLoop() { Common::SetCurrentThreadName("Audio thread - openal"); - ALenum err; u32 ulFrequency = m_mixer->GetSampleRate(); + numBuffers = Core::g_CoreStartupParameter.iLatency + 2; // OpenAL requires a minimum of two buffers - memset(uiBuffers, 0, OAL_NUM_BUFFERS * sizeof(ALuint)); + memset(uiBuffers, 0, numBuffers * sizeof(ALuint)); uiSource = 0; // Generate some AL Buffers for streaming - alGenBuffers(OAL_NUM_BUFFERS, (ALuint *)uiBuffers); + alGenBuffers(numBuffers, (ALuint *)uiBuffers); // Generate a Source to playback the Buffers alGenSources(1, &uiSource); // Short Silence + memset(sampleBuffer, 0, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * numBuffers); memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4); - for (int i = 0; i < OAL_NUM_BUFFERS; i++) - alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES, ulFrequency); - alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers); + for (int i = 0; i < numBuffers; i++) + { +#if !defined(__APPLE__) + if (Core::g_CoreStartupParameter.bDPL2Decoder) + alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, 4 * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); + else +#endif + alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, 4 * 2 * 2, ulFrequency); + } + alSourceQueueBuffers(uiSource, numBuffers, uiBuffers); alSourcePlay(uiSource); // Set the default sound volume as saved in the config file. alSourcef(uiSource, AL_GAIN, fVolume); - err = alGetError(); // TODO: Error handling + //ALenum err = alGetError(); ALint iBuffersFilled = 0; ALint iBuffersProcessed = 0; - ALuint uiBufferTemp[OAL_NUM_BUFFERS] = {0}; + ALint iState = 0; + ALuint uiBufferTemp[OAL_MAX_BUFFERS] = {0}; + + soundTouch.setChannels(2); + soundTouch.setSampleRate(ulFrequency); + soundTouch.setTempo(1.0); + soundTouch.setSetting(SETTING_USE_QUICKSEEK, 0); + soundTouch.setSetting(SETTING_USE_AA_FILTER, 0); + soundTouch.setSetting(SETTING_SEQUENCE_MS, 1); + soundTouch.setSetting(SETTING_SEEKWINDOW_MS, 28); + soundTouch.setSetting(SETTING_OVERLAP_MS, 12); + + bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder; +#if defined(__APPLE__) + bool float32_capable = false; +#else + bool float32_capable = true; +#endif while (!threadData) { + // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. + const u32 stereo_16_bit_size = 4; + const u32 dma_length = 32; + const u64 ais_samples_per_second = 48000 * stereo_16_bit_size; + u64 audio_dma_period = SystemTimers::GetTicksPerSecond() / (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length); + u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); + + unsigned int numSamples = (unsigned int)num_samples_to_render; + unsigned int minSamples = surround_capable ? 240 : 0; // DPL2 accepts 240 samples minimum (FWRDURATION) + + numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; + numSamples = m_mixer->Mix(realtimeBuffer, numSamples); + + // Convert the samples from short to float + float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; + for (u32 i = 0; i < numSamples; ++i) + { + dest[i * 2 + 0] = (float)realtimeBuffer[i * 2 + 0] / (1 << 16); + dest[i * 2 + 1] = (float)realtimeBuffer[i * 2 + 1] / (1 << 16); + } + + soundTouch.putSamples(dest, numSamples); + if (iBuffersProcessed == iBuffersFilled) { alGetSourcei(uiSource, AL_BUFFERS_PROCESSED, &iBuffersProcessed); iBuffersFilled = 0; } - unsigned int numSamples = m_mixer->GetNumSamples(); - - if (iBuffersProcessed && (numSamples >= OAL_THRESHOLD)) + if (iBuffersProcessed) { - numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; - // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) - if (iBuffersFilled == 0) - alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp); + float rate = m_mixer->GetCurrentSpeed(); + if (rate <= 0) + { + Core::RequestRefreshInfo(); + rate = m_mixer->GetCurrentSpeed(); + } - m_mixer->Mix(realtimeBuffer, numSamples); - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, realtimeBuffer, numSamples * 4, ulFrequency); - alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); - iBuffersFilled++; + // Place a lower limit of 10% speed. When a game boots up, there will be + // many silence samples. These do not need to be timestretched. + if (rate > 0.10) + { + // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio + soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); + soundTouch.setTempo(rate); + if (rate > 10) + { + soundTouch.clear(); + } + } - if (iBuffersFilled == OAL_NUM_BUFFERS) - alSourcePlay(uiSource); + unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * OAL_MAX_BUFFERS); + + if (nSamples > minSamples) + { + // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) + if (iBuffersFilled == 0) + { + alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error unqueuing buffers: %08x", err); + } + } +#if defined(__APPLE__) + // OSX does not have the alext AL_FORMAT_51CHN32 yet. + surround_capable = false; +#else + if (surround_capable) + { + float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS]; + dpl2decode(sampleBuffer, nSamples, dpl2); + + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); + ALenum err = alGetError(); + if (err == AL_INVALID_ENUM) + { + // 5.1 is not supported by the host, fallback to stereo + WARN_LOG(AUDIO, "Unable to set 5.1 surround mode. Updating OpenAL Soft might fix this issue."); + surround_capable = false; + } + else if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred while buffering data: %08x", err); + } + } +#endif + if (!surround_capable) + { +#if !defined(__APPLE__) + if (float32_capable) + { + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency); + ALenum err = alGetError(); + if (err == AL_INVALID_ENUM) + { + float32_capable = false; + } + else if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred while buffering float32 data: %08x", err); + } + + } +#endif + if (!float32_capable) + { + // Convert the samples from float to short + short stereo[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; + for (u32 i = 0; i < nSamples; ++i) + { + stereo[i * 2 + 0] = (short)((float)sampleBuffer[i * 2 + 0] * (1 << 16)); + stereo[i * 2 + 1] = (short)((float)sampleBuffer[i * 2 + 1] * (1 << 16)); + } + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * 2 * 2, ulFrequency); + + } + } + + alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error queuing buffers: %08x", err); + } + iBuffersFilled++; + + if (iBuffersFilled == numBuffers) + { + alSourcePlay(uiSource); + err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err); + } + } + + alGetSourcei(uiSource, AL_SOURCE_STATE, &iState); + if (iState != AL_PLAYING) + { + // Buffer underrun occurred, resume playback + alSourcePlay(uiSource); + err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err); + } + } + } } - else if (numSamples >= OAL_THRESHOLD) + else { - ALint state = 0; - alGetSourcei(uiSource, AL_SOURCE_STATE, &state); - if (state == AL_STOPPED) - alSourcePlay(uiSource); + soundSyncEvent.Wait(); } - soundSyncEvent.Wait(); } } diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index 2c0d75b510..a808fcefc9 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -24,21 +24,30 @@ #if defined HAVE_OPENAL && HAVE_OPENAL #ifdef _WIN32 -#include "../../../../Externals/OpenAL/include/al.h" -#include "../../../../Externals/OpenAL/include/alc.h" +#include +#include +#include #elif defined __APPLE__ #include #include #else #include #include +#include #endif +#include "Core.h" +#include "HW/SystemTimers.h" +#include "HW/AudioInterface.h" +#include +#include + // 16 bit Stereo #define SFX_MAX_SOURCE 1 -#define OAL_NUM_BUFFERS 16 -#define OAL_MAX_SAMPLES 512 // AyuanX: Don't make it too large, as larger buffer means longer delay -#define OAL_THRESHOLD 128 // Some games are quite sensitive to delay +#define OAL_MAX_BUFFERS 32 +#define OAL_MAX_SAMPLES 256 +#define SURROUND_CHANNELS 6 // number of channels in surround mode +#define SIZE_FLOAT 4 // size of a float in bytes #endif class OpenALStream: public SoundStream @@ -64,11 +73,14 @@ public: private: std::thread thread; Common::Event soundSyncEvent; - + short realtimeBuffer[OAL_MAX_SAMPLES * 2]; - ALuint uiBuffers[OAL_NUM_BUFFERS]; + soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS]; + ALuint uiBuffers[OAL_MAX_BUFFERS]; ALuint uiSource; ALfloat fVolume; + + u8 numBuffers; #else public: OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {} diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp new file mode 100644 index 0000000000..b0913a1895 --- /dev/null +++ b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp @@ -0,0 +1,145 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifdef ANDROID +#include "Common.h" +#include +#include "OpenSLESStream.h" + +#include +#include + +// engine interfaces +static SLObjectItf engineObject; +static SLEngineItf engineEngine; +static SLObjectItf outputMixObject; + +// buffer queue player interfaces +static SLObjectItf bqPlayerObject = NULL; +static SLPlayItf bqPlayerPlay; +static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue; +static SLMuteSoloItf bqPlayerMuteSolo; +static SLVolumeItf bqPlayerVolume; +static CMixer *g_mixer; +#define BUFFER_SIZE 512 +#define BUFFER_SIZE_IN_SAMPLES (BUFFER_SIZE / 2) + +// Double buffering. +static short buffer[2][BUFFER_SIZE]; +static int curBuffer = 0; + +static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) { + assert(bq == bqPlayerBufferQueue); + assert(NULL == context); + + short *nextBuffer = buffer[curBuffer]; + int nextSize = sizeof(buffer[0]); + + SLresult result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, nextBuffer, nextSize); + + // Comment from sample code: + // the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT, + // which for this code example would indicate a programming error + assert(SL_RESULT_SUCCESS == result); + + curBuffer ^= 1; // Switch buffer + // Render to the fresh buffer + g_mixer->Mix(reinterpret_cast(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES); +} +bool OpenSLESStream::Start() +{ + SLresult result; + // create engine + result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL); + assert(SL_RESULT_SUCCESS == result); + result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine); + assert(SL_RESULT_SUCCESS == result); + result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, 0, 0); + assert(SL_RESULT_SUCCESS == result); + result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + + SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2}; + SLDataFormat_PCM format_pcm = { + SL_DATAFORMAT_PCM, + 2, + SL_SAMPLINGRATE_44_1, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT, + SL_BYTEORDER_LITTLEENDIAN + }; + + SLDataSource audioSrc = {&loc_bufq, &format_pcm}; + + // configure audio sink + SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject}; + SLDataSink audioSnk = {&loc_outmix, NULL}; + + // create audio player + const SLInterfaceID ids[2] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME}; + const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE}; + result = (*engineEngine)->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req); + assert(SL_RESULT_SUCCESS == result); + + result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE, + &bqPlayerBufferQueue); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING); + assert(SL_RESULT_SUCCESS == result); + + // Render and enqueue a first buffer. (or should we just play the buffer empty?) + curBuffer = 0; + + result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[curBuffer], sizeof(buffer[curBuffer])); + if (SL_RESULT_SUCCESS != result) { + return false; + } + curBuffer ^= 1; + g_mixer = m_mixer; + return true; +} + +void OpenSLESStream::Stop() +{ + if (bqPlayerObject != NULL) { + (*bqPlayerObject)->Destroy(bqPlayerObject); + bqPlayerObject = NULL; + bqPlayerPlay = NULL; + bqPlayerBufferQueue = NULL; + bqPlayerMuteSolo = NULL; + bqPlayerVolume = NULL; + } + if (outputMixObject != NULL) { + (*outputMixObject)->Destroy(outputMixObject); + outputMixObject = NULL; + } + if (engineObject != NULL) { + (*engineObject)->Destroy(engineObject); + engineObject = NULL; + engineEngine = NULL; + } +} +#endif diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.h b/Source/Core/AudioCommon/Src/OpenSLESStream.h new file mode 100644 index 0000000000..f49160c4bc --- /dev/null +++ b/Source/Core/AudioCommon/Src/OpenSLESStream.h @@ -0,0 +1,48 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _OPENSLSTREAM_H_ +#define _OPENSLSTREAM_H_ + +#include "Thread.h" +#include "SoundStream.h" + +class OpenSLESStream : public SoundStream +{ +#ifdef ANDROID +public: + OpenSLESStream(CMixer *mixer, void *hWnd = NULL) + : SoundStream(mixer) + {}; + + virtual ~OpenSLESStream() {}; + + virtual bool Start(); + virtual void Stop(); + static bool isValid() { return true; } + virtual bool usesMixer() const { return true; } + +private: + std::thread thread; + Common::Event soundSyncEvent; +#else +public: + OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {} +#endif // HAVE_OPENSL +}; + +#endif diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 4851b4bd12..faa94c22e0 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -22,31 +22,31 @@ #include "PulseAudioStream.h" -#define BUFFER_SIZE 4096 -#define BUFFER_SIZE_BYTES (BUFFER_SIZE * 4) +namespace +{ +const size_t BUFFER_SAMPLES = 512; +const size_t CHANNEL_COUNT = 2; +const size_t BUFFER_SIZE = BUFFER_SAMPLES * CHANNEL_COUNT; +} PulseAudio::PulseAudio(CMixer *mixer) - : SoundStream(mixer), thread_running(false), mainloop(NULL) - , context(NULL), stream(NULL), iVolume(100) -{ - mix_buffer = new u8[BUFFER_SIZE_BYTES]; -} - -PulseAudio::~PulseAudio() -{ - delete [] mix_buffer; -} + : SoundStream(mixer) + , mix_buffer(BUFFER_SIZE) + , thread() + , run_thread() + , pa() +{} bool PulseAudio::Start() { - thread_running = true; + run_thread = true; thread = std::thread(std::mem_fun(&PulseAudio::SoundLoop), this); return true; } void PulseAudio::Stop() { - thread_running = false; + run_thread = false; thread.join(); } @@ -60,260 +60,53 @@ void PulseAudio::SoundLoop() { Common::SetCurrentThreadName("Audio thread - pulse"); - thread_running = PulseInit(); - - while (thread_running) + if (PulseInit()) { - int frames_to_deliver = 512; - m_mixer->Mix((short *)mix_buffer, frames_to_deliver); - if (!Write(mix_buffer, frames_to_deliver * 4)) - ERROR_LOG(AUDIO, "PulseAudio failure writing data"); + while (run_thread) + { + m_mixer->Mix(&mix_buffer[0], mix_buffer.size() / CHANNEL_COUNT); + Write(&mix_buffer[0], mix_buffer.size() * sizeof(s16)); + } + + PulseShutdown(); } - PulseShutdown(); } bool PulseAudio::PulseInit() { - // The Sample format to use - const pa_sample_spec ss = + pa_sample_spec ss = {}; + ss.format = PA_SAMPLE_S16LE; + ss.channels = 2; + ss.rate = m_mixer->GetSampleRate(); + + int error; + pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK, + nullptr, "audio", &ss, nullptr, nullptr, &error); + + if (!pa) { - PA_SAMPLE_S16LE, - m_mixer->GetSampleRate(), - 2 - }; - - mainloop = pa_threaded_mainloop_new(); - - context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "dolphin-emu"); - pa_context_set_state_callback(context, ContextStateCB, this); - - if (pa_context_connect(context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) - { - ERROR_LOG(AUDIO, "PulseAudio failed to connect context: %s", - pa_strerror(pa_context_errno(context))); + ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s", + pa_strerror(error)); return false; } - - pa_threaded_mainloop_lock(mainloop); - pa_threaded_mainloop_start(mainloop); - - for (;;) + else { - pa_context_state_t state; - - state = pa_context_get_state(context); - - if (state == PA_CONTEXT_READY) - break; - - if (!PA_CONTEXT_IS_GOOD(state)) - { - ERROR_LOG(AUDIO, "PulseAudio context state failure: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Wait until the context is ready - pa_threaded_mainloop_wait(mainloop); + NOTICE_LOG(AUDIO, "Pulse successfully initialized."); + return true; } - - if (!(stream = pa_stream_new(context, "emulator", &ss, NULL))) - { - ERROR_LOG(AUDIO, "PulseAudio failed to create playback stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Set callbacks for the playback stream - pa_stream_set_state_callback(stream, StreamStateCB, this); - pa_stream_set_write_callback(stream, StreamWriteCB, this); - - if (pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_NOFLAGS, NULL, NULL) < 0) - { - ERROR_LOG(AUDIO, "PulseAudio failed to connect playback stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - for (;;) - { - pa_stream_state_t state; - - state = pa_stream_get_state(stream); - - if (state == PA_STREAM_READY) - break; - - if (!PA_STREAM_IS_GOOD(state)) - { - ERROR_LOG(AUDIO, "PulseAudio stream state failure: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Wait until the stream is ready - pa_threaded_mainloop_wait(mainloop); - } - - pa_threaded_mainloop_unlock(mainloop); - - SetVolume(iVolume); - - NOTICE_LOG(AUDIO, "Pulse successfully initialized."); - return true; } void PulseAudio::PulseShutdown() { - if (mainloop) - pa_threaded_mainloop_stop(mainloop); - - if (stream) - pa_stream_unref(stream); - - if (context) - { - pa_context_disconnect(context); - pa_context_unref(context); - } - - if (mainloop) - pa_threaded_mainloop_free(mainloop); + pa_simple_free(pa); } -void PulseAudio::SignalMainLoop() +void PulseAudio::Write(const void *data, size_t length) { - pa_threaded_mainloop_signal(mainloop, 0); -} - -void PulseAudio::ContextStateCB(pa_context *c, void *userdata) -{ - switch (pa_context_get_state(c)) + int error; + if (pa_simple_write(pa, data, length, &error) < 0) { - case PA_CONTEXT_READY: - case PA_CONTEXT_TERMINATED: - case PA_CONTEXT_FAILED: - ((PulseAudio *)userdata)->SignalMainLoop(); - break; - - default: - break; + ERROR_LOG(AUDIO, "PulseAudio failed to write data: %s", + pa_strerror(error)); } } - -void PulseAudio::StreamStateCB(pa_stream *s, void * userdata) -{ - switch (pa_stream_get_state(s)) - { - case PA_STREAM_READY: - case PA_STREAM_TERMINATED: - case PA_STREAM_FAILED: - ((PulseAudio *)userdata)->SignalMainLoop(); - break; - - default: - break; - } -} - -void PulseAudio::StreamWriteCB(pa_stream *s, size_t length, void *userdata) -{ - ((PulseAudio *)userdata)->SignalMainLoop(); -} - -static bool StateIsGood(pa_context *context, pa_stream *stream) -{ - if (!context || !PA_CONTEXT_IS_GOOD(pa_context_get_state(context)) || - !stream || !PA_STREAM_IS_GOOD(pa_stream_get_state(stream))) - { - if ((context && pa_context_get_state(context) == PA_CONTEXT_FAILED) || - (stream && pa_stream_get_state(stream) == PA_STREAM_FAILED)) - { - ERROR_LOG(AUDIO, "PulseAudio state failure: %s", - pa_strerror(pa_context_errno(context))); - } - else - { - ERROR_LOG(AUDIO, "PulseAudio state failure: %s", - pa_strerror(PA_ERR_BADSTATE)); - } - return false; - } - return true; -} - -bool PulseAudio::Write(const void *data, size_t length) -{ - if (!data || length == 0 || !stream) - return false; - - pa_threaded_mainloop_lock(mainloop); - - if (!StateIsGood(context, stream)) - { - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - while (length > 0) - { - size_t l; - int r; - - while (!(l = pa_stream_writable_size(stream))) - { - pa_threaded_mainloop_wait(mainloop); - if (!StateIsGood(context, stream)) - { - pa_threaded_mainloop_unlock(mainloop); - return false; - } - } - - if (l == (size_t)-1) - { - ERROR_LOG(AUDIO, "PulseAudio invalid stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - if (l > length) - l = length; - - r = pa_stream_write(stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE); - if (r < 0) - { - ERROR_LOG(AUDIO, "PulseAudio error writing to stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - data = (const uint8_t*) data + l; - length -= l; - } - - pa_threaded_mainloop_unlock(mainloop); - return true; -} - -void PulseAudio::SetVolume(int volume) -{ - iVolume = volume; - - if (!stream) - return; - - pa_cvolume cvolume; - const pa_channel_map *channels = pa_stream_get_channel_map(stream); - pa_cvolume_set(&cvolume, channels->channels, - iVolume * (PA_VOLUME_NORM - PA_VOLUME_MUTED) / 100); - - pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), - &cvolume, NULL, this); -} diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.h b/Source/Core/AudioCommon/Src/PulseAudioStream.h index f3a5a43e79..38399e2506 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.h +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.h @@ -19,7 +19,8 @@ #define _PULSE_AUDIO_STREAM_H #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO -#include +#include +#include #endif #include "Common.h" @@ -27,16 +28,16 @@ #include "Thread.h" +#include + class PulseAudio : public SoundStream { #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO public: PulseAudio(CMixer *mixer); - virtual ~PulseAudio(); virtual bool Start(); virtual void Stop(); - virtual void SetVolume(int volume); static bool isValid() {return true;} @@ -46,22 +47,16 @@ public: private: virtual void SoundLoop(); + bool PulseInit(); void PulseShutdown(); - bool Write(const void *data, size_t bytes); - void SignalMainLoop(); - static void ContextStateCB(pa_context *c, void *userdata); - static void StreamStateCB(pa_stream *s, void * userdata); - static void StreamWriteCB(pa_stream *s, size_t length, void *userdata); + void Write(const void *data, size_t bytes); - u8 *mix_buffer; + std::vector mix_buffer; std::thread thread; - volatile bool thread_running; + volatile bool run_thread; - pa_threaded_mainloop *mainloop; - pa_context *context; - pa_stream *stream; - int iVolume; + pa_simple* pa; #else public: PulseAudio(CMixer *mixer) : SoundStream(mixer) {} diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp index 802f3f7417..d98348b8bf 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.cpp +++ b/Source/Core/AudioCommon/Src/WaveFile.cpp @@ -100,39 +100,52 @@ void WaveFileWriter::Write4(const char *ptr) file.WriteBytes(ptr, 4); } -void WaveFileWriter::AddStereoSamples(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamples(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); - if (skip_silence) { + + if (skip_silence) + { bool all_zero = true; - for (int i = 0; i < count * 2; i++) - if (sample_data[i]) all_zero = false; - if (all_zero) return; + + for (u32 i = 0; i < count * 2; i++) + { + if (sample_data[i]) + all_zero = false; + } + + if (all_zero) + return; } + file.WriteBytes(sample_data, count * 4); audio_size += count * 4; } -void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); if (count > BUF_SIZE * 2) - PanicAlert("WaveFileWriter - buffer too small (count = %i).", count); + PanicAlert("WaveFileWriter - buffer too small (count = %u).", count); if (skip_silence) { bool all_zero = true; - for (int i = 0; i < count * 2; i++) + + for (u32 i = 0; i < count * 2; i++) + { if (sample_data[i]) all_zero = false; + } + if (all_zero) return; } - for (int i = 0; i < count * 2; i++) + for (u32 i = 0; i < count * 2; i++) conv_buffer[i] = Common::swap16((u16)sample_data[i]); file.WriteBytes(conv_buffer, count * 4); diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h index 72a090814b..11fbb4ced5 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.h +++ b/Source/Core/AudioCommon/Src/WaveFile.h @@ -50,8 +50,8 @@ public: void SetSkipSilence(bool skip) { skip_silence = skip; } - void AddStereoSamples(const short *sample_data, int count); - void AddStereoSamplesBE(const short *sample_data, int count); // big endian + void AddStereoSamples(const short *sample_data, u32 count); + void AddStereoSamplesBE(const short *sample_data, u32 count); // big endian u32 GetAudioSize() { return audio_size; } }; diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp index 69d42148ae..fa11fe3282 100644 --- a/Source/Core/AudioCommon/Src/aldlist.cpp +++ b/Source/Core/AudioCommon/Src/aldlist.cpp @@ -48,7 +48,7 @@ ALDeviceList::ALDeviceList() const char *actualDeviceName = NULL; // DeviceInfo vector stores, for each enumerated device, it's device name, selection status, spec version #, and extension support - vDeviceInfo.empty(); + vDeviceInfo.clear(); vDeviceInfo.reserve(10); defaultDeviceIndex = 0; @@ -146,12 +146,12 @@ ALDeviceList::~ALDeviceList() { for (u32 i = 0; i < vDeviceInfo.size(); i++) { if (vDeviceInfo[i].pvstrExtensions) { - vDeviceInfo[i].pvstrExtensions->empty(); + vDeviceInfo[i].pvstrExtensions->clear(); delete vDeviceInfo[i].pvstrExtensions; } } - vDeviceInfo.empty(); + vDeviceInfo.clear(); } /* diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 92d2bec668..480a08a0fc 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -1,9 +1,7 @@ -set(SRCS Src/ABI.cpp - Src/BreakPoints.cpp +set(SRCS Src/BreakPoints.cpp Src/CDUtils.cpp Src/ColorUtil.cpp Src/ConsoleListener.cpp - Src/CPUDetect.cpp Src/FileSearch.cpp Src/FileUtil.cpp Src/Hash.cpp @@ -20,10 +18,10 @@ set(SRCS Src/ABI.cpp Src/SymbolDB.cpp Src/SysConf.cpp Src/Thread.cpp - Src/Thunk.cpp Src/Timer.cpp Src/Version.cpp Src/VideoBackendBase.cpp + Src/x64ABI.cpp Src/x64Analyzer.cpp Src/x64Emitter.cpp Src/Crypto/aes_cbc.cpp @@ -33,6 +31,23 @@ set(SRCS Src/ABI.cpp Src/Crypto/md5.cpp Src/Crypto/sha1.cpp) +if(_M_ARM) #ARM + set(SRCS ${SRCS} + Src/ArmCPUDetect.cpp + Src/ArmEmitter.cpp) +else() + if(NOT _M_GENERIC) #X86 + set(SRCS ${SRCS} + Src/x64FPURoundMode.cpp + Src/x64Thunk.cpp + ) + endif() + set(SRCS ${SRCS} Src/x64CPUDetect.cpp) +endif() +if(_M_GENERIC) #Generic + set(SRCS ${SRCS} + Src/GenericFPURoundMode.cpp) +endif() if(WIN32) set(SRCS ${SRCS} Src/ExtendedTrace.cpp) endif(WIN32) diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 0128a75a09..626a4df909 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -158,12 +158,10 @@ - - @@ -195,15 +193,17 @@ - + + + + - @@ -251,6 +251,7 @@ + diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 8b05ecbba4..d427b70cdd 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -1,11 +1,9 @@  - - @@ -23,7 +21,6 @@ - @@ -53,9 +50,12 @@ Crypto + + + + - @@ -121,6 +121,7 @@ + diff --git a/Source/Core/Common/Src/ArmCPUDetect.cpp b/Source/Core/Common/Src/ArmCPUDetect.cpp new file mode 100644 index 0000000000..c03ab08c48 --- /dev/null +++ b/Source/Core/Common/Src/ArmCPUDetect.cpp @@ -0,0 +1,160 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "CPUDetect.h" +#include "StringUtil.h" + +const char procfile[] = "/proc/cpuinfo"; + +char *GetCPUString() +{ + const char marker[] = "Hardware\t: "; + char *cpu_string = 0; + // Count the number of processor lines in /proc/cpuinfo + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + cpu_string = buf + sizeof(marker) - 1; + cpu_string = strndup(cpu_string, strlen(cpu_string) - 1); // Strip the newline + break; + } + return cpu_string; +} +bool CheckCPUFeature(const char *feature) +{ + const char marker[] = "Features\t: "; + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + char *featurestring = buf + sizeof(marker) - 1; + char *token = strtok(featurestring, " "); + while (token != NULL) + { + if (strstr(token, feature)) + return true; + token = strtok(NULL, " "); + } + } + return false; +} +int GetCoreCount() +{ + const char marker[] = "processor\t: "; + int cores = 0; + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + ++cores; + } + return cores; +} + +CPUInfo cpu_info; + +CPUInfo::CPUInfo() { + Detect(); +} + +// Detects the various cpu features +void CPUInfo::Detect() +{ + // Set some defaults here + // When ARMv8 cpus come out, these need to be updated. + HTT = false; + OS64bit = false; + CPU64bit = false; + Mode64bit = false; + vendor = VENDOR_ARM; + + // Get the information about the CPU + strncpy(cpu_string, GetCPUString(), sizeof(cpu_string)); + num_cores = GetCoreCount(); + bSwp = CheckCPUFeature("swp"); + bHalf = CheckCPUFeature("half"); + bThumb = CheckCPUFeature("thumb"); + bFastMult = CheckCPUFeature("fastmult"); + bVFP = CheckCPUFeature("vfp"); + bEDSP = CheckCPUFeature("edsp"); + bThumbEE = CheckCPUFeature("thumbee"); + bNEON = CheckCPUFeature("neon"); + bVFPv3 = CheckCPUFeature("vfpv3"); + bTLS = CheckCPUFeature("tls"); + bVFPv4 = CheckCPUFeature("vfpv4"); + bIDIVa = CheckCPUFeature("idiva"); + bIDIVt = CheckCPUFeature("idivt"); + // These two are ARMv8 specific. + bFP = CheckCPUFeature("fp"); + bASIMD = CheckCPUFeature("asimd"); + + +#if defined(__ARM_ARCH_7A__) + bArmV7 = true; +#else + bArmV7 = false; +#endif +} + +// Turn the cpu info into a string we can show +std::string CPUInfo::Summarize() +{ + std::string sum; + if (num_cores == 1) + sum = StringFromFormat("%s, %i core", cpu_string, num_cores); + else + sum = StringFromFormat("%s, %i cores", cpu_string, num_cores); + + if (bSwp) sum += ", SWP"; + if (bHalf) sum += ", Half"; + if (bThumb) sum += ", Thumb"; + if (bFastMult) sum += ", FastMult"; + if (bVFP) sum += ", VFP"; + if (bEDSP) sum += ", EDSP"; + if (bThumbEE) sum += ", ThumbEE"; + if (bNEON) sum += ", NEON"; + if (bVFPv3) sum += ", VFPv3"; + if (bTLS) sum += ", TLS"; + if (bVFPv4) sum += ", VFPv4"; + if (bIDIVa) sum += ", IDIVa"; + if (bIDIVt) sum += ", IDIVt"; + + return sum; +} diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp new file mode 100644 index 0000000000..3b3bf7c550 --- /dev/null +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -0,0 +1,1058 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "ArmEmitter.h" +#include "CPUDetect.h" + +#include +#include + +// For cache flushing on Symbian/iOS/Blackberry +#ifdef __SYMBIAN32__ +#include +#endif + +#ifdef IOS +#include +#include +#endif + +#ifdef BLACKBERRY +#include +#endif + +namespace ArmGen +{ + +inline u32 RotR(u32 a, int amount) { + if (!amount) return a; + return (a >> amount) | (a << (32 - amount)); +} + +inline u32 RotL(u32 a, int amount) { + if (!amount) return a; + return (a << amount) | (a >> (32 - amount)); +} + +bool TryMakeOperand2(u32 imm, Operand2 &op2) { + // Just brute force it. + for (int i = 0; i < 16; i++) { + int mask = RotR(0xFF, i * 2); + if ((imm & mask) == imm) { + op2 = Operand2((u8)(RotL(imm, i * 2)), (u8)i); + return true; + } + } + return false; +} + +bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse) +{ + if (!TryMakeOperand2(imm, op2)) { + *inverse = true; + return TryMakeOperand2(~imm, op2); + } else { + *inverse = false; + return true; + } +} + +bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated) +{ + if (!TryMakeOperand2(imm, op2)) { + *negated = true; + return TryMakeOperand2(-imm, op2); + } else { + *negated = false; + return true; + } +} + +void ARMXEmitter::MOVI2R(ARMReg reg, u32 val, bool optimize) +{ + Operand2 op2; + bool inverse; + if (!optimize) + { + // Only used in backpatch atm + // Only support ARMv7 right now + if (cpu_info.bArmV7) { + MOVW(reg, val & 0xFFFF); + MOVT(reg, val, true); + } + else + { + // ARMv6 version won't use backpatch for now + // Run again with optimizations + MOVI2R(reg, val); + } + } else if (TryMakeOperand2_AllowInverse(val, op2, &inverse)) { + if (!inverse) + MOV(reg, op2); + else + MVN(reg, op2); + } else { + if (cpu_info.bArmV7) { + // ARMv7 - can use MOVT/MOVW, best choice + MOVW(reg, val & 0xFFFF); + if(val & 0xFFFF0000) + MOVT(reg, val, true); + } else { + // ARMv6 - fallback sequence. + // TODO: Optimize further. Can for example choose negation etc. + // Literal pools is another way to do this but much more complicated + // so I can't really be bothered for an outdated CPU architecture like ARMv6. + bool first = true; + int shift = 16; + for (int i = 0; i < 4; i++) { + if (val & 0xFF) { + if (first) { + MOV(reg, Operand2((u8)val, (u8)(shift & 0xF))); + first = false; + } else { + ORR(reg, reg, Operand2((u8)val, (u8)(shift & 0xF))); + } + } + shift -= 4; + val >>= 8; + } + } + } +} +// Moves IMM to memory location +void ARMXEmitter::ARMABI_MOVI2M(Operand2 op, Operand2 val) +{ + // This moves imm to a memory location + MOVW(R14, val); MOVT(R14, val, true); + MOVW(R12, op); MOVT(R12, op, true); + STR(R12, R14); // R10 is what we want to store +} +void ARMXEmitter::QuickCallFunction(ARMReg reg, void *func) { + MOVI2R(reg, (u32)(func)); + BL(reg); +} + +void ARMXEmitter::SetCodePtr(u8 *ptr) +{ + code = ptr; + startcode = code; +} + +const u8 *ARMXEmitter::GetCodePtr() const +{ + return code; +} + +u8 *ARMXEmitter::GetWritableCodePtr() +{ + return code; +} + +void ARMXEmitter::ReserveCodeSpace(u32 bytes) +{ + for (u32 i = 0; i < bytes/4; i++) + Write32(0xE1200070); //bkpt 0 +} + +const u8 *ARMXEmitter::AlignCode16() +{ + ReserveCodeSpace((-(s32)code) & 15); + return code; +} + +const u8 *ARMXEmitter::AlignCodePage() +{ + ReserveCodeSpace((-(s32)code) & 4095); + return code; +} + +void ARMXEmitter::FlushIcache() +{ + FlushIcacheSection(lastCacheFlushEnd, code); + lastCacheFlushEnd = code; +} + +void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end) +{ +#ifdef __SYMBIAN32__ + User::IMB_Range(start, end); +#elif defined(BLACKBERRY) + msync(start, end - start, MS_SYNC | MS_INVALIDATE_ICACHE); +#elif defined(IOS) + sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start); +#elif !defined(_WIN32) +#ifndef ANDROID + start = startcode; +#endif + __builtin___clear_cache(start, end); +#endif +} + +void ARMXEmitter::SetCC(CCFlags cond) +{ + condition = cond << 28; +} + +void ARMXEmitter::NOP(int count) +{ + for (int i = 0; i < count; i++) { + Write32(condition | 0x01A00000); + } +} + +void ARMXEmitter::SETEND(bool BE) +{ + //SETEND is non-conditional + Write32( 0xF1010000 | (BE << 9)); +} +void ARMXEmitter::BKPT(u16 arg) +{ + Write32(condition | 0x01200070 | (arg << 4 & 0x000FFF00) | (arg & 0x0000000F)); +} +void ARMXEmitter::YIELD() +{ + Write32(condition | 0x0320F001); +} + +FixupBranch ARMXEmitter::B() +{ + FixupBranch branch; + branch.type = 0; // Zero for B + branch.ptr = code; + branch.condition = condition; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +FixupBranch ARMXEmitter::BL() +{ + FixupBranch branch; + branch.type = 1; // Zero for B + branch.ptr = code; + branch.condition = condition; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} + +FixupBranch ARMXEmitter::B_CC(CCFlags Cond) +{ + FixupBranch branch; + branch.type = 0; // Zero for B + branch.ptr = code; + branch.condition = Cond << 28; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "B_CC out of range (%p calls %p)", code, fnptr); + + Write32((Cond << 28) | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); +} +FixupBranch ARMXEmitter::BL_CC(CCFlags Cond) +{ + FixupBranch branch; + branch.type = 1; // Zero for B + branch.ptr = code; + branch.condition = Cond << 28; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +void ARMXEmitter::SetJumpTarget(FixupBranch const &branch) +{ + s32 distance = (s32(code) - 8) - (s32)branch.ptr; + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "SetJumpTarget out of range (%p calls %p)", code, + branch.ptr); + if(branch.type == 0) // B + *(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) & + 0x00FFFFFF)); + else // BL + *(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2) + & 0x00FFFFFF)); +} +void ARMXEmitter::B (const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "B out of range (%p calls %p)", code, fnptr); + + Write32(condition | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); +} + +void ARMXEmitter::B(ARMReg src) +{ + Write32(condition | 0x12FFF10 | src); +} + +void ARMXEmitter::BL(const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "BL out of range (%p calls %p)", code, fnptr); + Write32(condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF)); +} +void ARMXEmitter::BL(ARMReg src) +{ + Write32(condition | 0x12FFF30 | src); +} +void ARMXEmitter::PUSH(const int num, ...) +{ + u16 RegList = 0; + u8 Reg; + int i; + va_list vl; + va_start(vl, num); + for (i=0;i> 16 : Rm); } + +void ARMXEmitter::WriteInstruction (u32 Op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags) // This can get renamed later +{ + s32 op = InstOps[Op][Rm.GetType()]; // Type always decided by last operand + u32 Data = Rm.GetData(); + if (Rm.GetType() == TYPE_IMM) + { + switch (Op) + { + // MOV cases that support IMM16 + case 16: + case 17: + Data = Rm.Imm16(); + break; + default: + break; + } + } + if (op == -1) + _assert_msg_(DYNA_REC, false, "%s not yet support %d", InstNames[Op], Rm.GetType()); + Write32(condition | (op << 21) | (SetFlags ? (1 << 20) : 0) | Rn << 16 | Rd << 12 | Data); +} + +// Data Operations +void ARMXEmitter::WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2) +{ + Write32(condition | (0x7 << 24) | (Op << 20) | (dest << 16) | (Op2 << 12) | (r1 << 8) | (Op3 << 5) | (1 << 4) | r2); +} +void ARMXEmitter::UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor) +{ + if (!cpu_info.bIDIVa) + PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer."); + WriteSignedMultiply(3, 0xF, 0, dest, divisor, dividend); +} +void ARMXEmitter::SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor) +{ + if (!cpu_info.bIDIVa) + PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer."); + WriteSignedMultiply(1, 0xF, 0, dest, divisor, dividend); +} +void ARMXEmitter::LSL (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, false, dest, src, op2);} +void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, true, dest, src, op2);} +void ARMXEmitter::LSL (ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, false, dest, src, op2);} +void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, true, dest, src, op2);} +void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2) +{ + Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2); +} +void ARMXEmitter::MULS(ARMReg dest, ARMReg src, ARMReg op2) +{ + Write32(condition | (1 << 20) | (dest << 16) | (src << 8) | (9 << 4) | op2); +} + +void ARMXEmitter::Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) { + Write32(condition | (op << 20) | (destHi << 16) | (destLo << 12) | (rm << 8) | (9 << 4) | rn); +} + +void ARMXEmitter::UMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) +{ + Write4OpMultiply(0x8, destLo, destHi, rn, rm); +} + +void ARMXEmitter::SMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) +{ + Write4OpMultiply(0xC, destLo, destHi, rn, rm); +} + +void ARMXEmitter::SXTB (ARMReg dest, ARMReg op2) +{ + Write32(condition | (0x6AF << 16) | (dest << 12) | (7 << 4) | op2); +} +void ARMXEmitter::SXTH (ARMReg dest, ARMReg op2, u8 rotation) +{ + SXTAH(dest, (ARMReg)15, op2, rotation); +} +void ARMXEmitter::SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation) +{ + // bits ten and 11 are the rotation amount, see 8.8.232 for more + // information + Write32(condition | (0x6B << 20) | (src << 16) | (dest << 12) | (rotation << 10) | (7 << 4) | op2); +} +void ARMXEmitter::REV (ARMReg dest, ARMReg src ) +{ + Write32(condition | (107 << 20) | (15 << 16) | (dest << 12) | (243 << 4) | src); +} +void ARMXEmitter::REV16(ARMReg dest, ARMReg src) +{ + Write32(condition | (0x3DF << 16) | (dest << 12) | (0xFD << 4) | src); +} + +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, Operand2 op2) +{ + Write32(condition | (0x320F << 12) | (write_nzcvq << 19) | (write_g << 18) | op2.Imm12Mod()); +} +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, ARMReg src) +{ + Write32(condition | (0x120F << 12) | (write_nzcvq << 19) | (write_g << 18) | src); +} +void ARMXEmitter::MRS (ARMReg dest) +{ + Write32(condition | (16 << 20) | (15 << 16) | (dest << 12)); +} + +void ARMXEmitter::WriteStoreOp(u32 op, ARMReg dest, ARMReg src, Operand2 op2) +{ + if (op2.GetData() == 0) // set the preindex bit, but not the W bit! + Write32(condition | 0x01800000 | (op << 20) | (dest << 16) | (src << 12) | op2.Imm12()); + else + Write32(condition | (op << 20) | (3 << 23) | (dest << 16) | (src << 12) | op2.Imm12()); +} +void ARMXEmitter::STR (ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x40, dest, src, op);} +void ARMXEmitter::STRB(ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x44, dest, src, op);} +void ARMXEmitter::STR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add) +{ + Write32(condition | (0x60 << 20) | (Index << 24) | (Add << 23) | (dest << 16) | (base << 12) | offset); +} +void ARMXEmitter::LDREX(ARMReg dest, ARMReg base) +{ + Write32(condition | (25 << 20) | (base << 16) | (dest << 12) | 0xF9F); +} +void ARMXEmitter::STREX(ARMReg dest, ARMReg base, ARMReg op) +{ + _assert_msg_(DYNA_REC, (dest != base && dest != op), "STREX dest can't be other two registers"); + Write32(condition | (24 << 20) | (base << 16) | (dest << 12) | (0xF9 << 4) | op); +} +void ARMXEmitter::DMB () +{ + Write32(0xF57FF05E); +} +void ARMXEmitter::SVC(Operand2 op) +{ + Write32(condition | (0x0F << 24) | op.Imm24()); +} + +void ARMXEmitter::LDR (ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x41, src, dest, op);} +void ARMXEmitter::LDRH(ARMReg dest, ARMReg src, Operand2 op) +{ + u8 Imm = op.Imm8(); + Write32(condition | (0x05 << 20) | (src << 16) | (dest << 12) | ((Imm >> 4) << 8) | (0xB << 4) | (Imm & 0x0F)); +} +void ARMXEmitter::LDRB(ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x45, src, dest, op);} + +void ARMXEmitter::LDR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add) +{ + Write32(condition | (0x61 << 20) | (Index << 24) | (Add << 23) | (base << 16) | (dest << 12) | offset); +} +void ARMXEmitter::WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList) +{ + Write32(condition | (op << 20) | (WriteBack << 21) | (dest << 16) | RegList); +} +void ARMXEmitter::STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...) +{ + u16 RegList = 0; + u8 Reg; + int i; + va_list vl; + va_start(vl, Regnum); + for (i=0;i= S0) + { + if (Reg >= D0) + { + if (Reg >= Q0) + return (ARMReg)((Reg - Q0) * 2); // Always gets encoded as a double register + return (ARMReg)(Reg - D0); + } + return (ARMReg)(Reg - S0); + } + return Reg; +} + +// NEON Specific +void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VADD(integer)"); + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it"); + + bool register_quad = Vd >= Q0; + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); + +} +void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= Q0, "Pass invalid register to VSUB(integer)"); + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VSUB(integer) when CPU doesn't support it"); + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); +} + +// VFP Specific + +void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, u16 offset) +{ + _assert_msg_(DYNA_REC, Dest >= S0 && Dest <= D31, "Passed Invalid dest register to VLDR"); + _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid Base register to VLDR"); + _assert_msg_(DYNA_REC, (offset & 0xC03) == 0, "VLDR: Offset needs to be word aligned and small enough"); + + if (offset & 0xC03) { + ERROR_LOG(DYNA_REC, "VLDR: Bad offset %08x", offset); + } + + bool single_reg = Dest < D0; + + Dest = SubBase(Dest); + + if (single_reg) + { + Write32(NO_COND | (0x1B << 23) | ((Dest & 0x1) << 22) | (1 << 20) | (Base << 16) \ + | ((Dest & 0x1E) << 11) | (10 << 8) | (offset >> 2)); + + } + else + { + Write32(NO_COND | (0x1B << 23) | ((Dest & 0x10) << 18) | (1 << 20) | (Base << 16) \ + | ((Dest & 0xF) << 12) | (11 << 8) | (offset >> 2)); + } +} +void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, u16 offset) +{ + _assert_msg_(DYNA_REC, Src >= S0 && Src <= D31, "Passed invalid src register to VSTR"); + _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid base register to VSTR"); + _assert_msg_(DYNA_REC, (offset & 0xC03) == 0, "VSTR: Offset needs to be word aligned"); + + if (offset & 0xC03) { + ERROR_LOG(DYNA_REC, "VSTR: Bad offset %08x", offset); + } + + bool single_reg = Src < D0; + + Src = SubBase(Src); + + if (single_reg) + { + Write32(NO_COND | (0x1B << 23) | ((Src & 0x1) << 22) | (Base << 16) \ + | ((Src & 0x1E) << 11) | (10 << 8) | (offset >> 2)); + + } + else + { + Write32(NO_COND | (0x1B << 23) | ((Src & 0x10) << 18) | (Base << 16) \ + | ((Src & 0xF) << 12) | (11 << 8) | (offset >> 2)); + } +} +void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Passed invalid Vd to VCMP"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x34 << 16) | ((Vd & 0x1E) << 11) \ + | (0x2B << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x34 << 16) | ((Vd & 0xF) << 12) \ + | (0x2F << 6) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + } +} +void ARMXEmitter::VCMP(ARMReg Vd) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Passed invalid Vd to VCMP"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x35 << 16) | ((Vd & 0x1E) << 11) \ + | (0x2B << 6)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x35 << 16) | ((Vd & 0xF) << 12) \ + | (0x2F << 6)); + } +} +void ARMXEmitter::VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Pased invalid dest register to VSQRT"); + _assert_msg_(DYNA_REC, Vn < Q0, "Passed invalid Vn to VSQRT"); + _assert_msg_(DYNA_REC, Vm < Q0, "Passed invalid Vm to VSQRT"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | ((Vn & 0x1E) << 15) \ + | ((Vd & 0x1E) << 11) | (0xA << 8) | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) \ + | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xB << 8) | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) \ + | (Vm & 0xF)); + } +} +void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Pased invalid dest register to VSQRT"); + _assert_msg_(DYNA_REC, Vm < Q0, "Passed invalid Vm to VSQRT"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x31 << 16) \ + | ((Vd & 0x1E) << 11) | (0x2B << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x31 << 16) \ + | ((Vd & 0xF) << 12) | (0x2F << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } +} + +// VFP and ASIMD +void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "VABS doesn't currently support Quad reg"); + _assert_msg_(DYNA_REC, Vd >= S0, "VABS doesn't support ARM Regs"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x1) << 22) | ((Vd & 0x1E) << 11) \ + | (0xAC << 4) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x10) << 18) | ((Vd & 0xF) << 12) \ + | (0xBC << 4) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + // XXX: TODO + } + } +} + +void ARMXEmitter::VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VADD"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VADD"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VADD"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x3 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) \ + | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + } +} +void ARMXEmitter::VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VSUB"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VSUB"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VSUB"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x3 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | (1 << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + Write32((0xF2 << 24) | (1 << 21) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) \ + | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + } +} +void ARMXEmitter::VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VADD"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VADD"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VADD"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x2 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x2 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VMUL with Quad Reg without support!"); + // XXX: TODO + } + } +} + +void ARMXEmitter::VNEG(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "VNEG doesn't currently support Quad reg"); + _assert_msg_(DYNA_REC, Vd >= S0, "VNEG doesn't support ARM Regs"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x31 << 16) \ + | ((Vd & 0x1E) << 11) | (0x29 << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x31 << 16) \ + | ((Vd & 0xF) << 12) | (0x2D << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VNEG with Quad Reg without support!"); + // XXX: TODO + + } + } +} + +void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high) +{ + _assert_msg_(DYNA_REC, Src < S0, "This VMOV doesn't support SRC other than ARM Reg"); + _assert_msg_(DYNA_REC, Dest >= D0, "This VMOV doesn't support DEST other than VFP"); + + Dest = SubBase(Dest); + + Write32(NO_COND | (0xE << 24) | (high << 21) | ((Dest & 0xF) << 16) | (Src << 12) \ + | (11 << 8) | ((Dest & 0x10) << 3) | (1 << 4)); +} + +void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src) +{ + if (Dest > R15) + { + if (Src < S0) + { + if (Dest < D0) + { + // Moving to a Neon register FROM ARM Reg + Dest = (ARMReg)(Dest - S0); + Write32(NO_COND | (0xE0 << 20) | ((Dest & 0x1E) << 15) | (Src << 12) \ + | (0xA << 8) | ((Dest & 0x1) << 7) | (1 << 4)); + return; + } + else + { + // Move 64bit from Arm reg + _assert_msg_(DYNA_REC, false, "This VMOV doesn't support moving 64bit ARM to NEON"); + return; + } + } + } + else + { + if (Src > R15) + { + if (Src < D0) + { + // Moving to ARM Reg from Neon Register + Src = (ARMReg)(Src - S0); + Write32(NO_COND | (0xE1 << 20) | ((Src & 0x1E) << 15) | (Dest << 12) \ + | (0xA << 8) | ((Src & 0x1) << 7) | (1 << 4)); + return; + } + else + { + // Move 64bit To Arm reg + _assert_msg_(DYNA_REC, false, "This VMOV doesn't support moving 64bit ARM From NEON"); + return; + } + } + else + { + // Move Arm reg to Arm reg + _assert_msg_(DYNA_REC, false, "VMOV doesn't support moving ARM registers"); + } + } + // Moving NEON registers + int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4; + int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4; + bool Single = DestSize == 1; + bool Quad = DestSize == 4; + + _assert_msg_(DYNA_REC, SrcSize == DestSize, "VMOV doesn't support moving different register sizes"); + + Dest = SubBase(Dest); + Src = SubBase(Src); + + if (Single) + { + Write32(NO_COND | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x3 << 20) | ((Dest & 0x1E) << 11) \ + | (0x5 << 9) | (1 << 6) | ((Src & 0x1) << 5) | ((Src & 0x1E) >> 1)); + } + else + { + // Double and quad + if (Quad) + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use quad registers when you don't support ASIMD."); + // Gets encoded as a Double register + Write32((0xF2 << 24) | ((Dest & 0x10) << 18) | (2 << 20) | ((Src & 0xF) << 16) \ + | ((Dest & 0xF) << 12) | (1 << 8) | ((Src & 0x10) << 3) | (1 << 6) \ + | ((Src & 0x10) << 1) | (1 << 4) | (Src & 0xF)); + + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x3 << 20) | ((Dest & 0xF) << 12) \ + | (0x2D << 6) | ((Src & 0x10) << 1) | (Src & 0xF)); + } + } +} + +} diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h new file mode 100644 index 0000000000..a3ff7d25ae --- /dev/null +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -0,0 +1,589 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!! + +#ifndef _DOLPHIN_ARM_CODEGEN_ +#define _DOLPHIN_ARM_CODEGEN_ + +#include "Common.h" +#include "MemoryUtil.h" +#if defined(__SYMBIAN32__) || defined(PANDORA) +#include +#endif + +#undef _IP +#undef R0 +#undef _SP +#undef _LR +#undef _PC + +namespace ArmGen +{ +enum ARMReg +{ + // GPRs + R0 = 0, R1, R2, R3, R4, R5, + R6, R7, R8, R9, R10, R11, + + // SPRs + // R13 - R15 are SP, LR, and PC. + // Almost always referred to by name instead of register number + R12 = 12, R13 = 13, R14 = 14, R15 = 15, + _IP = 12, _SP = 13, _LR = 14, _PC = 15, + + + // VFP single precision registers + S0, S1, S2, S3, S4, S5, S6, + S7, S8, S9, S10, S11, S12, S13, + S14, S15, S16, S17, S18, S19, S20, + S21, S22, S23, S24, S25, S26, S27, + S28, S29, S30, S31, + + // VFP Double Precision registers + D0, D1, D2, D3, D4, D5, D6, D7, + D8, D9, D10, D11, D12, D13, D14, D15, + D16, D17, D18, D19, D20, D21, D22, D23, + D24, D25, D26, D27, D28, D29, D30, D31, + + // ASIMD Quad-Word registers + Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, + Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15, + INVALID_REG = 0xFFFFFFFF +}; + +enum CCFlags +{ + CC_EQ = 0, // Equal + CC_NEQ, // Not equal + CC_CS, // Carry Set + CC_CC, // Carry Clear + CC_MI, // Minus (Negative) + CC_PL, // Plus + CC_VS, // Overflow + CC_VC, // No Overflow + CC_HI, // Unsigned higher + CC_LS, // Unsigned lower or same + CC_GE, // Signed greater than or equal + CC_LT, // Signed less than + CC_GT, // Signed greater than + CC_LE, // Signed less than or equal + CC_AL, // Always (unconditional) 14 + CC_HS = CC_CS, // Alias of CC_CS Unsigned higher or same + CC_LO = CC_CC, // Alias of CC_CC Unsigned lower +}; +const u32 NO_COND = 0xE0000000; + +enum ShiftType +{ + ST_LSL = 0, + ST_ASL = 0, + ST_LSR = 1, + ST_ASR = 2, + ST_ROR = 3, + ST_RRX = 4 +}; +enum IntegerSize +{ + I_I8 = 0, + I_I16, + I_I32, + I_I64 +}; + +enum +{ + NUMGPRs = 13, +}; + +class ARMXEmitter; + +enum OpType +{ + TYPE_IMM = 0, + TYPE_REG, + TYPE_IMMSREG, + TYPE_RSR, + TYPE_MEM +}; + +// This is no longer a proper operand2 class. Need to split up. +class Operand2 +{ + friend class ARMXEmitter; +protected: + u32 Value; + +private: + OpType Type; + + // IMM types + u8 Rotation; // Only for u8 values + + // Register types + u8 IndexOrShift; + ShiftType Shift; +public: + OpType GetType() + { + return Type; + } + Operand2() {} + Operand2(u32 imm, OpType type = TYPE_IMM) + { + Type = type; + Value = imm; + Rotation = 0; + } + + Operand2(ARMReg Reg) + { + Type = TYPE_REG; + Value = Reg; + Rotation = 0; + } + Operand2(u8 imm, u8 rotation) + { + Type = TYPE_IMM; + Value = imm; + Rotation = rotation; + } + Operand2(ARMReg base, ShiftType type, ARMReg shift) // RSR + { + Type = TYPE_RSR; + _assert_msg_(DYNA_REC, type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount"); + IndexOrShift = shift; + Shift = type; + Value = base; + } + + Operand2(u8 shift, ShiftType type, ARMReg base)// For IMM shifted register + { + if(shift == 32) shift = 0; + switch (type) + { + case ST_LSL: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSL %u", shift); + break; + case ST_LSR: + _assert_msg_(DYNA_REC, shift <= 32, "Invalid Operand2: LSR %u", shift); + if (!shift) + type = ST_LSL; + if (shift == 32) + shift = 0; + break; + case ST_ASR: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSR %u", shift); + if (!shift) + type = ST_LSL; + if (shift == 32) + shift = 0; + break; + case ST_ROR: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: ROR %u", shift); + if (!shift) + type = ST_LSL; + break; + case ST_RRX: + _assert_msg_(DYNA_REC, shift == 0, "Invalid Operand2: RRX does not take an immediate shift amount"); + type = ST_ROR; + break; + } + IndexOrShift = shift; + Shift = type; + Value = base; + Type = TYPE_IMMSREG; + } + const u32 GetData() + { + switch(Type) + { + case TYPE_IMM: + return Imm12Mod(); // This'll need to be changed later + case TYPE_REG: + return Rm(); + case TYPE_IMMSREG: + return IMMSR(); + case TYPE_RSR: + return RSR(); + default: + _assert_msg_(DYNA_REC, false, "GetData with Invalid Type"); + return 0; + } + } + const u32 IMMSR() // IMM shifted register + { + _assert_msg_(DYNA_REC, Type == TYPE_IMMSREG, "IMMSR must be imm shifted register"); + return ((IndexOrShift & 0x1f) << 7 | (Shift << 5) | Value); + } + const u32 RSR() // Register shifted register + { + _assert_msg_(DYNA_REC, Type == TYPE_RSR, "RSR must be RSR Of Course"); + return (IndexOrShift << 8) | (Shift << 5) | 0x10 | Value; + } + const u32 Rm() + { + _assert_msg_(DYNA_REC, Type == TYPE_REG, "Rm must be with Reg"); + return Value; + } + + const u32 Imm5() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm5 not IMM value"); + return ((Value & 0x0000001F) << 7); + } + const u32 Imm8() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value"); + return Value & 0xFF; + } + const u32 Imm8Rot() // IMM8 with Rotation + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value"); + _assert_msg_(DYNA_REC, (Rotation & 0xE1) != 0, "Invalid Operand2: immediate rotation %u", Rotation); + return (1 << 25) | (Rotation << 7) | (Value & 0x000000FF); + } + const u32 Imm12() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12 not IMM"); + return (Value & 0x00000FFF); + } + + const u32 Imm12Mod() + { + // This is a IMM12 with the top four bits being rotation and the + // bottom eight being a IMM. This is for instructions that need to + // expand a 8bit IMM to a 32bit value and gives you some rotation as + // well. + // Each rotation rotates to the right by 2 bits + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12Mod not IMM"); + return ((Rotation & 0xF) << 8) | (Value & 0xFF); + } + const u32 Imm16() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return ( (Value & 0xF000) << 4) | (Value & 0x0FFF); + } + const u32 Imm16Low() + { + return Imm16(); + } + const u32 Imm16High() // Returns high 16bits + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return ( ((Value >> 16) & 0xF000) << 4) | ((Value >> 16) & 0x0FFF); + } + const u32 Imm24() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return (Value & 0x0FFFFFFF); + } + // NEON and ASIMD specific + const u32 Imm8ASIMD() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8ASIMD not IMM"); + return ((Value & 0x80) << 17) | ((Value & 0x70) << 12) | (Value & 0xF); + } + const u32 Imm8VFP() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8VFP not IMM"); + return ((Value & 0xF0) << 12) | (Value & 0xF); + } +}; + +// Use these when you don't know if an imm can be represented as an operand2. +// This lets you generate both an optimal and a fallback solution by checking +// the return value, which will be false if these fail to find a Operand2 that +// represents your 32-bit imm value. +bool TryMakeOperand2(u32 imm, Operand2 &op2); +bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse); +bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated); + +inline Operand2 R(ARMReg Reg) { return Operand2(Reg, TYPE_REG); } +inline Operand2 IMM(u32 Imm) { return Operand2(Imm, TYPE_IMM); } +inline Operand2 Mem(void *ptr) { return Operand2((u32)ptr, TYPE_IMM); } +//usage: struct {int e;} s; STRUCT_OFFSET(s,e) +#define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str))) + + +struct FixupBranch +{ + u8 *ptr; + u32 condition; // Remembers our codition at the time + int type; //0 = B 1 = BL +}; + +typedef const u8* JumpTarget; + +class ARMXEmitter +{ + friend struct OpArg; // for Write8 etc +private: + u8 *code, *startcode; + u8 *lastCacheFlushEnd; + u32 condition; + + void WriteStoreOp(u32 op, ARMReg dest, ARMReg src, Operand2 op2); + void WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList); + void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, ARMReg op2); + void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, Operand2 op2); + void WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2); + + + void Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + + // New Ops + void WriteInstruction(u32 op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags = false); + +protected: + inline void Write32(u32 value) {*(u32*)code = value; code+=4;} + +public: + ARMXEmitter() : code(0), startcode(0), lastCacheFlushEnd(0) { + condition = CC_AL << 28; + } + ARMXEmitter(u8 *code_ptr) { + code = code_ptr; + lastCacheFlushEnd = code_ptr; + startcode = code_ptr; + condition = CC_AL << 28; + } + virtual ~ARMXEmitter() {} + + void SetCodePtr(u8 *ptr); + void ReserveCodeSpace(u32 bytes); + const u8 *AlignCode16(); + const u8 *AlignCodePage(); + const u8 *GetCodePtr() const; + void FlushIcache(); + void FlushIcacheSection(u8 *start, u8 *end); + u8 *GetWritableCodePtr(); + + void SetCC(CCFlags cond = CC_AL); + + // Special purpose instructions + + // Dynamic Endian Switching + void SETEND(bool BE); + // Debug Breakpoint + void BKPT(u16 arg); + + // Hint instruction + void YIELD(); + + // Do nothing + void NOP(int count = 1); //nop padding - TODO: fast nop slides, for amd and intel (check their manuals) + +#ifdef CALL +#undef CALL +#endif + + // Branching + FixupBranch B(); + FixupBranch B_CC(CCFlags Cond); + void B_CC(CCFlags Cond, const void *fnptr); + FixupBranch BL(); + FixupBranch BL_CC(CCFlags Cond); + void SetJumpTarget(FixupBranch const &branch); + + void B (const void *fnptr); + void B (ARMReg src); + void BL(const void *fnptr); + void BL(ARMReg src); + + void PUSH(const int num, ...); + void POP(const int num, ...); + + // New Data Ops + void AND (ARMReg Rd, ARMReg Rn, Operand2 Rm); + void ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm); + void EOR (ARMReg dest, ARMReg src, Operand2 op2); + void EORS(ARMReg dest, ARMReg src, Operand2 op2); + void SUB (ARMReg dest, ARMReg src, Operand2 op2); + void SUBS(ARMReg dest, ARMReg src, Operand2 op2); + void RSB (ARMReg dest, ARMReg src, Operand2 op2); + void RSBS(ARMReg dest, ARMReg src, Operand2 op2); + void ADD (ARMReg dest, ARMReg src, Operand2 op2); + void ADDS(ARMReg dest, ARMReg src, Operand2 op2); + void ADC (ARMReg dest, ARMReg src, Operand2 op2); + void ADCS(ARMReg dest, ARMReg src, Operand2 op2); + void LSL (ARMReg dest, ARMReg src, Operand2 op2); + void LSL (ARMReg dest, ARMReg src, ARMReg op2); + void LSLS(ARMReg dest, ARMReg src, Operand2 op2); + void LSLS(ARMReg dest, ARMReg src, ARMReg op2); + void SBC (ARMReg dest, ARMReg src, Operand2 op2); + void SBCS(ARMReg dest, ARMReg src, Operand2 op2); + void REV (ARMReg dest, ARMReg src); + void REV16 (ARMReg dest, ARMReg src); + void RSC (ARMReg dest, ARMReg src, Operand2 op2); + void RSCS(ARMReg dest, ARMReg src, Operand2 op2); + void TST ( ARMReg src, Operand2 op2); + void TEQ ( ARMReg src, Operand2 op2); + void CMP ( ARMReg src, Operand2 op2); + void CMN ( ARMReg src, Operand2 op2); + void ORR (ARMReg dest, ARMReg src, Operand2 op2); + void ORRS(ARMReg dest, ARMReg src, Operand2 op2); + void MOV (ARMReg dest, Operand2 op2); + void MOVS(ARMReg dest, Operand2 op2); + void BIC (ARMReg dest, ARMReg src, Operand2 op2); // BIC = ANDN + void BICS(ARMReg dest, ARMReg src, Operand2 op2); + void MVN (ARMReg dest, Operand2 op2); + void MVNS(ARMReg dest, Operand2 op2); + void MOVW(ARMReg dest, Operand2 op2); + void MOVT(ARMReg dest, Operand2 op2, bool TopBits = false); + + // UDIV and SDIV are only available on CPUs that have + // the idiva hardare capacity + void UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); + void SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); + + void MUL (ARMReg dest, ARMReg src, ARMReg op2); + void MULS(ARMReg dest, ARMReg src, ARMReg op2); + + void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + void SMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + + void SXTB(ARMReg dest, ARMReg op2); + void SXTH(ARMReg dest, ARMReg op2, u8 rotation = 0); + void SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation = 0); + // Using just MSR here messes with our defines on the PPC side of stuff (when this code was in dolphin...) + // Just need to put an underscore here, bit annoying. + void _MSR (bool nzcvq, bool g, Operand2 op2); + void _MSR (bool nzcvq, bool g, ARMReg src ); + void MRS (ARMReg dest); + + // Memory load/store operations + void LDR (ARMReg dest, ARMReg src, Operand2 op2 = 0); + // Offset adds to the base register in LDR + void LDR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add); + void LDRH(ARMReg dest, ARMReg src, Operand2 op = 0); + void LDRB(ARMReg dest, ARMReg src, Operand2 op2 = 0); + void STR (ARMReg dest, ARMReg src, Operand2 op2 = 0); + // Offset adds on to the destination register in STR + void STR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add); + + void STRB(ARMReg dest, ARMReg src, Operand2 op2 = 0); + void STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...); + void LDMFD(ARMReg dest, bool WriteBack, const int Regnum, ...); + + // Exclusive Access operations + void LDREX(ARMReg dest, ARMReg base); + // dest contains the result if the instruction managed to store the value + void STREX(ARMReg dest, ARMReg base, ARMReg op); + void DMB (); + void SVC(Operand2 op); + + // NEON and ASIMD instructions + // None of these will be created with conditional since ARM + // is deprecating conditional execution of ASIMD instructions. + // ASIMD instructions don't even have a conditional encoding. + + // Subtracts the base from the register to give us the real one + ARMReg SubBase(ARMReg Reg); + // NEON Only + void VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + + // VFP Only + void VLDR(ARMReg Dest, ARMReg Base, u16 offset); + void VSTR(ARMReg Src, ARMReg Base, u16 offset); + void VCMP(ARMReg Vd, ARMReg Vm); + // Compares against zero + void VCMP(ARMReg Vd); + void VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSQRT(ARMReg Vd, ARMReg Vm); + + // NEON and VFP + void VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VABS(ARMReg Vd, ARMReg Vm); + void VNEG(ARMReg Vd, ARMReg Vm); + void VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VMOV(ARMReg Dest, ARMReg Src, bool high); + void VMOV(ARMReg Dest, ARMReg Src); + + void QuickCallFunction(ARMReg scratchreg, void *func); + // Utility functions + void MOVI2R(ARMReg reg, u32 val, bool optimize = true); + void ARMABI_MOVI2M(Operand2 op, Operand2 val); +}; // class ARMXEmitter + + +// Everything that needs to generate X86 code should inherit from this. +// You get memory management for free, plus, you can use all the MOV etc functions without +// having to prefix them with gen-> or something similar. +class ARMXCodeBlock : public ARMXEmitter +{ +protected: + u8 *region; + size_t region_size; + +public: + ARMXCodeBlock() : region(NULL), region_size(0) {} + virtual ~ARMXCodeBlock() { if (region) FreeCodeSpace(); } + + // Call this before you generate any code. + void AllocCodeSpace(int size) + { + region_size = size; + region = (u8*)AllocateExecutableMemory(region_size); + SetCodePtr(region); + } + + // Always clear code space with breakpoints, so that if someone accidentally executes + // uninitialized, it just breaks into the debugger. + void ClearCodeSpace() + { + // x86/64: 0xCC = breakpoint + memset(region, 0xCC, region_size); + ResetCodePtr(); + } + + // Call this when shutting down. Don't rely on the destructor, even though it'll do the job. + void FreeCodeSpace() + { + FreeMemoryPages(region, region_size); + region = NULL; + region_size = 0; + } + + bool IsInSpace(u8 *ptr) + { + return ptr >= region && ptr < region + region_size; + } + + // Cannot currently be undone. Will write protect the entire code region. + // Start over if you need to change the code (call FreeCodeSpace(), AllocCodeSpace()). + void WriteProtect() + { + WriteProtectMemory(region, region_size, true); + } + + void ResetCodePtr() + { + SetCodePtr(region); + } + + size_t GetSpaceLeft() const + { + return region_size - (GetCodePtr() - region); + } +}; + +} // namespace + +#endif // _DOLPHIN_INTEL_CODEGEN_ diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 1700276d85..62fadefd4f 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -19,7 +19,9 @@ #include "DebugInterface.h" #include "BreakPoints.h" #include "../../Core/Src/PowerPC/JitCommon/JitBase.h" + #include +#include bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { @@ -110,12 +112,17 @@ void BreakPoints::Remove(u32 em_address) void BreakPoints::Clear() { - for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) + if (jit) { - if (jit) - jit->GetBlockCache()->InvalidateICache(i->iAddress, 4); - m_BreakPoints.erase(i); + std::for_each(m_BreakPoints.begin(), m_BreakPoints.end(), + [](const TBreakPoint& bp) + { + jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4); + } + ); } + + m_BreakPoints.clear(); } MemChecks::TMemChecksStr MemChecks::GetStrings() const diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp index 4496302e46..42aa9bfe34 100644 --- a/Source/Core/Common/Src/CDUtils.cpp +++ b/Source/Core/Common/Src/CDUtils.cpp @@ -3,6 +3,7 @@ #include "CDUtils.h" #include "Common.h" +#include // for std::unique_ptr #ifdef _WIN32 #include #elif __APPLE__ diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h index 928b34c109..351120e3a2 100644 --- a/Source/Core/Common/Src/CPUDetect.h +++ b/Source/Core/Common/Src/CPUDetect.h @@ -25,7 +25,8 @@ enum CPUVendor { VENDOR_INTEL = 0, VENDOR_AMD = 1, - VENDOR_OTHER = 2, + VENDOR_ARM = 2, + VENDOR_OTHER = 3, }; struct CPUInfo @@ -55,6 +56,26 @@ struct CPUInfo bool bAES; bool bLAHFSAHF64; bool bLongMode; + + // ARM specific CPUInfo + bool bSwp; + bool bHalf; + bool bThumb; + bool bFastMult; + bool bVFP; + bool bEDSP; + bool bThumbEE; + bool bNEON; + bool bVFPv3; + bool bTLS; + bool bVFPv4; + bool bIDIVa; + bool bIDIVt; + bool bArmV7; // enable MOVT, MOVW etc + + // ARMv8 specific + bool bFP; + bool bASIMD; // Call Detect() explicit CPUInfo(); diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 5935b7f53a..38e1b2176c 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -155,10 +155,10 @@ public: Do(stringLen); switch (mode) { - case MODE_READ: x = (wchar_t*)*ptr; break; + case MODE_READ: x.assign((wchar_t*)*ptr, (stringLen / sizeof(wchar_t)) - 1); break; case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; case MODE_MEASURE: break; - case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%s\" != \"%s\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; + case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; } (*ptr) += stringLen; } diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 960bf75559..904095e255 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -60,11 +60,6 @@ private: #undef STACKALIGN #define STACKALIGN __attribute__((__force_align_arg_pointer__)) #endif -// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support. -#ifdef __WXOSX_COCOA__ -#define HAVE_WX 1 -#define USE_WX 1 // Use wxGLCanvas -#endif #elif defined _WIN32 @@ -86,8 +81,9 @@ private: #define GC_ALIGNED16_DECL(x) __declspec(align(16)) x #define GC_ALIGNED64_DECL(x) __declspec(align(64)) x -// Since it is always around on windows +// Since they are always around on windows #define HAVE_WX 1 + #define HAVE_OPENAL 1 #define HAVE_PORTAUDIO 1 @@ -137,7 +133,9 @@ private: // wxWidgets does not have a true dummy macro for this. #define _trans(a) a -#if defined __GNUC__ +#if defined _M_GENERIC +# define _M_SSE 0x0 +#elif defined __GNUC__ # if defined __SSE4_2__ # define _M_SSE 0x402 # elif defined __SSE4_1__ @@ -148,7 +146,7 @@ private: # define _M_SSE 0x300 # endif #elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008 -# define _M_SSE 0x402 +# define _M_SSE 0x402 #endif // Host communication. @@ -159,7 +157,6 @@ enum HOST_COMM WM_USER_CREATE, WM_USER_SETCURSOR, WM_USER_KEYDOWN, - WIIMOTE_DISCONNECT // Disconnect Wiimote }; // Used for notification on emulation state diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 585fe0999a..7c6bcdc703 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -35,7 +35,7 @@ template<> struct CompileTimeAssert {}; #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#if defined __GNUC__ && !defined __SSSE3__ +#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC #include static __inline __m128i __attribute__((__always_inline__)) _mm_shuffle_epi8(__m128i a, __m128i mask) @@ -60,6 +60,8 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) // go to debugger mode #ifdef GEKKO #define Crash() + #elif defined _M_GENERIC + #define Crash() { exit(1); } #else #define Crash() {asm ("int $3");} #endif @@ -136,6 +138,15 @@ inline u8 swap8(u8 _data) {return _data;} inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} +#elif _M_ARM +#ifdef ANDROID +#undef swap16 +#undef swap32 +#undef swap64 +#endif +inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} +inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} +inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);} #elif __linux__ inline u16 swap16(u16 _data) {return bswap_16(_data);} inline u32 swap32(u32 _data) {return bswap_32(_data);} @@ -161,7 +172,6 @@ inline u64 swap64(u64 data) {return ((u64)swap32(data) << 32) | swap32(data >> 3 inline u16 swap16(const u8* _pData) {return swap16(*(const u16*)_pData);} inline u32 swap32(const u8* _pData) {return swap32(*(const u32*)_pData);} inline u64 swap64(const u8* _pData) {return swap64(*(const u64*)_pData);} - } // Namespace Common #endif // _COMMONFUNCS_H_ diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index decf2aef97..cab7ce3762 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -36,6 +36,9 @@ // You can use the File::GetUserPath() util for this #define USERDATA_DIR "Contents/Resources/User" #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin" +#elif defined ANDROID + #define USERDATA_DIR "user" + #define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu" #else #define USERDATA_DIR "user" #ifdef USER_DIR @@ -52,6 +55,8 @@ #define SYSDATA_DIR "Contents/Resources/Sys" #define SHARED_USER_DIR File::GetBundleDirectory() + \ DIR_SEP USERDATA_DIR DIR_SEP +#elif defined ANDROID + #define SYSDATA_DIR "/sdcard/dolphin-emu" #else #ifdef DATA_DIR #define SYSDATA_DIR DATA_DIR "sys" @@ -89,11 +94,11 @@ #define MAIL_LOGS_DIR LOGS_DIR DIR_SEP "Mail" #define SHADERS_DIR "Shaders" #define WII_SYSCONF_DIR "shared2" DIR_SEP "sys" +#define THEMES_DIR "Themes" // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) #define DOLPHIN_CONFIG "Dolphin.ini" -#define DSP_CONFIG "DSP.ini" #define DEBUGGER_CONFIG "Debugger.ini" #define LOGGER_CONFIG "Logger.ini" @@ -128,6 +133,7 @@ #define WII_EUR_SETTING "setting-eur.txt" #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" +#define WII_KOR_SETTING "setting-kor.txt" #define GECKO_CODE_HANDLER "codehandler.bin" diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h index 15c58e4f57..317cd0bb43 100644 --- a/Source/Core/Common/Src/DebugInterface.h +++ b/Source/Core/Common/Src/DebugInterface.h @@ -30,7 +30,7 @@ public: virtual void step() {} virtual void runToBreakpoint() {} virtual void breakNow() {} - virtual void insertBLR(unsigned int /*address*/, unsigned int) {} + virtual void insertBLR(unsigned int /*address*/, unsigned int /*value*/) {} virtual void showJitResults(unsigned int /*address*/) {}; virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} virtual std::string getDescription(unsigned int /*address*/) = 0; diff --git a/Source/Core/Common/Src/FPURoundMode.h b/Source/Core/Common/Src/FPURoundMode.h new file mode 100644 index 0000000000..acfd89c313 --- /dev/null +++ b/Source/Core/Common/Src/FPURoundMode.h @@ -0,0 +1,51 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef FPU_ROUND_MODE_H_ +#define FPU_ROUND_MODE_H_ +#include "Common.h" + +namespace FPURoundMode +{ + enum RoundModes + { + ROUND_NEAR = 0, + ROUND_CHOP, + ROUND_UP, + ROUND_DOWN + }; + enum PrecisionModes { + PREC_24 = 0, + PREC_53, + PREC_64 + }; + void SetRoundMode(u32 mode); + + void SetPrecisionMode(u32 mode); + + void SetSIMDMode(u32 mode); + + /* + There are two different flavors of float to int conversion: + _mm_cvtps_epi32() and _mm_cvttps_epi32(). The first rounds + according to the MXCSR rounding bits. The second one always + uses round towards zero. + */ + void SaveSIMDState(); + void LoadSIMDState(); + void LoadDefaultSIMDState(); +} +#endif diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp index c60ce9beda..595dfe7000 100644 --- a/Source/Core/Common/Src/FileSearch.cpp +++ b/Source/Core/Common/Src/FileSearch.cpp @@ -25,6 +25,7 @@ #endif #include +#include #include "FileSearch.h" @@ -72,36 +73,36 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& #else - size_t dot_pos = _searchString.rfind("."); + // TODO: super lame/broken - if (dot_pos == std::string::npos) - return; + auto end_match(_searchString); + + // assuming we have a "*.blah"-like pattern + if (!end_match.empty() && end_match[0] == '*') + end_match.erase(0, 1); + + // ugly + if (end_match == ".*") + end_match.clear(); - std::string ext = _searchString.substr(dot_pos); DIR* dir = opendir(_strPath.c_str()); if (!dir) return; - dirent* dp; - - while (true) + while (auto const dp = readdir(dir)) { - dp = readdir(dir); + std::string found(dp->d_name); - if (!dp) - break; - - std::string s(dp->d_name); - - if ( (!ext.compare(".*") && s.compare(".") && s.compare("..")) || - ((s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) )) + if ((found != ".") && (found != "..") + && (found.size() >= end_match.size()) + && std::equal(end_match.rbegin(), end_match.rend(), found.rbegin())) { std::string full_name; if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR) - full_name = _strPath + s; + full_name = _strPath + found; else - full_name = _strPath + DIR_SEP + s; + full_name = _strPath + DIR_SEP + found; m_FileNames.push_back(full_name); } diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 4650c6e1ba..f42c204396 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -42,6 +42,7 @@ #endif #include +#include #include #ifndef S_ISDIR @@ -196,8 +197,9 @@ bool CreateFullPath(const std::string &fullPath) // we're done, yay! if (position == fullPath.npos) return true; - - std::string subPath = fullPath.substr(0, position); + + // Include the '/' so the first call is CreateDir("/") rather than CreateDir("") + std::string const subPath(fullPath.substr(0, position + 1)); if (!File::IsDirectory(subPath)) File::CreateDir(subPath); @@ -299,7 +301,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename) ERROR_LOG(COMMON, "Copy: failed reading from source, %s --> %s: %s", srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg()); - return false; + goto bail; } } @@ -310,13 +312,19 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename) ERROR_LOG(COMMON, "Copy: failed writing to output, %s --> %s: %s", srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg()); - return false; + goto bail; } } // close flushs fclose(input); fclose(output); return true; +bail: + if (input) + fclose(input); + if (output) + fclose(output); + return false; #endif } @@ -506,12 +514,24 @@ bool DeleteDirRecursively(const std::string &directory) if (IsDirectory(newPath)) { if (!DeleteDirRecursively(newPath)) + { + #ifndef _WIN32 + closedir(dirp); + #endif + return false; + } } else { if (!File::Delete(newPath)) + { + #ifndef _WIN32 + closedir(dirp); + #endif + return false; + } } #ifdef _WIN32 @@ -643,15 +663,15 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) if (paths[D_USER_IDX].empty()) { #ifdef _WIN32 - // TODO: use GetExeDirectory() here instead of ROOT_DIR so that if the cwd is changed we still have the correct paths? - paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; + paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; #else if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; else - paths[D_USER_IDX] = std::string(getenv("HOME")) + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; + paths[D_USER_IDX] = std::string(getenv("HOME") ? + getenv("HOME") : getenv("PWD") ? + getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; #endif - INFO_LOG(COMMON, "GetUserPath: Setting user directory to %s:", paths[D_USER_IDX].c_str()); paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; @@ -673,9 +693,9 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) paths[D_DUMPDSP_IDX] = paths[D_USER_IDX] + DUMP_DSP_DIR DIR_SEP; paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; paths[D_MAILLOGS_IDX] = paths[D_USER_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DSPCONFIG_IDX] = paths[D_CONFIG_IDX] + DSP_CONFIG; paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; @@ -756,6 +776,24 @@ IOFile::~IOFile() Close(); } +IOFile::IOFile(IOFile&& other) + : m_file(NULL), m_good(true) +{ + Swap(other); +} + +IOFile& IOFile::operator=(IOFile&& other) +{ + IOFile((IOFile&&)other).Swap(*this); + return *this; +} + +void IOFile::Swap(IOFile& other) +{ + std::swap(m_file, other.m_file); + std::swap(m_good, other.m_good); +} + bool IOFile::Open(const std::string& filename, const char openmode[]) { Close(); diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 9134bcf44e..b8e8d9c17c 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -50,8 +50,8 @@ enum { D_LOGS_IDX, D_MAILLOGS_IDX, D_WIISYSCONF_IDX, + D_THEMES_IDX, F_DOLPHINCONFIG_IDX, - F_DSPCONFIG_IDX, F_DEBUGGERCONFIG_IDX, F_LOGGERCONFIG_IDX, F_MAINLOG_IDX, @@ -150,7 +150,7 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str); // simple wrapper for cstdlib file functions to // hopefully will make error checking easier // and make forgetting an fclose() harder -class IOFile : NonCopyable +class IOFile { public: IOFile(); @@ -158,6 +158,11 @@ public: IOFile(const std::string& filename, const char openmode[]); ~IOFile(); + + IOFile(IOFile&& other); + IOFile& operator=(IOFile&& other); + + void Swap(IOFile& other); bool Open(const std::string& filename, const char openmode[]); bool Close(); @@ -212,6 +217,7 @@ public: void Clear() { m_good = true; std::clearerr(m_file); } private: + IOFile(const IOFile&) /*= delete*/; IOFile& operator=(const IOFile&) /*= delete*/; std::FILE* m_file; diff --git a/Source/Core/Common/Src/GenericFPURoundMode.cpp b/Source/Core/Common/Src/GenericFPURoundMode.cpp new file mode 100644 index 0000000000..cc878291a1 --- /dev/null +++ b/Source/Core/Common/Src/GenericFPURoundMode.cpp @@ -0,0 +1,41 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "FPURoundMode.h" + +// Generic, do nothing +namespace FPURoundMode +{ + void SetRoundMode(u32 mode) + { + } + void SetPrecisionMode(u32 mode) + { + } + void SetSIMDMode(u32 mode) + { + } + void SaveSIMDState() + { + } + void LoadSIMDState() + { + } + void LoadDefaultSIMDState() + { + } +} diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 4c746e9b75..9755c996bd 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6975 + LINEAR_DISKCACHE_VER = 6979 }; // On disk format: diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index a79c413cf8..3beae08c15 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -17,6 +17,9 @@ #include +#ifdef ANDROID +#include "Host.h" +#endif #include "LogManager.h" #include "ConsoleListener.h" #include "Timer.h" @@ -132,7 +135,9 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, Common::Timer::GetTimeFormatted().c_str(), file, line, level_to_char[(int)level], log->GetShortName(), temp); - +#ifdef ANDROID + Host_SysMessage(msg); +#endif log->Trigger(level, msg); } diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp index e078db2e9d..b97d55e62c 100644 --- a/Source/Core/Common/Src/MathUtil.cpp +++ b/Source/Core/Common/Src/MathUtil.cpp @@ -21,13 +21,6 @@ #include #include -namespace { - -static u32 saved_sse_state = _mm_getcsr(); -static const u32 default_sse_state = _mm_getcsr(); - -} - namespace MathUtil { @@ -114,23 +107,6 @@ u32 ClassifyFloat(float fvalue) } // namespace -void LoadDefaultSSEState() -{ - _mm_setcsr(default_sse_state); -} - - -void LoadSSEState() -{ - _mm_setcsr(saved_sse_state); -} - - -void SaveSSEState() -{ - saved_sse_state = _mm_getcsr(); -} - inline void MatrixMul(int n, const float *a, const float *b, float *result) { for (int i = 0; i < n; ++i) diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h index a6290ff602..114a91bf3c 100644 --- a/Source/Core/Common/Src/MathUtil.h +++ b/Source/Core/Common/Src/MathUtil.h @@ -20,8 +20,8 @@ #include "Common.h" -#include #include +#include "FPURoundMode.h" namespace MathUtil { @@ -147,17 +147,6 @@ struct Rectangle inline float pow2f(float x) {return x * x;} inline double pow2(double x) {return x * x;} - -/* - There are two different flavors of float to int conversion: - _mm_cvtps_epi32() and _mm_cvttps_epi32(). The first rounds - according to the MXCSR rounding bits. The second one always - uses round towards zero. - */ - -void SaveSSEState(); -void LoadSSEState(); -void LoadDefaultSSEState(); float MathFloatVectorSum(const std::vector&); #define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1)) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 4af9da3415..0a2b9e0306 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -27,6 +27,10 @@ #include #include #include +#ifdef ANDROID +#include +#include +#endif #endif #if defined(__APPLE__) @@ -34,16 +38,47 @@ static const char* ram_temp_file = "/tmp/gc_mem.tmp"; #elif !defined(_WIN32) // non OSX unixes static const char* ram_temp_file = "/dev/shm/gc_mem.tmp"; #endif +#ifdef ANDROID +#define ASHMEM_DEVICE "/dev/ashmem" + +int AshmemCreateFileMapping(const char *name, size_t size) +{ + int fd, ret; + fd = open(ASHMEM_DEVICE, O_RDWR); + if (fd < 0) + return fd; + + // We don't really care if we can't set the name, it is optional + ret = ioctl(fd, ASHMEM_SET_NAME, name); + + ret = ioctl(fd, ASHMEM_SET_SIZE, size); + if (ret < 0) + { + close(fd); + NOTICE_LOG(MEMMAP, "Ashmem returned error: 0x%08x", ret); + return ret; + } + return fd; +} +#endif void MemArena::GrabLowMemSpace(size_t size) { #ifdef _WIN32 hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), NULL); +#elif defined(ANDROID) + fd = AshmemCreateFileMapping("Dolphin-emu", size); + if (fd < 0) + { + NOTICE_LOG(MEMMAP, "Ashmem allocation failed"); + return; + } #else mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; fd = open(ram_temp_file, O_RDWR | O_CREAT, mode); unlink(ram_temp_file); - ftruncate(fd, size); + if (ftruncate(fd, size) < 0) + ERROR_LOG(MEMMAP, "Failed to allocate low memory space"); return; #endif } @@ -118,8 +153,7 @@ u8* MemArena::Find4GBBase() } return base; #else - void* base = mmap(0, 0x31000000, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_SHARED, -1, 0); + void* base = mmap(0, 0x31000000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0); if (base == MAP_FAILED) { PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno)); return 0; diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index ebfa380be4..ff50347799 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -117,8 +117,12 @@ void* AllocateAlignedMemory(size_t size,size_t alignment) void* ptr = _aligned_malloc(size,alignment); #else void* ptr = NULL; - posix_memalign(&ptr, alignment, size); -; +#ifdef ANDROID + ptr = memalign(alignment, size); +#else + if (posix_memalign(&ptr, alignment, size) != 0) + ERROR_LOG(MEMMAP, "Failed to allocate aligned memory"); +#endif #endif // printf("Mapped memory at %p (size %ld)\n", ptr, diff --git a/Source/Core/Common/Src/SDCardUtil.cpp b/Source/Core/Common/Src/SDCardUtil.cpp index 4002a51b99..0f2ad08607 100644 --- a/Source/Core/Common/Src/SDCardUtil.cpp +++ b/Source/Core/Common/Src/SDCardUtil.cpp @@ -40,7 +40,7 @@ #include // for unlink() #endif -/* believe me, you *don't* want to change these constants !! */ +/* Believe me, you *don't* want to change these constants !! */ #define BYTES_PER_SECTOR 512 #define RESERVED_SECTORS 32 #define BACKUP_BOOT_SECTOR 6 @@ -52,15 +52,15 @@ #define POKES(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8) ) #define POKEW(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8), BYTE_(p,2) = (u8)((v) >> 16), BYTE_(p,3) = (u8)((v) >> 24) ) -static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* boot sector */ +static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* Boot sector */ static u8 s_fsinfo_sector [ BYTES_PER_SECTOR ]; /* FS Info sector */ -static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* first FAT sector */ +static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* First FAT sector */ -/* this is the date and time when creating the disk */ -static int get_serial_id() +/* This is the date and time when creating the disk */ +static unsigned int get_serial_id() { u16 lo, hi; - time_t now = time(NULL); + time_t now = time(nullptr); struct tm tm = gmtime( &now )[0]; lo = (u16)(tm.tm_mday + ((tm.tm_mon+1) << 8) + (tm.tm_sec << 8)); @@ -69,7 +69,7 @@ static int get_serial_id() return lo + (hi << 16); } -static int get_sectors_per_cluster(u64 disk_size) +static unsigned int get_sectors_per_cluster(u64 disk_size) { u64 disk_MB = disk_size/(1024*1024); @@ -88,60 +88,60 @@ static int get_sectors_per_cluster(u64 disk_size) return 32; } -static int get_sectors_per_fat(u64 disk_size, int sectors_per_cluster) +static unsigned int get_sectors_per_fat(u64 disk_size, u32 sectors_per_cluster) { u64 divider; - /* weird computation from MS - see fatgen103.doc for details */ - disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* don't count 32 reserved sectors */ - disk_size /= BYTES_PER_SECTOR; /* disk size in sectors */ + /* Weird computation from MS - see fatgen103.doc for details */ + disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* Don't count 32 reserved sectors */ + disk_size /= BYTES_PER_SECTOR; /* Disk size in sectors */ divider = ((256 * sectors_per_cluster) + NUM_FATS) / 2; - return (int)( (disk_size + (divider-1)) / divider ); + return (u32)( (disk_size + (divider-1)) / divider ); } static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* label) { - int sectors_per_cluster = get_sectors_per_cluster(disk_size); - int sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); - int sectors_per_disk = (int)(disk_size / BYTES_PER_SECTOR); - int serial_id = get_serial_id(); - int free_count; + u32 sectors_per_cluster = get_sectors_per_cluster(disk_size); + u32 sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); + u32 sectors_per_disk = (u32)(disk_size / BYTES_PER_SECTOR); + u32 serial_id = get_serial_id(); + u32 free_count; - if (label == NULL) + if (label == nullptr) label = "DOLPHINSD"; POKEB(boot, 0xeb); POKEB(boot+1, 0x5a); POKEB(boot+2, 0x90); strcpy( (char*)boot + 3, "MSWIN4.1" ); - POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* sector size */ - POKEB( boot + 0xd, sectors_per_cluster ); /* sectors per cluster */ - POKES( boot + 0xe, RESERVED_SECTORS ); /* reserved sectors before first FAT */ - POKEB( boot + 0x10, NUM_FATS ); /* number of FATs */ - POKES( boot + 0x11, 0 ); /* max root directory entries for FAT12/FAT16, 0 for FAT32 */ - POKES( boot + 0x13, 0 ); /* total sectors, 0 to use 32-bit value at offset 0x20 */ - POKEB( boot + 0x15, 0xF8 ); /* media descriptor, 0xF8 == hard disk */ + POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* Sector size */ + POKEB( boot + 0xd, sectors_per_cluster ); /* Sectors per cluster */ + POKES( boot + 0xe, RESERVED_SECTORS ); /* Reserved sectors before first FAT */ + POKEB( boot + 0x10, NUM_FATS ); /* Number of FATs */ + POKES( boot + 0x11, 0 ); /* Max root directory entries for FAT12/FAT16, 0 for FAT32 */ + POKES( boot + 0x13, 0 ); /* Total sectors, 0 to use 32-bit value at offset 0x20 */ + POKEB( boot + 0x15, 0xF8 ); /* Media descriptor, 0xF8 == hard disk */ POKES( boot + 0x16, 0 ); /* Sectors per FAT for FAT12/16, 0 for FAT32 */ POKES( boot + 0x18, 9 ); /* Sectors per track (whatever) */ POKES( boot + 0x1a, 2 ); /* Number of heads (whatever) */ POKEW( boot + 0x1c, 0 ); /* Hidden sectors */ POKEW( boot + 0x20, sectors_per_disk ); /* Total sectors */ - /* extension */ + /* Extension */ POKEW( boot + 0x24, sectors_per_fat ); /* Sectors per FAT */ POKES( boot + 0x28, 0 ); /* FAT flags */ - POKES( boot + 0x2a, 0 ); /* version */ - POKEW( boot + 0x2c, 2 ); /* cluster number of root directory start */ - POKES( boot + 0x30, 1 ); /* sector number of FS information sector */ - POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* sector number of a copy of this boot sector */ - POKEB( boot + 0x40, 0x80 ); /* physical drive number */ - POKEB( boot + 0x42, 0x29 ); /* extended boot signature ?? */ - POKEW( boot + 0x43, serial_id ); /* serial ID */ + POKES( boot + 0x2a, 0 ); /* Version */ + POKEW( boot + 0x2c, 2 ); /* Cluster number of root directory start */ + POKES( boot + 0x30, 1 ); /* Sector number of FS information sector */ + POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* Sector number of a copy of this boot sector */ + POKEB( boot + 0x40, 0x80 ); /* Physical drive number */ + POKEB( boot + 0x42, 0x29 ); /* Extended boot signature ?? */ + POKEW( boot + 0x43, serial_id ); /* Serial ID */ strncpy( (char*)boot + 0x47, label, 11 ); /* Volume Label */ memcpy( boot + 0x52, "FAT32 ", 8 ); /* FAT system type, padded with 0x20 */ - POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* boot sector signature */ + POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* Boot sector signature */ POKEB( boot + BYTES_PER_SECTOR-1, 0xAA ); /* FSInfo sector */ @@ -149,25 +149,25 @@ static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* labe POKEW( info + 0, 0x41615252 ); POKEW( info + 484, 0x61417272 ); - POKEW( info + 488, free_count ); /* number of free clusters */ - POKEW( info + 492, 3 ); /* next free clusters, 0-1 reserved, 2 is used for the root dir */ + POKEW( info + 488, free_count ); /* Number of free clusters */ + POKEW( info + 492, 3 ); /* Next free clusters, 0-1 reserved, 2 is used for the root dir */ POKEW( info + 508, 0xAA550000 ); } static void fat_init(u8* fat) { - POKEW( fat, 0x0ffffff8 ); /* reserve cluster 1, media id in low byte */ - POKEW( fat + 4, 0x0fffffff ); /* reserve cluster 2 */ - POKEW( fat + 8, 0x0fffffff ); /* end of clust chain for root dir */ + POKEW( fat, 0x0ffffff8 ); /* Reserve cluster 1, media id in low byte */ + POKEW( fat + 4, 0x0fffffff ); /* Reserve cluster 2 */ + POKEW( fat + 8, 0x0fffffff ); /* End of cluster chain for root dir */ } -static int write_sector(FILE* file, u8* sector) +static unsigned int write_sector(FILE* file, u8* sector) { return fwrite(sector, 1, 512, file) != 512; } -static int write_empty(FILE* file, u64 count) +static unsigned int write_empty(FILE* file, u64 count) { static u8 empty[64*1024]; @@ -188,8 +188,8 @@ static int write_empty(FILE* file, u64 count) bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) { - int sectors_per_fat; - int sectors_per_disk; + u32 sectors_per_fat; + u32 sectors_per_disk; FILE* f; // Convert MB to bytes @@ -200,21 +200,21 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return false; } - // pretty unlikely to overflow. - sectors_per_disk = (int)(disk_size / 512); + // Pretty unlikely to overflow. + sectors_per_disk = (u32)(disk_size / 512); sectors_per_fat = get_sectors_per_fat(disk_size, get_sectors_per_cluster(disk_size)); - boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, NULL ); + boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, nullptr); fat_init(s_fat_head); f = fopen(filename, "wb"); if (!f) { - ERROR_LOG(COMMON, "could not create file '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not create file '%s', aborting...\n", filename); return false; } - /* here's the layout: + /* Here's the layout: * * boot_sector * fsinfo_sector @@ -251,7 +251,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return true; FailWrite: - ERROR_LOG(COMMON, "could not write to '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not write to '%s', aborting...\n", filename); if (unlink(filename) < 0) ERROR_LOG(COMMON, "unlink(%s) failed\n%s", filename, GetLastErrorMsg()); fclose(f); diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h deleted file mode 100644 index c0faec3059..0000000000 --- a/Source/Core/Common/Src/Setup.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef _SETUP_H_ -#define _SETUP_H_ - -// ----------------------------------------------------------------------------------------------------- -// File description: -// Compilation settings. I avoid placing this in Common.h or some place where lots of files needs -// to be rebuilt if any of these settings are changed. I'd rather have it in as few files as possible. -// This file can be kept on the ignore list in your SVN program. It allows local optional settings -// depending on what works on your computer. -// ----------------------------------------------------------------------------------------------------- - -// ----------------------------------------------------------------------------------------------------- -// Settings: - -// This may remove sound artifacts in Wario Land Shake It and perhaps other games -//#define SETUP_AVOID_SOUND_ARTIFACTS - -// Build with playback rerecording options -//#define RERECORDING - -// ----------------------------------------------------------------------------------------------------- - -#endif // _SETUP_H_ - diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h index 1b81766ee0..11de6536b4 100644 --- a/Source/Core/Common/Src/StdConditionVariable.h +++ b/Source/Core/Common/Src/StdConditionVariable.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #include #else diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h index 150d18f53e..8a5d22f928 100644 --- a/Source/Core/Common/Src/StdMutex.h +++ b/Source/Core/Common/Src/StdMutex.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #include #else @@ -318,9 +318,12 @@ public: mutex_type* release() { - return mutex(); + auto const ret = mutex(); + pm = NULL; owns = false; + + return ret; } bool owns_lock() const diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h index fea058c874..6897235658 100644 --- a/Source/Core/Common/Src/StdThread.h +++ b/Source/Core/Common/Src/StdThread.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #ifndef _GLIBCXX_USE_SCHED_YIELD #define _GLIBCXX_USE_SCHED_YIELD diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 664987d350..cd08863877 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -69,7 +69,8 @@ std::string StringFromFormat(const char* format, ...) delete[] buf; #else va_start(args, format); - vasprintf(&buf, format, args); + if (vasprintf(&buf, format, args) < 0) + ERROR_LOG(COMMON, "Unable to allocate memory for string"); va_end(args); std::string temp = buf; @@ -262,25 +263,25 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st const char HEX2DEC[256] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - /* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 1 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 2 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1, -1,-1,-1,-1, + /* 0 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 1 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 2 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,16,16, 16,16,16,16, - /* 4 */ -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 5 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 6 */ -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 7 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + /* 4 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16, + /* 5 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 6 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16, + /* 7 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, - /* 8 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 9 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* A */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* B */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + /* 8 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 9 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* A */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* B */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, - /* C */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* D */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* E */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* F */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1 + /* C */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* D */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* E */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* F */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16 }; std::string UriDecode(const std::string & sSrc) @@ -302,8 +303,8 @@ std::string UriDecode(const std::string & sSrc) if (*pSrc == '%') { char dec1, dec2; - if (-1 != (dec1 = HEX2DEC[*(pSrc + 1)]) - && -1 != (dec2 = HEX2DEC[*(pSrc + 2)])) + if (16 != (dec1 = HEX2DEC[*(pSrc + 1)]) + && 16 != (dec2 = HEX2DEC[*(pSrc + 2)])) { *pEnd++ = (dec1 << 4) + dec2; pSrc += 3; diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index ce91aac651..3e8440b74f 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Setup.h" #include "Thread.h" #include "Common.h" @@ -106,7 +105,7 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) #ifdef __APPLE__ thread_policy_set(pthread_mach_thread_np(thread), THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1); -#elif defined __linux__ || defined BSD4_4 +#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID) cpu_set_t cpu_set; CPU_ZERO(&cpu_set); diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index e711fcab5c..8b38be1de1 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -33,8 +33,6 @@ #define INFINITE 0xffffffff #endif -#include - //for gettimeofday and struct time(spec|val) #include #include diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 087f8fcead..b1beed2066 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -97,12 +97,6 @@ void Timer::AddTimeDifference() m_StartTime += GetTimeDifference(); } -// Wind back the starting time to a custom time -void Timer::WindBackStartingTime(u64 WindBack) -{ - m_StartTime += WindBack; -} - // Get the time elapsed since the Start() u64 Timer::GetTimeElapsed() { diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h index a638920409..152d4c60e6 100644 --- a/Source/Core/Common/Src/Timer.h +++ b/Source/Core/Common/Src/Timer.h @@ -35,7 +35,6 @@ public: // The time difference is always returned in milliseconds, regardless of alternative internal representation u64 GetTimeDifference(); void AddTimeDifference(); - void WindBackStartingTime(u64 WindBack); static void IncreaseResolution(); static void RestoreResolution(); diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 1fbe0f4a41..62bb42997f 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -22,7 +22,9 @@ #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif +#ifndef USE_GLES #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" +#endif #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" std::vector g_available_video_backends; @@ -41,7 +43,7 @@ static bool IsGteVista() VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL); - return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask); + return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE; } #endif @@ -52,7 +54,9 @@ void VideoBackend::PopulateList() if (IsGteVista()) g_available_video_backends.push_back(new DX11::VideoBackend); #endif +#ifndef USE_GLES g_available_video_backends.push_back(new OGL::VideoBackend); +#endif g_available_video_backends.push_back(new SW::VideoSoftware); g_video_backend = g_available_video_backends.front(); @@ -69,6 +73,9 @@ void VideoBackend::ClearList() void VideoBackend::ActivateBackend(const std::string& name) { + if (name.length() == 0) // If NULL, set it to the first one in the list. Expected behavior + g_video_backend = g_available_video_backends.front(); + for (std::vector::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it) if (name == (*it)->GetName()) g_video_backend = *it; diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 4e602526d2..f502bf42b6 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -139,6 +139,8 @@ public: // the implementation needs not do synchronization logic, because calls to it are surrounded by PauseAndLock now virtual void DoState(PointerWrap &p) = 0; + + virtual void CheckInvalidState() = 0; }; extern std::vector g_available_video_backends; @@ -180,9 +182,15 @@ class VideoBackendHardware : public VideoBackend void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void DoState(PointerWrap &p); + + bool m_invalid; + +public: + void CheckInvalidState(); protected: void InitializeShared(); + void InvalidState(); }; #endif diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp similarity index 99% rename from Source/Core/Common/Src/ABI.cpp rename to Source/Core/Common/Src/x64ABI.cpp index 63a8e76934..cd2f410dbf 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/x64ABI.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Common/Src/ABI.h b/Source/Core/Common/Src/x64ABI.h similarity index 100% rename from Source/Core/Common/Src/ABI.h rename to Source/Core/Common/Src/x64ABI.h diff --git a/Source/Core/Common/Src/x64Analyzer.cpp b/Source/Core/Common/Src/x64Analyzer.cpp index 2ea3e9a512..66a2fe217f 100644 --- a/Source/Core/Common/Src/x64Analyzer.cpp +++ b/Source/Core/Common/Src/x64Analyzer.cpp @@ -31,12 +31,9 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc info.hasImmediate = false; info.isMemoryWrite = false; - int addressSize = 8; u8 modRMbyte = 0; u8 sibByte = 0; bool hasModRM = false; - bool hasSIBbyte = false; - bool hasDisplacement = false; int displacementSize = 0; @@ -47,7 +44,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc } else if (*codePtr == 0x67) { - addressSize = 4; codePtr++; } @@ -113,7 +109,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc info.otherReg = (sibByte & 7); if (rex & 2) info.scaledReg += 8; if (rex & 1) info.otherReg += 8; - hasSIBbyte = true; } else { @@ -122,7 +117,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc } if (mrm.mod == 1 || mrm.mod == 2) { - hasDisplacement = true; if (mrm.mod == 1) displacementSize = 1; else diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp similarity index 94% rename from Source/Core/Common/Src/CPUDetect.cpp rename to Source/Core/Common/Src/x64CPUDetect.cpp index 93e9d25087..2898b91bec 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/x64CPUDetect.cpp @@ -30,7 +30,9 @@ #else //#include +#ifndef _M_GENERIC #include +#endif #if defined __FreeBSD__ #include @@ -39,7 +41,9 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { -#ifdef _LP64 +#if defined _M_GENERIC + (*eax) = (*ebx) = (*ecx) = (*edx) = 0; +#elif defined _LP64 // Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to // restored at the end of the asm block. __asm__ ( @@ -173,9 +177,7 @@ void CPUInfo::Detect() if (max_ex_fn >= 0x80000001) { // Check for more features. __cpuid(cpu_id, 0x80000001); - bool cmp_legacy = false; if (cpu_id[2] & 1) bLAHFSAHF64 = true; - if (cpu_id[2] & 2) cmp_legacy = true; //wtf is this? if ((cpu_id[3] >> 29) & 1) bLongMode = true; } @@ -207,14 +209,7 @@ void CPUInfo::Detect() // Turn the cpu info into a string we can show std::string CPUInfo::Summarize() { - std::string sum; - if (num_cores == 1) - sum = StringFromFormat("%s, %i core", cpu_string, num_cores); - else - { - sum = StringFromFormat("%s, %i cores", cpu_string, num_cores); - if (HTT) sum += StringFromFormat(" (%i logical threads per physical core)", logical_cpu_count); - } + std::string sum(cpu_string); if (bSSE) sum += ", SSE"; if (bSSE2) sum += ", SSE2"; if (bSSE3) sum += ", SSE3"; diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index d4bd1adabf..9f15845875 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "CPUDetect.h" namespace Gen @@ -870,7 +870,6 @@ void XEmitter::BTC(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, //shift can be either imm8 or cl void XEmitter::SHRD(int bits, OpArg dest, OpArg src, OpArg shift) { - bool writeImm = false; if (dest.IsImm()) { _assert_msg_(DYNA_REC, 0, "SHRD - can't use imms as destination"); @@ -901,7 +900,6 @@ void XEmitter::SHRD(int bits, OpArg dest, OpArg src, OpArg shift) void XEmitter::SHLD(int bits, OpArg dest, OpArg src, OpArg shift) { - bool writeImm = false; if (dest.IsImm()) { _assert_msg_(DYNA_REC, 0, "SHLD - can't use imms as destination"); @@ -1070,8 +1068,10 @@ void XEmitter::XOR (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(t void XEmitter::MOV (int bits, const OpArg &a1, const OpArg &a2) { #ifdef _DEBUG +#ifndef _M_X64 _assert_msg_(DYNA_REC, !a1.IsSimpleReg() || !a2.IsSimpleReg() || a1.GetSimpleReg() != a2.GetSimpleReg(), "Redundant MOV @ %p - bug in JIT?", - code); + code); +#endif #endif WriteNormalOp(this, bits, nrmMOV, a1, a2); } diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index 3b699c81a0..6b8c59b5a5 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -757,7 +757,7 @@ public: region_size = 0; } - bool IsInCodeSpace(u8 *ptr) + bool IsInSpace(u8 *ptr) { return ptr >= region && ptr < region + region_size; } diff --git a/Source/Core/Common/Src/x64FPURoundMode.cpp b/Source/Core/Common/Src/x64FPURoundMode.cpp new file mode 100644 index 0000000000..0beefd860a --- /dev/null +++ b/Source/Core/Common/Src/x64FPURoundMode.cpp @@ -0,0 +1,120 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "FPURoundMode.h" + +#ifndef _WIN32 +static const unsigned short FPU_ROUND_NEAR = 0 << 10; +static const unsigned short FPU_ROUND_DOWN = 1 << 10; +static const unsigned short FPU_ROUND_UP = 2 << 10; +static const unsigned short FPU_ROUND_CHOP = 3 << 10; +static const unsigned short FPU_ROUND_MASK = 3 << 10; +#include +#endif + +const u32 MASKS = 0x1F80; // mask away the interrupts. +const u32 DAZ = 0x40; +const u32 FTZ = 0x8000; + +namespace FPURoundMode +{ + // Get the default SSE states here. + static u32 saved_sse_state = _mm_getcsr(); + static const u32 default_sse_state = _mm_getcsr(); + + void SetRoundMode(u32 mode) + { + // Set FPU rounding mode to mimic the PowerPC's + #ifdef _M_IX86 + // This shouldn't really be needed anymore since we use SSE + #ifdef _WIN32 + const int table[4] = + { + _RC_NEAR, + _RC_CHOP, + _RC_UP, + _RC_DOWN + }; + _set_controlfp(_MCW_RC, table[mode]); + #else + const unsigned short table[4] = + { + FPU_ROUND_NEAR, + FPU_ROUND_CHOP, + FPU_ROUND_UP, + FPU_ROUND_DOWN + }; + unsigned short _mode; + asm ("fstcw %0" : "=m" (_mode) : ); + _mode = (_mode & ~FPU_ROUND_MASK) | table[mode]; + asm ("fldcw %0" : : "m" (_mode)); + #endif + #endif + } + + void SetPrecisionMode(u32 mode) + { + #ifdef _M_IX86 + // sets the floating-point lib to 53-bit + // PowerPC has a 53bit floating pipeline only + // eg: sscanf is very sensitive + #ifdef _WIN32 + _control87(_PC_53, MCW_PC); + #else + const unsigned short table[4] = { + 0 << 8, // FPU_PREC_24 + 2 << 8, // FPU_PREC_53 + 3 << 8, // FPU_PREC_64 + 3 << 8, // FPU_PREC_MASK + }; + unsigned short _mode; + asm ("fstcw %0" : : "m" (_mode)); + _mode = (_mode & ~table[4]) | table[mode]; + asm ("fldcw %0" : : "m" (_mode)); + #endif + #else + //x64 doesn't need this - fpu is done with SSE + //but still - set any useful sse options here + #endif + } + void SetSIMDMode(u32 mode) + { + static const u32 ssetable[4] = + { + (0 << 13) | MASKS, + (3 << 13) | MASKS, + (2 << 13) | MASKS, + (1 << 13) | MASKS, + }; + u32 csr = ssetable[mode]; + _mm_setcsr(csr); + } + + void SaveSIMDState() + { + saved_sse_state = _mm_getcsr(); + } + void LoadSIMDState() + { + _mm_setcsr(saved_sse_state); + } + void LoadDefaultSIMDState() + { + _mm_setcsr(default_sse_state); + } +} diff --git a/Source/Core/Common/Src/Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp similarity index 98% rename from Source/Core/Common/Src/Thunk.cpp rename to Source/Core/Common/Src/x64Thunk.cpp index 1792df3e77..b9fd54f354 100644 --- a/Source/Core/Common/Src/Thunk.cpp +++ b/Source/Core/Common/Src/x64Thunk.cpp @@ -18,9 +18,8 @@ #include #include "Common.h" -#include "x64Emitter.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #define THUNK_ARENA_SIZE 1024*1024*1 diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 734d966781..b8976f42ea 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -5,12 +5,10 @@ set(SRCS Src/ActionReplay.cpp Src/Console.cpp Src/Core.cpp Src/CoreParameter.cpp - Src/CoreRerecording.cpp Src/CoreTiming.cpp Src/DSPEmulator.cpp Src/GeckoCodeConfig.cpp Src/GeckoCode.cpp - Src/MemTools.cpp Src/Movie.cpp Src/NetPlay.cpp Src/NetPlayClient.cpp @@ -71,7 +69,8 @@ set(SRCS Src/ActionReplay.cpp Src/HW/CPU.cpp Src/HW/DSP.cpp Src/HW/DSPHLE/UCodes/UCode_AX.cpp - Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp + Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp + Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp Src/HW/DSPHLE/UCodes/UCode_CARD.cpp Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp Src/HW/DSPHLE/UCodes/UCode_ROM.cpp @@ -115,6 +114,7 @@ set(SRCS Src/ActionReplay.cpp Src/HW/SI_Device.cpp Src/HW/SI_DeviceGBA.cpp Src/HW/SI_DeviceGCController.cpp + Src/HW/SI_DeviceGCSteeringWheel.cpp Src/HW/Sram.cpp Src/HW/StreamADPCM.cpp Src/HW/SystemTimers.cpp @@ -152,6 +152,7 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/PPCTables.cpp Src/PowerPC/Profiler.cpp Src/PowerPC/SignatureDB.cpp + Src/PowerPC/JitInterface.cpp Src/PowerPC/Interpreter/Interpreter_Branch.cpp Src/PowerPC/Interpreter/Interpreter.cpp Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -161,6 +162,15 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/Interpreter/Interpreter_Paired.cpp Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp Src/PowerPC/Interpreter/Interpreter_Tables.cpp + Src/PowerPC/JitCommon/JitAsmCommon.cpp + Src/PowerPC/JitCommon/JitBackpatch.cpp + Src/PowerPC/JitCommon/JitBase.cpp + Src/PowerPC/JitCommon/JitCache.cpp + Src/PowerPC/JitCommon/Jit_Util.cpp) + +if(NOT _M_GENERIC) + set(SRCS ${SRCS} + Src/x64MemTools.cpp Src/PowerPC/Jit64IL/IR.cpp Src/PowerPC/Jit64IL/IR_X86.cpp Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -185,14 +195,31 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp Src/PowerPC/Jit64/Jit_Paired.cpp Src/PowerPC/Jit64/JitRegCache.cpp - Src/PowerPC/Jit64/Jit_SystemRegisters.cpp - Src/PowerPC/JitCommon/JitAsmCommon.cpp - Src/PowerPC/JitCommon/JitBackpatch.cpp - Src/PowerPC/JitCommon/JitBase.cpp - Src/PowerPC/JitCommon/JitCache.cpp - Src/PowerPC/JitCommon/Jit_Util.cpp) + Src/PowerPC/Jit64/Jit_SystemRegisters.cpp) +endif() +if(_M_ARM) + set(SRCS ${SRCS} + Src/ArmMemTools.cpp + Src/PowerPC/JitArm32/Jit.cpp + Src/PowerPC/JitArm32/JitAsm.cpp + Src/PowerPC/JitArm32/JitArm_BackPatch.cpp + Src/PowerPC/JitArm32/JitArm_Tables.cpp + Src/PowerPC/JitArm32/JitArmCache.cpp + Src/PowerPC/JitArm32/JitRegCache.cpp + Src/PowerPC/JitArm32/JitFPRCache.cpp + Src/PowerPC/JitArm32/JitArm_Branch.cpp + Src/PowerPC/JitArm32/JitArm_Integer.cpp + Src/PowerPC/JitArm32/JitArm_LoadStore.cpp + Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp + Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp + Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp) +endif() -set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network) +set(LIBS bdisasm inputcommon videosoftware sfml-network) + +if(NOT USE_GLES) + set(LIBS ${LIBS} videoogl) +endif() if(WIN32) set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e03d40e43a..1dd547b2ea 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -207,7 +207,6 @@ - @@ -262,6 +261,7 @@ + @@ -301,6 +301,7 @@ + @@ -331,7 +332,7 @@ - + @@ -377,6 +378,7 @@ + @@ -385,7 +387,11 @@ - + + false + false + false + Create Create @@ -459,9 +465,11 @@ - + - + + + @@ -497,6 +505,7 @@ + @@ -555,6 +564,7 @@ + @@ -592,4 +602,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 020cf76ad0..b4f3f47be7 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -5,9 +5,8 @@ - - + @@ -197,6 +196,9 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -287,6 +289,9 @@ HW %28Flipper/Hollywood%29\SI - Serial Interface + + HW %28Flipper/Hollywood%29\SI - Serial Interface + HW %28Flipper/Hollywood%29\VI - Video Interface @@ -556,6 +561,9 @@ HW %28Flipper/Hollywood%29\GCMemcard + + PowerPC + @@ -727,18 +735,24 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -805,6 +819,9 @@ HW %28Flipper/Hollywood%29\SI - Serial Interface + + HW %28Flipper/Hollywood%29\SI - Serial Interface + HW %28Flipper/Hollywood%29\SI - Serial Interface @@ -1033,6 +1050,9 @@ HW %28Flipper/Hollywood%29\GCMemcard + + PowerPC + @@ -1174,4 +1194,4 @@ {3e9e6e83-c1bf-45f9-aeff-231f98f60d29} - \ No newline at end of file + diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 1ef6ca81bc..98857fae97 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -285,7 +285,6 @@ bool RunCode(const ARCode &arcode) // used for conditional codes int skip_count = 0; - u32 addr_last = 0; u32 val_last = 0; current_code = &arcode; @@ -394,7 +393,6 @@ bool RunCode(const ARCode &arcode) { LogInfo("ZCode: Memory Copy"); doMemoryCopy = true; - addr_last = addr; val_last = data; } else @@ -681,7 +679,8 @@ bool Subtype_MasterCodeAndWriteToCCXXXXXX(const ARAddr addr, const u32 data) // u8 mcode_type = (data & 0xFF0000) >> 16; // u8 mcode_count = (data & 0xFF00) >> 8; // u8 mcode_number = data & 0xFF; - PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)", current_code->name.c_str()); + PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" + "Master codes are not needed. Do not use master codes.", current_code->name.c_str()); return false; } diff --git a/Source/Core/Core/Src/ArmMemTools.cpp b/Source/Core/Core/Src/ArmMemTools.cpp new file mode 100644 index 0000000000..34a0c34b7d --- /dev/null +++ b/Source/Core/Core/Src/ArmMemTools.cpp @@ -0,0 +1,103 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + + +#include +#include +#ifdef ANDROID +#include +#else +#include // Look in here for the context definition. +#include +#endif + +#include "Common.h" +#include "MemTools.h" +#include "HW/Memmap.h" +#include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" +#include "PowerPC/JitCommon/JitBase.h" + +namespace EMM +{ +#ifdef ANDROID +typedef struct sigcontext mcontext_t; +typedef struct ucontext { + uint32_t uc_flags; + struct ucontext* uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + // Other fields are not used by Google Breakpad. Don't define them. +} ucontext_t; +#endif + +void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) +{ + if (signal != SIGSEGV) + { + // We are not interested in other signals - handle it as usual. + return; + } + ucontext_t *context = (ucontext_t *)raw_context; + int sicode = info->si_code; + if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR) + { + // Huh? Return. + return; + } + + + // Get all the information we can out of the context. + mcontext_t *ctx = &context->uc_mcontext; + + void *fault_memory_ptr = (void*)ctx->arm_r10; + u8 *fault_instruction_ptr = (u8 *)ctx->arm_pc; + + if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) { + // Let's not prevent debugging. + return; + } + + u64 bad_address = (u64)fault_memory_ptr; + u64 memspace_bottom = (u64)Memory::base; + if (bad_address < memspace_bottom) { + PanicAlertT("Exception handler - access below memory space. %08llx%08llx", + bad_address >> 32, bad_address); + } + + u32 em_address = (u32)(bad_address - memspace_bottom); + + int access_type = 0; + + CONTEXT fake_ctx; + fake_ctx.reg_pc = ctx->arm_pc; + const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, access_type, em_address, &fake_ctx); + if (new_rip) { + ctx->arm_pc = fake_ctx.reg_pc; + } +} + +void InstallExceptionHandler() +{ + struct sigaction sa; + sa.sa_handler = 0; + sa.sa_sigaction = &sigsegv_handler; + sa.sa_flags = SA_SIGINFO; + sigemptyset(&sa.sa_mask); + sigaction(SIGSEGV, &sa, NULL); +} +} // namespace diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index be82d217dc..aaaa4dd39a 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -257,6 +257,19 @@ bool CBoot::BootUp() EmulatedBS2(_StartupPara.bWii); } + // Scan for common HLE functions + if (_StartupPara.bSkipIdle && !_StartupPara.bEnableDebugging) + { + PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); + SignatureDB db; + if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) + { + db.Apply(&g_symbolDB); + HLE::PatchFunctions(); + db.Clear(); + } + } + /* Try to load the symbol map if there is one, and then scan it for and eventually replace code */ if (LoadMapFromFilename(_StartupPara.m_strFilename, gameID)) diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index 788b8c317c..5011543448 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -187,8 +187,10 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode) switch((DiscIO::IVolume::ECountry)_CountryCode) { case DiscIO::IVolume::COUNTRY_KOREA: + region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_KOR_SETTING; + break; case DiscIO::IVolume::COUNTRY_TAIWAN: - // TODO: Determine if Korea / Taiwan have their own specific settings. + // TODO: Determine if Taiwan has their own specific settings. case DiscIO::IVolume::COUNTRY_JAPAN: region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_JAP_SETTING; break; @@ -373,7 +375,7 @@ bool CBoot::EmulatedBS2_Wii() u32 iLength = Memory::ReadUnchecked_U32(0x81300008); u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c) << 2; - INFO_LOG(BOOT, "DVDRead: offset: %08x memOffse: %08x length: %i", iDVDOffset, iRamAddress, iLength); + INFO_LOG(BOOT, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength); } while(PowerPC::ppcState.gpr[3] != 0x00); diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 640c2eecdc..1e9e612fe0 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -44,7 +44,8 @@ #include "SysConf.h" #include "Core.h" #include "Host.h" - +#include "VideoBackendBase.h" +#include "Movie.h" namespace BootManager { @@ -53,9 +54,10 @@ namespace BootManager // Apply fire liberally struct ConfigCache { - bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT, - bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker; - int iTLBHack; + bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, + bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; + int iTLBHack, iCPUCore; + std::string strBackend; }; static ConfigCache config_cache; @@ -87,29 +89,48 @@ bool BootCore(const std::string& _rFilename) config_cache.valid = true; config_cache.bCPUThread = StartUp.bCPUThread; config_cache.bSkipIdle = StartUp.bSkipIdle; + config_cache.iCPUCore = StartUp.iCPUCore; config_cache.bEnableFPRF = StartUp.bEnableFPRF; config_cache.bMMU = StartUp.bMMU; - config_cache.bMMUBAT = StartUp.bMMUBAT; + config_cache.bDCBZOFF = StartUp.bDCBZOFF; config_cache.iTLBHack = StartUp.iTLBHack; config_cache.bVBeam = StartUp.bVBeam; config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; - config_cache.bDisableWiimoteSpeaker = StartUp.bDisableWiimoteSpeaker; + config_cache.strBackend = StartUp.m_strVideoBackend; + config_cache.bHLE_BS2 = StartUp.bHLE_BS2; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); game_ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle); game_ini.Get("Core", "EnableFPRF", &StartUp.bEnableFPRF, StartUp.bEnableFPRF); game_ini.Get("Core", "MMU", &StartUp.bMMU, StartUp.bMMU); - game_ini.Get("Core", "BAT", &StartUp.bMMUBAT, StartUp.bMMUBAT); game_ini.Get("Core", "TLBHack", &StartUp.iTLBHack, StartUp.iTLBHack); + game_ini.Get("Core", "DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); game_ini.Get("Core", "VBeam", &StartUp.bVBeam, StartUp.bVBeam); game_ini.Get("Core", "FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); - game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); + game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); + game_ini.Get("Core", "CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); + game_ini.Get("Core", "HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); + VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); + if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) + { + StartUp.bCPUThread = Movie::IsDualCore(); + StartUp.bSkipIdle = Movie::IsSkipIdle(); + StartUp.bDSPHLE = Movie::IsDSPHLE(); + StartUp.bProgressive = Movie::IsProgressive(); + StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); + StartUp.iCPUCore = Movie::GetCPUMode(); + if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii) + { + if (File::Exists("Movie.raw")) + File::Delete("Movie.raw"); + } + } // Wii settings if (StartUp.bWii) { @@ -135,20 +156,24 @@ void Stop() SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; + StartUp.m_strUniqueID = "00000000"; if (config_cache.valid) { config_cache.valid = false; StartUp.bCPUThread = config_cache.bCPUThread; StartUp.bSkipIdle = config_cache.bSkipIdle; + StartUp.iCPUCore = config_cache.iCPUCore; StartUp.bEnableFPRF = config_cache.bEnableFPRF; StartUp.bMMU = config_cache.bMMU; - StartUp.bMMUBAT = config_cache.bMMUBAT; + StartUp.bDCBZOFF = config_cache.bDCBZOFF; StartUp.iTLBHack = config_cache.iTLBHack; StartUp.bVBeam = config_cache.bVBeam; StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; - StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; + StartUp.m_strVideoBackend = config_cache.strBackend; + VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); + StartUp.bHLE_BS2 = config_cache.bHLE_BS2; } } diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 0c4fa04566..377aa16a27 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -100,9 +100,6 @@ SConfig::SConfig() { // Make sure we have log manager LoadSettings(); - //Make sure we load any extra settings - LoadSettingsWii(); - } void SConfig::Init() @@ -131,6 +128,7 @@ void SConfig::SaveSettings() // General ini.Set("General", "LastFilename", m_LastFilename); + ini.Set("General", "ShowLag", m_ShowLag); // ISO folders // clear removed folders @@ -155,13 +153,14 @@ void SConfig::SaveSettings() ini.Set("General", "RecursiveGCMPaths", m_RecursiveISOFolder); ini.Set("General", "NANDRoot", m_NANDPath); + ini.Set("General", "WirelessMac", m_WirelessMac); // Interface ini.Set("Interface", "ConfirmStop", m_LocalCoreStartupParameter.bConfirmStop); ini.Set("Interface", "UsePanicHandlers", m_LocalCoreStartupParameter.bUsePanicHandlers); + ini.Set("Interface", "OnScreenDisplayMessages", m_LocalCoreStartupParameter.bOnScreenDisplayMessages); ini.Set("Interface", "HideCursor", m_LocalCoreStartupParameter.bHideCursor); ini.Set("Interface", "AutoHideCursor", m_LocalCoreStartupParameter.bAutoHideCursor); - ini.Set("Interface", "Theme", m_LocalCoreStartupParameter.iTheme); ini.Set("Interface", "MainWindowPosX", (m_LocalCoreStartupParameter.iPosX == -32000) ? 0 : m_LocalCoreStartupParameter.iPosX); // TODO - HAX ini.Set("Interface", "MainWindowPosY", (m_LocalCoreStartupParameter.iPosY == -32000) ? 0 : m_LocalCoreStartupParameter.iPosY); // TODO - HAX ini.Set("Interface", "MainWindowWidth", m_LocalCoreStartupParameter.iWidth); @@ -172,6 +171,7 @@ void SConfig::SaveSettings() ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); ini.Set("Interface", "ShowConsole", m_InterfaceConsole); + ini.Set("Interface", "ThemeName", m_LocalCoreStartupParameter.theme_name); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) @@ -208,6 +208,8 @@ void SConfig::SaveSettings() ini.Set("GameList", "ListKorea", m_ListKorea); ini.Set("GameList", "ListTaiwan", m_ListTaiwan); ini.Set("GameList", "ListUnknown", m_ListUnknown); + ini.Set("GameList", "ListSort", m_ListSort); + ini.Set("GameList", "ListSortSecondary", m_ListSort2); // Core ini.Set("Core", "HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2); @@ -216,12 +218,13 @@ void SConfig::SaveSettings() ini.Set("Core", "DSPThread", m_LocalCoreStartupParameter.bDSPThread); ini.Set("Core", "DSPHLE", m_LocalCoreStartupParameter.bDSPHLE); ini.Set("Core", "SkipIdle", m_LocalCoreStartupParameter.bSkipIdle); - ini.Set("Core", "LockThreads", m_LocalCoreStartupParameter.bLockThreads); ini.Set("Core", "DefaultGCM", m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Set("Core", "DVDRoot", m_LocalCoreStartupParameter.m_strDVDRoot); ini.Set("Core", "Apploader", m_LocalCoreStartupParameter.m_strApploader); ini.Set("Core", "EnableCheats", m_LocalCoreStartupParameter.bEnableCheats); ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); + ini.Set("Core", "DPL2Decoder", m_LocalCoreStartupParameter.bDPL2Decoder); + ini.Set("Core", "Latency", m_LocalCoreStartupParameter.iLatency); ini.Set("Core", "MemcardA", m_strMemoryCardA); ini.Set("Core", "MemcardB", m_strMemoryCardB); ini.Set("Core", "SlotA", m_EXIDevice[0]); @@ -238,6 +241,8 @@ void SConfig::SaveSettings() ini.Set("Core", "WiiSDCard", m_WiiSDCard); ini.Set("Core", "WiiKeyboard", m_WiiKeyboard); ini.Set("Core", "WiimoteReconnectOnLoad", m_WiimoteReconnectOnLoad); + ini.Set("Core", "WiimoteContinuousScanning", m_WiimoteContinuousScanning); + ini.Set("Core", "WiimoteEnableSpeaker", m_WiimoteEnableSpeaker); ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); ini.Set("Core", "FrameLimit", m_Framelimit); @@ -246,6 +251,16 @@ void SConfig::SaveSettings() // GFX Backend ini.Set("Core", "GFXBackend", m_LocalCoreStartupParameter.m_strVideoBackend); + // Movie + ini.Set("Movie", "PauseMovie", m_PauseMovie); + ini.Set("Movie", "Author", m_strMovieAuthor); + + // DSP + ini.Set("DSP", "EnableJIT", m_EnableJIT); + ini.Set("DSP", "DumpAudio", m_DumpAudio); + ini.Set("DSP", "Backend", sBackend); + ini.Set("DSP", "Volume", m_Volume); + ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); m_SYSCONF->Save(); } @@ -260,6 +275,7 @@ void SConfig::LoadSettings() // General { ini.Get("General", "LastFilename", &m_LastFilename); + ini.Get("General", "ShowLag", &m_ShowLag, false); m_ISOFolder.clear(); int numGCMPaths; @@ -282,15 +298,16 @@ void SConfig::LoadSettings() m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, m_NANDPath); DiscIO::cUIDsys::AccessInstance().UpdateLocation(); DiscIO::CSharedContent::AccessInstance().UpdateLocation(); + ini.Get("General", "WirelessMac", &m_WirelessMac); } { // Interface ini.Get("Interface", "ConfirmStop", &m_LocalCoreStartupParameter.bConfirmStop, false); ini.Get("Interface", "UsePanicHandlers", &m_LocalCoreStartupParameter.bUsePanicHandlers, true); + ini.Get("Interface", "OnScreenDisplayMessages", &m_LocalCoreStartupParameter.bOnScreenDisplayMessages, true); ini.Get("Interface", "HideCursor", &m_LocalCoreStartupParameter.bHideCursor, false); ini.Get("Interface", "AutoHideCursor", &m_LocalCoreStartupParameter.bAutoHideCursor, false); - ini.Get("Interface", "Theme", &m_LocalCoreStartupParameter.iTheme, 0); ini.Get("Interface", "MainWindowPosX", &m_LocalCoreStartupParameter.iPosX, 100); ini.Get("Interface", "MainWindowPosY", &m_LocalCoreStartupParameter.iPosY, 100); ini.Get("Interface", "MainWindowWidth", &m_LocalCoreStartupParameter.iWidth, 800); @@ -301,6 +318,7 @@ void SConfig::LoadSettings() ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false); + ini.Get("Interface", "ThemeName", &m_LocalCoreStartupParameter.theme_name, "Boomy"); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) @@ -334,25 +352,32 @@ void SConfig::LoadSettings() ini.Get("GameList", "ListPal", &m_ListPal, true); ini.Get("GameList", "ListUsa", &m_ListUsa, true); - ini.Get("GameList", "ListFrance", &m_ListFrance, true); - ini.Get("GameList", "ListItaly", &m_ListItaly, true); - ini.Get("GameList", "ListKorea", &m_ListKorea, true); - ini.Get("GameList", "ListTaiwan", &m_ListTaiwan, true); - ini.Get("GameList", "ListUnknown", &m_ListUnknown, true); + ini.Get("GameList", "ListFrance", &m_ListFrance, true); + ini.Get("GameList", "ListItaly", &m_ListItaly, true); + ini.Get("GameList", "ListKorea", &m_ListKorea, true); + ini.Get("GameList", "ListTaiwan", &m_ListTaiwan, true); + ini.Get("GameList", "ListUnknown", &m_ListUnknown, true); + ini.Get("GameList", "ListSort", &m_ListSort, 3); + ini.Get("GameList", "ListSortSecondary",&m_ListSort2, 0); // Core ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); +#ifdef _M_ARM + ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 3); +#else ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 1); +#endif ini.Get("Core", "DSPThread", &m_LocalCoreStartupParameter.bDSPThread, false); ini.Get("Core", "DSPHLE", &m_LocalCoreStartupParameter.bDSPHLE, true); ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true); ini.Get("Core", "SkipIdle", &m_LocalCoreStartupParameter.bSkipIdle, true); - ini.Get("Core", "LockThreads", &m_LocalCoreStartupParameter.bLockThreads, false); ini.Get("Core", "DefaultGCM", &m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Get("Core", "DVDRoot", &m_LocalCoreStartupParameter.m_strDVDRoot); ini.Get("Core", "Apploader", &m_LocalCoreStartupParameter.m_strApploader); ini.Get("Core", "EnableCheats", &m_LocalCoreStartupParameter.bEnableCheats, false); ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); + ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, false); + ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 14); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); @@ -371,35 +396,40 @@ void SConfig::LoadSettings() ini.Get("Core", "WiiSDCard", &m_WiiSDCard, false); ini.Get("Core", "WiiKeyboard", &m_WiiKeyboard, false); - ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); + ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); + ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning, false); + ini.Get("Core", "WiimoteEnableSpeaker", &m_WiimoteEnableSpeaker, true); ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "MMU", &m_LocalCoreStartupParameter.bMMU, false); ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0); ini.Get("Core", "VBeam", &m_LocalCoreStartupParameter.bVBeam, false); ini.Get("Core", "FastDiscSpeed", &m_LocalCoreStartupParameter.bFastDiscSpeed, false); - ini.Get("Core", "BAT", &m_LocalCoreStartupParameter.bMMUBAT, false); + ini.Get("Core", "DCBZ", &m_LocalCoreStartupParameter.bDCBZOFF, false); ini.Get("Core", "FrameLimit", &m_Framelimit, 1); // auto frame limit by default ini.Get("Core", "UseFPS", &b_UseFPS, false); // use vps as default // GFX Backend ini.Get("Core", "GFXBackend", &m_LocalCoreStartupParameter.m_strVideoBackend, ""); + + // Movie + ini.Get("General", "PauseMovie", &m_PauseMovie, false); + ini.Get("Movie", "Author", &m_strMovieAuthor, ""); + + // DSP + ini.Get("DSP", "EnableJIT", &m_EnableJIT, true); + ini.Get("DSP", "DumpAudio", &m_DumpAudio, false); + #if defined __linux__ && HAVE_ALSA + ini.Get("DSP", "Backend", &sBackend, BACKEND_ALSA); + #elif defined __APPLE__ + ini.Get("DSP", "Backend", &sBackend, BACKEND_COREAUDIO); + #elif defined _WIN32 + ini.Get("DSP", "Backend", &sBackend, BACKEND_DIRECTSOUND); + #else + ini.Get("DSP", "Backend", &sBackend, BACKEND_NULLSOUND); + #endif + ini.Get("DSP", "Volume", &m_Volume, 100); } m_SYSCONF = new SysConf(); } -void SConfig::LoadSettingsWii() -{ - IniFile ini; - //Wiimote configs - ini.Load((File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini")); - for (int i = 0; i < 4; i++) - { - char SectionName[32]; - sprintf(SectionName, "Wiimote%i", i + 1); - ini.Get(SectionName, "AutoReconnectRealWiimote", &m_WiiAutoReconnect[i], false); - } - ini.Load((File::GetUserPath(D_CONFIG_IDX) + "wiimote.ini")); - ini.Get("Real", "Unpair", &m_WiiAutoUnpair, false); - -} diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 0c8f3f1af1..4a36b37335 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -26,14 +26,24 @@ #include "HW/SI_Device.h" #include "SysConf.h" +// DSP Backend Types +#define BACKEND_NULLSOUND "No audio output" +#define BACKEND_ALSA "ALSA" +#define BACKEND_AOSOUND "AOSound" +#define BACKEND_COREAUDIO "CoreAudio" +#define BACKEND_DIRECTSOUND "DSound" +#define BACKEND_OPENAL "OpenAL" +#define BACKEND_PULSEAUDIO "Pulse" +#define BACKEND_XAUDIO2 "XAudio2" +#define BACKEND_OPENSLES "OpenSLES" struct SConfig : NonCopyable { // Wii Devices bool m_WiiSDCard; bool m_WiiKeyboard; - bool m_WiiAutoReconnect[4]; - bool m_WiiAutoUnpair; bool m_WiimoteReconnectOnLoad; + bool m_WiimoteContinuousScanning; + bool m_WiimoteEnableSpeaker; // name of the last used filename std::string m_LastFilename; @@ -75,6 +85,19 @@ struct SConfig : NonCopyable bool m_ListKorea; bool m_ListTaiwan; bool m_ListUnknown; + int m_ListSort; + int m_ListSort2; + + std::string m_WirelessMac; + bool m_PauseMovie; + bool m_ShowLag; + std::string m_strMovieAuthor; + + // DSP settings + bool m_EnableJIT; + bool m_DumpAudio; + int m_Volume; + std::string sBackend; SysConf* m_SYSCONF; @@ -84,9 +107,6 @@ struct SConfig : NonCopyable // load settings void LoadSettings(); - //Special load settings - void LoadSettingsWii(); - // Return the permanent and somewhat globally used instance of this struct static SConfig& GetInstance() {return(*m_Instance);} diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index ec3d0e8f70..f7337def45 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -18,9 +18,9 @@ #ifdef _WIN32 #include +#include "EmuWindow.h" #endif -#include "Setup.h" // Common #include "Atomic.h" #include "Thread.h" #include "Timer.h" @@ -54,16 +54,12 @@ #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "PowerPC/PowerPC.h" -#include "PowerPC/JitCommon/JitBase.h" #include "DSPEmulator.h" #include "ConfigManager.h" #include "VideoBackendBase.h" #include "AudioCommon.h" #include "OnScreenDisplay.h" -#ifdef _WIN32 -#include "EmuWindow.h" -#endif #include "VolumeHandler.h" #include "FileMonitor.h" @@ -143,7 +139,7 @@ void DisplayMessage(const char *message, int time_in_ms) if (_CoreParameter.bRenderToMain && SConfig::GetInstance().m_InterfaceStatusbar) { - Host_UpdateStatusBar(message); + Host_UpdateStatusBar(message); } else Host_UpdateTitle(message); @@ -192,7 +188,7 @@ bool IsGPUThread() return IsCPUThread(); } } - + // This is called from the GUI thread. See the booting call schedule in // BootManager.cpp bool Init() @@ -293,7 +289,7 @@ void Stop() // - Hammertime! SConfig::GetInstance().m_SYSCONF->Reload(); INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----"); - Movie::g_currentInputCount = 0; + Movie::Shutdown(); g_bStopping = false; } @@ -313,10 +309,7 @@ void CpuThread() g_video_backend->Video_Prepare(); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core - - #if defined(_WIN32) && defined(_M_X64) + #if defined(_M_X64) || _M_ARM EMM::InstallExceptionHandler(); // Let's run under memory watch #endif @@ -347,9 +340,6 @@ void FifoPlayerThread() Common::SetCurrentThreadName("FIFO-GPU thread"); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core - g_bStarted = true; // Enter CPU run loop. When we leave it - we are done. @@ -374,14 +364,6 @@ void EmuThread() Common::SetCurrentThreadName("Emuthread - Starting"); - if (_CoreParameter.bLockThreads) - { - if (cpu_info.num_cores > 3) // Force to third, non-HT core - Common::SetCurrentThreadAffinity(4); - else // Force to second core - Common::SetCurrentThreadAffinity(2); - } - DisplayMessage(cpu_info.brand_string, 8000); DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); @@ -631,70 +613,7 @@ void VideoThrottle() u32 ElapseTime = (u32)Timer.GetTimeDifference(); if ((ElapseTime >= 1000 && DrawnVideo > 0) || g_requestRefreshInfo) { - g_requestRefreshInfo = false; - SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; - - if (ElapseTime == 0) - ElapseTime = 1; - - u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; - u32 VPS = DrawnVideo * 1000 / ElapseTime; - u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime); - - // Settings are shown the same for both extended and summary info - std::string SSettings = StringFromFormat("%s %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC"); - - // Use extended or summary information. The summary information does not print the ticks data, - // that's more of a debugging interest, it can always be optional of course if someone is interested. - //#define EXTENDED_INFO - #ifdef EXTENDED_INFO - u64 newTicks = CoreTiming::GetTicks(); - u64 newIdleTicks = CoreTiming::GetIdleTicks(); - - u64 diff = (newTicks - ticks) / 1000000; - u64 idleDiff = (newIdleTicks - idleTicks) / 1000000; - - ticks = newTicks; - idleTicks = newIdleTicks; - - float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100; - - std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); - SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)", - _CoreParameter.bSkipIdle ? "~" : "", - (int)(diff), - (int)(diff - idleDiff), - (int)(idleDiff), - SystemTimers::GetTicksPerSecond() / 1000000, - _CoreParameter.bSkipIdle ? "~" : "", - TicksPercentage); - - #else // Summary information - std::string SFPS; - if (Movie::IsPlayingInput()) - SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed); - else if (Movie::IsRecordingInput()) - SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed); - else - SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); - #endif - - // This is our final "frame counter" string - std::string SMessage = StringFromFormat("%s | %s", - SSettings.c_str(), SFPS.c_str()); - std::string TMessage = StringFromFormat("%s | ", scm_rev_str) + - SMessage; - - // Show message - g_video_backend->UpdateFPSDisplay(SMessage.c_str()); - - if (_CoreParameter.bRenderToMain && - SConfig::GetInstance().m_InterfaceStatusbar) { - Host_UpdateStatusBar(SMessage.c_str()); - Host_UpdateTitle(scm_rev_str); - } else - Host_UpdateTitle(TMessage.c_str()); - + UpdateTitle(); // Reset counter Timer.Update(); @@ -741,4 +660,79 @@ const char *Callback_ISOName() return ""; } +void UpdateTitle() +{ + u32 ElapseTime = (u32)Timer.GetTimeDifference(); + g_requestRefreshInfo = false; + SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; + + if (ElapseTime == 0) + ElapseTime = 1; + + u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; + u32 VPS = DrawnVideo * 1000 / ElapseTime; + u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime); + + // Settings are shown the same for both extended and summary info + std::string SSettings = StringFromFormat("%s %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC"); + + // Use extended or summary information. The summary information does not print the ticks data, + // that's more of a debugging interest, it can always be optional of course if someone is interested. + //#define EXTENDED_INFO + #ifdef EXTENDED_INFO + u64 newTicks = CoreTiming::GetTicks(); + u64 newIdleTicks = CoreTiming::GetIdleTicks(); + + u64 diff = (newTicks - ticks) / 1000000; + u64 idleDiff = (newIdleTicks - idleTicks) / 1000000; + + ticks = newTicks; + idleTicks = newIdleTicks; + + float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100; + + std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); + SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)", + _CoreParameter.bSkipIdle ? "~" : "", + (int)(diff), + (int)(diff - idleDiff), + (int)(idleDiff), + SystemTimers::GetTicksPerSecond() / 1000000, + _CoreParameter.bSkipIdle ? "~" : "", + TicksPercentage); + + #else // Summary information + std::string SFPS; + if (Movie::IsPlayingInput()) + SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed); + else if (Movie::IsRecordingInput()) + SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed); + else + SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); + #endif + + // This is our final "frame counter" string + std::string SMessage = StringFromFormat("%s | %s", + SSettings.c_str(), SFPS.c_str()); + std::string TMessage = StringFromFormat("%s | ", scm_rev_str) + + SMessage; + + // Show message + g_video_backend->UpdateFPSDisplay(SMessage.c_str()); + + // Update the audio timestretcher with the current speed + if (soundStream) + { + CMixer* pMixer = soundStream->GetMixer(); + pMixer->UpdateSpeed((float)Speed / 100); + } + + if (_CoreParameter.bRenderToMain && + SConfig::GetInstance().m_InterfaceStatusbar) { + Host_UpdateStatusBar(SMessage.c_str()); + Host_UpdateTitle(scm_rev_str); + } else + Host_UpdateTitle(TMessage.c_str()); + } + } // Core diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h index 448bd55bb6..ac55419db3 100644 --- a/Source/Core/Core/Src/Core.h +++ b/Source/Core/Core/Src/Core.h @@ -89,27 +89,14 @@ bool ShouldSkipFrame(int skipped); void VideoThrottle(); void RequestRefreshInfo(); +void UpdateTitle(); + // waits until all systems are paused and fully idle, and acquires a lock on that state. // or, if doLock is false, releases a lock on that state and optionally unpauses. // calls must be balanced (once with doLock true, then once with doLock false) but may be recursive. // the return value of the first call should be passed in as the second argument of the second call. bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true); -#ifdef RERECORDING - -void FrameUpdate(); -void FrameAdvance(); -void FrameStepOnOff(); -void WriteStatus(); -void RerecordingStart(); -void RerecordingStop(); -void WindBack(int Counter); - -extern int g_FrameCounter,g_InputCounter; -extern bool g_FrameStep; - -#endif - } // namespace #endif diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index ba72d47ffb..a7a44be5ea 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -45,21 +45,20 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableFPRF(false), bCPUThread(true), bDSPThread(false), bDSPHLE(true), bSkipIdle(true), bNTSC(false), bForceNTSCJ(false), - bHLE_BS2(true), bLockThreads(false), - bEnableCheats(false), + bHLE_BS2(true), bEnableCheats(false), bMergeBlocks(false), + bDPL2Decoder(false), iLatency(14), bRunCompareServer(false), bRunCompareClient(false), - bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), + bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), - SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), - bConfirmStop(false), bHideCursor(false), - bAutoHideCursor(false), bUsePanicHandlers(true), + SelectedLanguage(0), bWii(false), + bConfirmStop(false), bHideCursor(false), + bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true), iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640), iRenderWindowHeight(480), bRenderWindowAutoSize(false), bKeepWindowOnTop(false), bFullscreen(false), bRenderToMain(false), bProgressive(false), bDisableScreenSaver(false), - iTheme(0), iPosX(100), iPosY(100), iWidth(800), iHeight(600) { LoadDefaults(); @@ -74,16 +73,17 @@ void SCoreStartupParameter::LoadDefaults() bRunCompareServer = false; bDSPHLE = true; bDSPThread = true; - bLockThreads = true; bEnableFPRF = false; bMMU = false; - bMMUBAT = false; + bDCBZOFF = false; iTLBHack = 0; bVBeam = false; bFastDiscSpeed = false; bMergeBlocks = false; SelectedLanguage = 0; bWii = false; + bDPL2Decoder = false; + iLatency = 14; iPosX = 100; iPosY = 100; @@ -99,8 +99,6 @@ void SCoreStartupParameter::LoadDefaults() bJITPairedOff = false; bJITSystemRegistersOff = false; - bDisableWiimoteSpeaker = false; - m_strName = "NONE"; m_strUniqueID = "00000000"; } @@ -348,7 +346,11 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri { // Use default memcard path if there is no user defined name std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB; - memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; + #ifdef _WIN32 + memcardPath = "." + File::GetUserPath(D_GCUSER_IDX).substr(File::GetExeDirectory().size()) + defaultFilename + ext; + #else + memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; + #endif } else { diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 2eb261b589..55d20b7b1b 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -103,15 +103,17 @@ struct SCoreStartupParameter bool bNTSC; bool bForceNTSCJ; bool bHLE_BS2; - bool bLockThreads; bool bEnableCheats; bool bMergeBlocks; + bool bDPL2Decoder; + int iLatency; + bool bRunCompareServer; bool bRunCompareClient; bool bMMU; - bool bMMUBAT; + bool bDCBZOFF; int iTLBHack; bool bVBeam; bool bFastDiscSpeed; @@ -119,10 +121,10 @@ struct SCoreStartupParameter int SelectedLanguage; bool bWii; - bool bDisableWiimoteSpeaker; // Interface settings - bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers; + bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; + std::string theme_name; // Hotkeys int iHotkey[NUM_HOTKEYS]; @@ -136,9 +138,8 @@ struct SCoreStartupParameter bool bFullscreen, bRenderToMain; bool bProgressive, bDisableScreenSaver; - int iTheme; int iPosX, iPosY, iWidth, iHeight; - + enum EBootBS2 { BOOT_DEFAULT, diff --git a/Source/Core/Core/Src/CoreRerecording.cpp b/Source/Core/Core/Src/CoreRerecording.cpp deleted file mode 100644 index 3064ed37ad..0000000000 --- a/Source/Core/Core/Src/CoreRerecording.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - - -#include "Setup.h" -#ifndef RERECORDING -bool rerecording = false; -#else - -// Include -// -------------- -#ifdef _WIN32 - #include -#endif - -#include "Thread.h" // Common - -#include "Timer.h" -#include "Common.h" - -#include "Console.h" -#include "Core.h" -#include "CPUDetect.h" -#include "CoreTiming.h" -#include "Boot/Boot.h" -#include "PatchEngine.h" - -#include "HW/Memmap.h" -#include "HW/ProcessorInterface.h" -#include "HW/GPFifo.h" -#include "HW/CPU.h" -#include "HW/HW.h" -#include "HW/DSP.h" -#include "HW/GPFifo.h" -#include "HW/AudioInterface.h" -#include "HW/VideoInterface.h" -#include "HW/CommandProcessor.h" -#include "HW/PixelEngine.h" -#include "HW/SystemTimers.h" - -#include "PowerPC/PowerPC.h" - -#include "ConfigManager.h" - -#include "MemTools.h" -#include "Host.h" -#include "LogManager.h" - - - - - -// File description: Rerecording Functions -/* --------------- - -How the timer works: We measure the time between drawn frames, not when the game is paused. So time -should be a fairly comparable measure of the time it took to play the game. However the time it takes -to draw a frame will be lower on a fast computer. Therefore we could perhaps measure time as an -internal game time that is adjusted by the average time it takes to draw a frame. Also if it only takes -ten or twenty milliseconds to draw a frame I'm not certain about how accurate the mmsystem timers are for -such short periods. - -//////////////////////////////////////*/ - - - -namespace Core -{ - - - -// Declarations and definitions -// --------------- -int g_FrameCounter = 0; -bool g_FrameStep = false; -Common::Timer ReRecTimer; - - - - -// Control Run, Pause, Stop and the Timer. -// --------------- - -// Subtract the paused time when we run again -void Run() -{ - ReRecTimer.AddTimeDifference(); -} -// Update the time -void Pause() -{ - ReRecTimer.Update(); -} - -// Start the timer when a game is booted -void RerecordingStart() -{ - g_FrameCounter = 0; - ReRecTimer.Start(); - - // Logging - //DEBUG_LOG(CONSOLE, "RerecordingStart: %i\n", g_FrameCounter); -} - -// Reset the frame counter -void RerecordingStop() -{ - // Write the final time and Stop the timer - ReRecTimer.Stop(); - - // Update status bar - WriteStatus(); -} - -/* Wind back the frame counter when a save state is loaded. Currently we don't know what that means in - time so we just guess that the time is proportional the the number of frames - - Todo: There are many assumptions here: We probably want to replace the time here by the actual time - that we save together with the save state or the input recording for example. And have it adjusted - for full speed playback (whether it's 30 fps or 60 fps or some other speed that the game is natively - capped at). Also the input interrupts do not occur as often as the frame renderings, they occur more - often. So we may want to move the input recording to fram updates, or perhaps sync the input interrupts - to frame updates. - */ -void WindBack(int Counter) -{ - /* Counter should be smaller than g_FrameCounter, however it currently updates faster than the - frames so currently it may not be the same. Therefore I use the abs() function. */ - int AbsoluteFrameDifference = abs(g_FrameCounter - Counter); - float FractionalFrameDifference = (float) AbsoluteFrameDifference / (float) g_FrameCounter; - - // Update the frame counter - g_FrameCounter = Counter; - - // Approximate a time to wind back the clock to - // Get the current time - u64 CurrentTimeMs = ReRecTimer.GetTimeElapsed(); - // Save the current time in seconds in a new double - double CurrentTimeSeconds = (double) (CurrentTimeMs / 1000); - // Reduce it by the same proportion as the counter was wound back - CurrentTimeSeconds = CurrentTimeSeconds * FractionalFrameDifference; - // Update the clock - ReRecTimer.WindBackStartingTime((u64)CurrentTimeSeconds * 1000); - - // Logging - DEBUG_LOG(CONSOLE, "WindBack: %i %u\n", Counter, (u64)CurrentTimeSeconds); -} - - - - -// Frame advance -// --------------- -void FrameAdvance() -{ - // Update status bar - WriteStatus(); - - // If a game is not started, return - if (Core::GetState() == Core::CORE_UNINITIALIZED) return; - - // Play to the next frame - if (g_FrameStep) - { - Run(); - Core::SetState(Core::CORE_RUN); - } -} - -// Turn on frame stepping -void FrameStepOnOff() -{ - /* Turn frame step on or off. If a game is running and we turn this on it means that the game - will pause after the next frame update */ - g_FrameStep = !g_FrameStep; - - // Update status bar - WriteStatus(); - - // If a game is not started, return - if(Core::GetState() == Core::CORE_UNINITIALIZED) return; - - // Run the emulation if we turned off framestepping - if (!g_FrameStep) - { - Run(); - Core::SetState(Core::CORE_RUN); - } -} - - - - -// General functions -// --------------- - -// Write to the status bar -void WriteStatus() -{ - std::string TmpStr = "Time: " + ReRecTimer.GetTimeElapsedFormatted(); - TmpStr += StringFromFormat(" Frame: %s", ThousandSeparate(g_FrameCounter).c_str()); - // The FPS is the total average since the game was booted - TmpStr += StringFromFormat(" FPS: %i", (g_FrameCounter * 1000) / ReRecTimer.GetTimeElapsed()); - TmpStr += StringFromFormat(" FrameStep: %s", g_FrameStep ? "On" : "Off"); - Host_UpdateStatusBar(TmpStr.c_str(), 1); -} - - -// When a new frame is drawn -void FrameUpdate() -{ - // Write to the status bar - WriteStatus(); - /* I don't think the frequent update has any material speed inpact at all, but should it - have you can controls the update speed by changing the "% 10" in this line */ - //if (g_FrameCounter % 10 == 0) WriteStatus(); - - // Pause if frame stepping is on - if(g_FrameStep) - { - Pause(); - Core::SetState(Core::CORE_PAUSE); - } - - // Count one frame - g_FrameCounter++; -} - - - -} // Core - - -#endif // RERECORDING diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index bccadf30cc..525f7165f2 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -119,7 +119,7 @@ int RegisterEvent(const char *name, TimedCallback callback) // check for existing type with same name. // we want event type names to remain unique so that we can use them for serialization. - for (int i = 0; i < event_types.size(); ++i) + for (unsigned int i = 0; i < event_types.size(); ++i) { if (!strcmp(name, event_types[i].name)) { @@ -188,7 +188,7 @@ void EventDoState(PointerWrap &p, BaseEvent* ev) if (p.GetMode() == PointerWrap::MODE_READ) { bool foundMatch = false; - for (int i = 0; i < event_types.size(); ++i) + for (unsigned int i = 0; i < event_types.size(); ++i) { if (!strcmp(name.c_str(), event_types[i].name)) { diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index b1452c249c..dcb79b7ac5 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -168,7 +168,8 @@ u16 dsp_read_accelerator() if (Address >= EndAddress) { // Set address back to start address. - Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; + if ((Address & ~0x1f) == (EndAddress & ~0x1f)) + Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; DSPCore_SetException(EXP_ACCOV); } diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp index ca9c01d5dc..7f2cc8e2e6 100644 --- a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp @@ -104,10 +104,10 @@ bool Compare(const std::vector &code1, const std::vector &code2) return code1.size() == code2.size() && code1.size() == count_equal; } -void GenRandomCode(int size, std::vector &code) +void GenRandomCode(u32 size, std::vector &code) { code.resize(size); - for (int i = 0; i < size; i++) + for (u32 i = 0; i < size; i++) { code[i] = rand() ^ (rand() << 8); } @@ -144,28 +144,28 @@ void CodeToHeader(const std::vector &code, std::string _filename, } void CodesToHeader(const std::vector *codes, const std::vector* filenames, - int numCodes, const char *name, std::string &header) + u32 numCodes, const char *name, std::string &header) { std::vector > codes_padded; char buffer[1024]; - int reserveSize = 0; - for(int i = 0; i < numCodes; i++) + u32 reserveSize = 0; + for(u32 i = 0; i < numCodes; i++) { codes_padded.push_back(codes[i]); // Pad with nops to 32byte boundary while (codes_padded.at(i).size() & 0x7f) codes_padded.at(i).push_back(0); - reserveSize += (int)codes_padded.at(i).size(); + reserveSize += (u32)codes_padded.at(i).size(); } header.clear(); header.reserve(reserveSize * 4); - sprintf(buffer, "#define NUM_UCODES %d\n\n", numCodes); + sprintf(buffer, "#define NUM_UCODES %u\n\n", numCodes); header.append(buffer); header.append("const char* UCODE_NAMES[NUM_UCODES] = {\n"); - for (int i = 0; i < numCodes; i++) + for (u32 i = 0; i < numCodes; i++) { std::string filename; if (! SplitPath(filenames->at(i), NULL, &filename, NULL)) @@ -176,7 +176,7 @@ void CodesToHeader(const std::vector *codes, const std::vector header.append("};\n\n"); header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n"); - for(int i = 0; i < numCodes; i++) + for(u32 i = 0; i < numCodes; i++) { if(codes[i].size() == 0) continue; @@ -197,7 +197,7 @@ void CodesToHeader(const std::vector *codes, const std::vector void CodeToBinaryStringBE(const std::vector &code, std::string &str) { str.resize(code.size() * 2); - for (int i = 0; i < (int)code.size(); i++) + for (size_t i = 0; i < code.size(); i++) { str[i * 2 + 0] = code[i] >> 8; str[i * 2 + 1] = code[i] & 0xff; @@ -207,7 +207,7 @@ void CodeToBinaryStringBE(const std::vector &code, std::string &str) void BinaryStringBEToCode(const std::string &str, std::vector &code) { code.resize(str.size() / 2); - for (int i = 0; i < (int)code.size(); i++) + for (size_t i = 0; i < code.size(); i++) { code[i] = ((u16)(u8)str[i * 2 + 0] << 8) | ((u16)(u8)str[i * 2 + 1]); } diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.h b/Source/Core/Core/Src/DSP/DSPCodeUtil.h index 2a2ebfb228..525e21a9fb 100644 --- a/Source/Core/Core/Src/DSP/DSPCodeUtil.h +++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.h @@ -26,11 +26,11 @@ bool Assemble(const char *text, std::vector &code, bool force = false); bool Disassemble(const std::vector &code, bool line_numbers, std::string &text); bool Compare(const std::vector &code1, const std::vector &code2); -void GenRandomCode(int size, std::vector &code); +void GenRandomCode(u32 size, std::vector &code); void CodeToHeader(const std::vector &code, std::string _filename, const char *name, std::string &header); void CodesToHeader(const std::vector *codes, const std::vector *filenames, - int numCodes, const char *name, std::string &header); + u32 numCodes, const char *name, std::string &header); // Big-endian, for writing straight to file using File::WriteStringToFile. void CodeToBinaryStringBE(const std::vector &code, std::string &str); diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp index 2ce441bf31..12dac52e31 100644 --- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp @@ -25,7 +25,7 @@ #include "DSPAnalyzer.h" #include "Jit/DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #define MAX_BLOCK_SIZE 250 #define DSP_IDLE_SKIP_CYCLES 0x1000 diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp index f2cbbc2b9f..e4c81e4a7a 100644 --- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp @@ -252,7 +252,9 @@ static void gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size) ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size); } +#if _M_SSE >= 0x301 static const __m128i s_mask = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L); +#endif // TODO: These should eat clock cycles. static void gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size) diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp index 0b75431de6..185ada8ba3 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp @@ -25,7 +25,7 @@ #include "DSPJitUtil.h" #endif #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // CLR $acR diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp index 8ca770e35d..252550b84c 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp @@ -21,7 +21,7 @@ #include "../DSPAnalyzer.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp index e382b6114a..be7675378d 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp @@ -24,7 +24,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // In: RAX: s64 _Value diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp index 8203f7cde1..40e39a89e9 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp @@ -18,7 +18,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp index a784e2dd2d..248ed8f945 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp @@ -22,7 +22,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // SRS @M, $(0x18+S) diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp index 8d8a635536..d0bf7a3822 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp @@ -20,7 +20,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; //clobbers: diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp index 1323de002d..0dcbf41877 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp @@ -27,7 +27,7 @@ #include "DSPJitUtil.h" #endif #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // Returns s64 in RAX diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp index 6bcbeca35e..687982cfb9 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp @@ -218,13 +218,12 @@ void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit) do { movcnt = 0; for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) { - if (cache.regs[i].loc.GetSimpleReg() != - regs[i].loc.GetSimpleReg() && - xregs[cache.regs[i].loc.GetSimpleReg()].guest_reg == - DSP_REG_NONE) { - movToHostReg(i, - cache.regs[i].loc.GetSimpleReg(), - true); + X64Reg simple = regs[i].loc.GetSimpleReg(); + X64Reg simple_cache = cache.regs[i].loc.GetSimpleReg(); + if (simple_cache != simple + && xregs[simple_cache].guest_reg == DSP_REG_NONE) + { + movToHostReg(i, simple_cache, true); movcnt++; } } diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp index b9e166f698..2fb18f83da 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp @@ -20,7 +20,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSPEmulator.cpp b/Source/Core/Core/Src/DSPEmulator.cpp index 2f1c7649a7..907eb225b3 100644 --- a/Source/Core/Core/Src/DSPEmulator.cpp +++ b/Source/Core/Core/Src/DSPEmulator.cpp @@ -22,8 +22,6 @@ DSPEmulator *CreateDSPEmulator(bool HLE) { - ac_Config.Load(); - if (HLE) { return new DSPHLE(); diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h index c305235049..5f9e41bb39 100644 --- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h @@ -34,7 +34,7 @@ public: virtual void step() {} virtual void breakNow(); virtual void runToBreakpoint(); - virtual void insertBLR(unsigned int address, unsigned int); + virtual void insertBLR(unsigned int address, unsigned int value); virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); virtual void showJitResults(u32 address); diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp index f074b6d88b..383fcb555d 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp @@ -90,9 +90,9 @@ void GetTlutLoadData(u32 &tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory & // TODO - figure out a cleaner way. if (Core::g_CoreStartupParameter.bWii) - memAddr = bpmem.tmem_config.tlut_src << 5; + memAddr = bpMem.tmem_config.tlut_src << 5; else - memAddr = (bpmem.tmem_config.tlut_src & 0xFFFFF) << 5; + memAddr = (bpMem.tmem_config.tlut_src & 0xFFFFF) << 5; } void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h index a95a46c1fd..d1ae9ee886 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h @@ -33,7 +33,7 @@ struct MemoryUpdate TEXTURE_MAP = 0x01, XF_DATA = 0x02, VERTEX_STREAM = 0x04, - TLUT = 0x08 + TMEM = 0x08, }; u32 fifoPosition; diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp index 1873a91574..ff90736fec 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp @@ -20,7 +20,6 @@ #include "Common.h" #include "CoreTiming.h" -#include "Thread.h" #include "HW/GPFifo.h" #include "HW/Memmap.h" @@ -28,7 +27,6 @@ #include "PowerPC/PowerPC.h" #include "BPMemory.h" -#include "CommandProcessor.h" FifoPlayer::~FifoPlayer() { @@ -96,40 +94,7 @@ bool FifoPlayer::Play() if (m_EarlyMemoryUpdates && m_CurrentFrame == m_FrameRangeStart) WriteAllMemoryUpdates(); - // Stop Fifo processing until we've written the new frame - WriteCP(CommandProcessor::CTRL_REGISTER, 0x10); // disable read & breakpoints, enable GP link - - // Write frame data - WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); - - // Enable frame processing and break when done - u16 write_ptr_lo = ReadCP(CommandProcessor::FIFO_WRITE_POINTER_LO); - u16 write_ptr_hi = ReadCP(CommandProcessor::FIFO_WRITE_POINTER_HI); - WriteCP(CommandProcessor::FIFO_BP_LO, write_ptr_lo); - WriteCP(CommandProcessor::FIFO_BP_HI, write_ptr_hi); - WriteCP(CommandProcessor::CTRL_REGISTER, 0x13); // enable read, breakpoints & GP link - - // If necessary, wait until GP has reached the breakpoint to prevent fifo overflows - // TODO: Can this be done any better? Dual core mode is slower than single core mode even with these conditions.. - if (m_CurrentFrame < m_FrameRangeEnd) - { - // Check if FIFO would be overflown when writing the next frame - u32 CPRWDistance = (ReadCP(CommandProcessor::FIFO_RW_DISTANCE_HI)<<16) | ReadCP(CommandProcessor::FIFO_RW_DISTANCE_LO); - CPRWDistance += m_File->GetFrame(m_CurrentFrame+1).fifoDataSize + CommandProcessor::GATHER_PIPE_SIZE; - u32 CPFifoBase = (ReadCP(CommandProcessor::FIFO_BASE_HI)<<16) | ReadCP(CommandProcessor::FIFO_BASE_LO); - u32 CPFifoEnd = (ReadCP(CommandProcessor::FIFO_END_HI)<<16) | ReadCP(CommandProcessor::FIFO_END_LO); - - bool bWait = (CPRWDistance > CPFifoEnd - CPFifoBase); - while (bWait && (ReadCP(CommandProcessor::FIFO_READ_POINTER_LO) != write_ptr_lo || - ReadCP(CommandProcessor::FIFO_READ_POINTER_HI) != write_ptr_hi)) - { - Common::YieldCPU(); - CoreTiming::Advance(); // Process scheduled events (esp. PixelEngine::SetFinish!) - - if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) - break; - } - } + WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); ++m_CurrentFrame; } @@ -422,11 +387,6 @@ void FifoPlayer::LoadMemory() FlushWGP(); } -u16 FifoPlayer::ReadCP(u32 address) -{ - return Memory::Read_U16(0xCC000000 | address); -} - void FifoPlayer::WriteCP(u32 address, u16 value) { Memory::Write_U16(value, 0xCC000000 | address); diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h index 838ac13f18..9db6c0d980 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h @@ -87,7 +87,6 @@ private: void LoadMemory(); - u16 ReadCP(u32 address); void WriteCP(u32 address, u16 value); void WritePI(u32 address, u32 value); diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp index 1c0cd7abe1..dd94295859 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp @@ -114,6 +114,8 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data) if (bp.address == BPMEM_LOADTLUT1) ProcessLoadTlut1(); + if (bp.address == BPMEM_PRELOAD_MODE) + ProcessPreloadTexture(); } break; @@ -143,7 +145,16 @@ void FifoRecordAnalyzer::ProcessLoadTlut1() GetTlutLoadData(tlutMemAddr, memAddr, tlutXferCount, *m_BpMem); - FifoRecorder::GetInstance().WriteMemory(memAddr, tlutXferCount, MemoryUpdate::TLUT); + FifoRecorder::GetInstance().WriteMemory(memAddr, tlutXferCount, MemoryUpdate::TMEM); +} + +void FifoRecordAnalyzer::ProcessPreloadTexture() +{ + BPS_TmemConfig& tmem_cfg = m_BpMem->tmem_config; + //u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; // TODO: Should this be half size for RGBA8 preloads? + + FifoRecorder::GetInstance().WriteMemory(tmem_cfg.preload_addr << 5, size, MemoryUpdate::TMEM); } void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h index 0ffc279bf3..8ef3360ce7 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h @@ -40,6 +40,7 @@ private: void DecodeOpcode(u8 *data); void ProcessLoadTlut1(); + void ProcessPreloadTexture(); void ProcessLoadIndexedXf(u32 val, int array); void ProcessVertexArrays(u8 *data, u8 vtxAttrGroup); void ProcessTexMaps(); diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 35b2f53392..a42f6629ad 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -171,9 +171,9 @@ bool InstallCodeHandler() Memory::Write_U8(1, 0x80001807); // Invalidate the icache - for (int i = 0; i < data.length(); i += 32) + for (unsigned int j = 0; j < data.length(); j += 32) { - PowerPC::ppcState.iCache.Invalidate(0x80001800 + i); + PowerPC::ppcState.iCache.Invalidate(0x80001800 + j); } return true; } diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp index a23d531f7e..10c2068e3e 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.cpp +++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp @@ -42,8 +42,6 @@ void LoadCodes(const IniFile& inifile, std::vector& gcodes) std::istringstream ss(*lines_iter); - int read_state = 0; - switch ((*lines_iter)[0]) { @@ -61,7 +59,6 @@ void LoadCodes(const IniFile& inifile, std::vector& gcodes) gcode.name = StripSpaces(gcode.name); // read the code creator name std::getline(ss, gcode.creator, ']'); - read_state = 0; break; // notes diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 84c6b2eb86..ae25060c64 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include #include "Common.h" #include "HLE.h" @@ -27,6 +26,9 @@ #include "HLE_OS.h" #include "HLE_Misc.h" +#include "IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "ConfigManager.h" +#include "Core.h" namespace HLE { @@ -45,55 +47,72 @@ struct SPatch { char m_szPatchName[128]; TPatchFunction PatchFunction; + int type; + int flags; }; static const SPatch OSPatches[] = { - { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, + { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // speedup - //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse }, - //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState }, + //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "memcpy", HLE_Misc::gc_memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memcmp", HLE_Misc::gc_memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memset", HLE_Misc::gc_memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memmove", HLE_Misc::gc_memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? + //{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? + + //{ "DCFlushRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "DCInvalidateRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "DCZeroRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // debug out is very nice ;) - { "OSReport", HLE_OS::HLE_GeneralDebugPrint }, - { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint }, - { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint }, - { "OSPanic", HLE_OS::HLE_OSPanic }, - { "vprintf", HLE_OS::HLE_GeneralDebugPrint }, - { "printf", HLE_OS::HLE_GeneralDebugPrint }, - { "puts", HLE_OS::HLE_GeneralDebugPrint }, // gcc-optimized printf? - { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint }, // used for early init things (normally) - { "___blank", HLE_OS::HLE_GeneralDebugPrint }, - { "__write_console", HLE_OS::HLE_write_console }, // used by sysmenu (+more?) + { "OSReport", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "OSPanic", HLE_OS::HLE_OSPanic, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "vprintf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "printf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "puts", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf? + { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally) + { "___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "__write_console", HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?) // wii only - //{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction }, + //{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Super Monkey Ball - no longer needed. - //{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine }, - //{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize }, - //{ ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength }, - //{ ".evil_vec_something", HLE_Misc::FZero_evil_vec_normalize }, - { "PanicAlert", HLE_Misc::HLEPanicAlert }, - //{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal }, - //{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal }, - //{ ".atan2", HLE_Misc::SMB_atan2}, - //{ ".sqrt_fz", HLE_Misc::FZ_sqrt}, + //{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_vec_something", HLE_Misc::FZero_evil_vec_normalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + { "PanicAlert", HLE_Misc::HLEPanicAlert, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + //{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".atan2", HLE_Misc::SMB_atan2HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".sqrt_fz", HLE_Misc::FZ_sqrtHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // F-zero still isn't working correctly, but these aren't really helping. - //{ ".sqrt_internal_fz", HLE_Misc::FZ_sqrt_internal }, - //{ ".rsqrt_internal_fz", HLE_Misc::FZ_rsqrt_internal }, + //{ ".sqrt_internal_fz", HLE_Misc::FZ_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".rsqrt_internal_fz", HLE_Misc::FZ_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".kill_infinites", HLE_Misc::FZero_kill_infinites }, + //{ ".kill_infinites", HLE_Misc::FZero_kill_infinites, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // special - // { "GXPeekZ", HLE_Misc::GXPeekZ}, - // { "GXPeekARGB", HLE_Misc::GXPeekARGB}, + // { "GXPeekZ", HLE_Misc::GXPeekZHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + // { "GXPeekARGB", HLE_Misc::GXPeekARGBHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Name doesn't matter, installed in CBoot::BootUp() - { "HBReload", HLE_Misc::HBReload }, + { "HBReload", HLE_Misc::HBReload, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + + // ES_LAUNCH + { "__OSBootDol", HLE_Misc::OSBootDol, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + { "OSGetResetCode", HLE_Misc::OSGetResetCode, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + }; static const SPatch OSBreakPoints[] = @@ -101,17 +120,13 @@ static const SPatch OSBreakPoints[] = { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, }; - -static std::map orig_instruction; - -void Patch(u32 address, const char *hle_func_name) +void Patch(u32 addr, const char *hle_func_name) { for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++) { if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name)) { - u32 HLEPatchValue = (1 & 0x3f) << 26; - Memory::Write_U32(HLEPatchValue | i, address); + orig_instruction[addr] = i; return; } } @@ -125,23 +140,24 @@ void PatchFunctions() Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); if (symbol > 0) { - u32 HLEPatchValue = (1 & 0x3f) << 26; for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) { - orig_instruction[addr] = Memory::ReadUnchecked_U32(addr); - Memory::Write_U32(HLEPatchValue | i, addr); + orig_instruction[addr] = i; } INFO_LOG(OSHLE, "Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address); } } - for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++) + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) { - Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); - if (symbol > 0) + for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++) { - PowerPC::breakpoints.Add(symbol->address, false); - INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address); + Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); + if (symbol > 0) + { + PowerPC::breakpoints.Add(symbol->address, false); + INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address); + } } } @@ -163,10 +179,46 @@ void Execute(u32 _CurrentPC, u32 _Instruction) // _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName); } -u32 GetOrigInstruction(u32 addr) +u32 GetFunctionIndex(u32 addr) { std::map::const_iterator iter = orig_instruction.find(addr); return (iter != orig_instruction.end()) ? iter->second : 0; } +int GetFunctionTypeByIndex(u32 index) +{ + return OSPatches[index].type; +} + +int GetFunctionFlagsByIndex(u32 index) +{ + return OSPatches[index].flags; +} + +bool IsEnabled(int flags) +{ + if (flags == HLE::HLE_TYPE_MEMORY && Core::g_CoreStartupParameter.bMMU) + return false; + + if (flags == HLE::HLE_TYPE_DEBUG && !Core::g_CoreStartupParameter.bEnableDebugging && PowerPC::GetMode() != MODE_INTERPRETER) + return false; + + return true; +} + +u32 UnPatch(std::string patchName) +{ + Symbol *symbol = g_symbolDB.GetSymbolFromName(patchName.c_str()); + if (symbol > 0) + { + for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) + { + orig_instruction[addr] = 0; + PowerPC::ppcState.iCache.Invalidate(addr); + } + return symbol->address; + } + return 0; +} + } // end of namespace HLE diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h index 04c3d35198..9318d34197 100644 --- a/Source/Core/Core/Src/HLE/HLE.h +++ b/Source/Core/Core/Src/HLE/HLE.h @@ -18,15 +18,40 @@ #ifndef _HLE_H #define _HLE_H +#include #include "Common.h" namespace HLE { + enum + { + HLE_HOOK_START = 0, // Hook the beginning of the function and execute the function afterwards + HLE_HOOK_END = 1, // Hook the end of the function, executing the function first before the hook + HLE_HOOK_REPLACE = 2, // Replace the function with the HLE version + HLE_HOOK_NONE = 3, // Do not hook the function + }; + + enum + { + HLE_TYPE_GENERIC = 0, // Miscellaneous function + HLE_TYPE_MEMORY = 1, // Memory operation + HLE_TYPE_FP = 2, // Floating Point operation + HLE_TYPE_DEBUG = 3, // Debug output function + }; + void PatchFunctions(); + void Patch(u32 pc, const char *func_name); + u32 UnPatch(std::string patchName); void Execute(u32 _CurrentPC, u32 _Instruction); - u32 GetOrigInstruction(u32 em_address); + u32 GetFunctionIndex(u32 em_address); + int GetFunctionTypeByIndex(u32 index); + int GetFunctionFlagsByIndex(u32 index); + + bool IsEnabled(int flags); + + static std::map orig_instruction; } #endif diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index d69bf09680..7e23798df1 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -22,10 +22,25 @@ #include "../PowerPC/PowerPC.h" #include "../HW/Memmap.h" #include "../Host.h" +#include "IPC_HLE/WII_IPC_HLE_Device_DI.h" +#include "ConfigManager.h" +#include "VolumeCreator.h" +#include "Filesystem.h" +#include "../Boot/Boot_DOL.h" +#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "HLE.h" +#include "PowerPC/PPCAnalyst.h" +#include "PowerPC/SignatureDB.h" +#include "PowerPC/PPCSymbolDB.h" +#include "CommonPaths.h" namespace HLE_Misc { +std::string args; +u32 argsPtr; +u32 bootType; + // Helper to quickly read the floating point value at a memory location. inline float F(u32 addr) { @@ -282,4 +297,253 @@ void HBReload() Host_Message(WM_USER_STOP); } +void ExecuteDOL(u8* dolFile, u32 fileSize) +{ + // Clear memory before loading the dol + for (u32 i = 0x80004000; i < Memory::Read_U32(0x00000034); i += 4) + { + // TODO: Should not write over the "save region" + Memory::Write_U32(0x00000000, i); + } + CDolLoader dolLoader(dolFile, fileSize); + dolLoader.Load(); + + // Scan for common HLE functions + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) + { + g_symbolDB.Clear(); + PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); + SignatureDB db; + if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) + { + db.Apply(&g_symbolDB); + HLE::PatchFunctions(); + db.Clear(); + } + } + + PowerPC::ppcState.iCache.Reset(); + + CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + size_t size = s_Usb->m_WiiMotes.size(); + bool* wiiMoteConnected = new bool[size]; + for (unsigned int i = 0; i < size; i++) + wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + + WII_IPC_HLE_Interface::Reset(true); + WII_IPC_HLE_Interface::Init(); + s_Usb = GetUsbPointer(); + for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) + { + if (wiiMoteConnected[i]) + { + s_Usb->m_WiiMotes[i].Activate(false); + s_Usb->m_WiiMotes[i].Activate(true); + } + else + { + s_Usb->m_WiiMotes[i].Activate(false); + } + } + + delete[] wiiMoteConnected; + + if (argsPtr) + { + u32 args_base = Memory::Read_U32(0x800000f4); + u32 ptr_to_num_args = 0xc; + u32 num_args = 1; + u32 hi_ptr = args_base + ptr_to_num_args + 4; + u32 new_args_ptr = args_base + ptr_to_num_args + 8; + + Memory::Write_U32(ptr_to_num_args, args_base + 8); + Memory::Write_U32(num_args, args_base + ptr_to_num_args); + Memory::Write_U32(0x14, hi_ptr); + + for (unsigned int i = 0; i < args.length(); i++) + Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); + } + + NPC = dolLoader.GetEntryPoint() | 0x80000000; +} + +void LoadDOLFromDisc(std::string dol) +{ + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); + DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); + + if (dol.length() > 1 && dol.compare(0, 1, "/") == 0) + dol = dol.substr(1); + + u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str()); + u8* dolFile = new u8[fileSize]; + if (fileSize > 0) + { + pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize); + ExecuteDOL(dolFile, fileSize); + } + delete[] dolFile; +} + +void LoadBootDOLFromDisc() +{ + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); + DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); + u32 fileSize = pFileSystem->GetBootDOLSize(); + u8* dolFile = new u8[fileSize]; + if (fileSize > 0) + { + pFileSystem->GetBootDOL(dolFile, fileSize); + ExecuteDOL(dolFile, fileSize); + } + delete[] dolFile; +} + +u32 GetDolFileSize(std::string dol) +{ + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); + DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); + + std::string dolFile; + + if (dol.length() > 1 && dol.compare(0, 1, "/") == 0) + dolFile = dol.substr(1); + else + dolFile = dol; + + return (u32)pFileSystem->GetFileSize(dolFile.c_str()); +} + +void gc_memmove() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void gc_memcpy() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void gc_memset() +{ + u32 dest = GPR(3); + u32 ch = GPR(4); + u32 count = GPR(5); + memset((u8*)(Memory::base + dest), ch, count); + NPC = LR; +} + +void gc_memcmp() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + GPR(3) = memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void div2i() +{ + s64 num = (s64)(GPR(3)) << 32 | GPR(4); + s64 den = (s64)(GPR(5)) << 32 | GPR(6); + s64 quo = num / den; + GPR(3) = quo >> 32; + GPR(4) = quo & 0xffffffff; + NPC = LR; +} + +void div2u() +{ + u64 num = (u64)(GPR(3)) << 32 | GPR(4); + u64 den = (u64)(GPR(5)) << 32 | GPR(6); + u64 quo = num / den; + GPR(3) = quo >> 32; + GPR(4) = quo & 0xffffffff; + NPC = LR; +} + +void OSGetResetCode() +{ + u32 resetCode = Memory::Read_U32(0xCC003024); + + if ((resetCode & 0x1fffffff) != 0) + { + GPR(3) = resetCode | 0x80000000; + } + else + { + GPR(3) = 0; + } + + NPC = LR; +} + +u16 GetIOSVersion() +{ + return Memory::Read_U16(0x00003140); +} + +void OSBootDol() +{ + if (GetIOSVersion() >= 30) + { + bootType = GPR(4); + + if ((GPR(4) >> 28) == 0x8) + { + u32 resetCode = GPR(30); + + // Reset game + Memory::Write_U32(resetCode, 0xCC003024); + LoadBootDOLFromDisc(); + return; + } + else if ((GPR(4) >> 28) == 0xA) + { + // Boot from disc partition + PanicAlert("Boot Partition: %08x", GPR(26)); + } + else if ((GPR(4) >> 28) == 0xC) + { + std::string dol; + + // Boot DOL from disc + u32 ptr = GPR(28); + Memory::GetString(dol, ptr); + + if (GetDolFileSize(dol) == 0) + { + ptr = GPR(30); + Memory::GetString(dol, ptr); + if (GetDolFileSize(dol) == 0) + { + // Cannot locate the dol file, exit. + HLE::UnPatch("__OSBootDol"); + NPC = PC; + return; + } + } + + argsPtr = Memory::Read_U32(GPR(5)); + Memory::GetString(args, argsPtr); + LoadDOLFromDisc(dol); + return; + } + else + { + PanicAlert("Unknown boot type: %08x", GPR(4)); + } + } + HLE::UnPatch("__OSBootDol"); + NPC = PC; +} + } diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index 6c932258a7..d0d098835f 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -39,6 +39,15 @@ namespace HLE_Misc void FZ_sqrt_internal(); void FZ_rsqrt_internal(); void HBReload(); + void OSBootDol(); + void OSGetResetCode(); + void memcpy(); + void memset(); + void memmove(); + void memcmp(); + void div2i(); + void div2u(); + void ExecuteDOL(u8* dolFile, u32 fileSize); } #endif diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp index f4141818ae..0a33e7c773 100644 --- a/Source/Core/Core/Src/HW/AudioInterface.cpp +++ b/Source/Core/Core/Src/HW/AudioInterface.cpp @@ -354,9 +354,6 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples static s16 l1 = 0; static s16 l2 = 0; - static s16 r1 = 0; - static s16 r2 = 0; - if ( frac >= 0x10000 || frac == 0) { @@ -364,9 +361,6 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples l1 = l2; //current l2 = pcm[pos * 2]; //next - - r1 = r2; //current - r2 = pcm[pos * 2 + 1]; //next } pcm_l = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16; diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp index f760abcec6..610042c66d 100644 --- a/Source/Core/Core/Src/HW/CPU.cpp +++ b/Source/Core/Core/Src/HW/CPU.cpp @@ -24,6 +24,7 @@ #include "../Core.h" #include "CPU.h" #include "DSP.h" +#include "Movie.h" #include "VideoBackendBase.h" diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index 799fb62f0e..5945cb7141 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -436,6 +436,10 @@ void Write16(const u16 _Value, const u32 _Address) if (tmpControl.ARAM) g_dspState.DSPControl.ARAM = 0; if (tmpControl.DSP) g_dspState.DSPControl.DSP = 0; + // Tracking DMAState fixes Knockout Kings 2003 in DSP HLE mode + if (GetDSPEmulator()->IsLLE()) + g_dspState.DSPControl.DMAState = 0; // keep g_ARAM DMA State zero + // unknown g_dspState.DSPControl.unk3 = tmpControl.unk3; g_dspState.DSPControl.pad = tmpControl.pad; @@ -693,13 +697,11 @@ void UpdateAudioDMA() void Do_ARAM_DMA() { - // Fake the DMA taking time to complete. The delay is not accurate, but - // seems like a good estimate - CoreTiming::ScheduleEvent_Threadsafe(g_arDMA.Cnt.count >> 1, et_GenerateDSPInterrupt, INT_ARAM | (1<<16)); + // Emulating the DMA wait time fixes Knockout Kings 2003 in DSP HLE mode + if (!GetDSPEmulator()->IsLLE()) + g_dspState.DSPControl.DMAState = 1; - // Set the "DMA in progress" flag. It will be cleared when the interrupt will - // be triggered, after the simulated delay. - g_dspState.DSPControl.DMAState = 1; + GenerateDSPInterrupt(INT_ARAM, true); // Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks if (g_arDMA.Cnt.dir) @@ -716,6 +718,8 @@ void Do_ARAM_DMA() { while (g_arDMA.Cnt.count) { + // These are logically seperated in code to show that a memory map has been set up + // See below in the write section for more information if ((g_ARAM_Info.Hex & 0xf) == 3) { Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr); diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index 66ee4bef84..6d2a1f9097 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -20,13 +20,14 @@ #include "ChunkFile.h" #include "IniFile.h" #include "HLEMixer.h" -#include "Setup.h" #include "StringUtil.h" #include "LogManager.h" #include "IniFile.h" #include "DSPHLE.h" #include "UCodes/UCodes.h" #include "../AudioInterface.h" +#include "ConfigManager.h" +#include "Core.h" DSPHLE::DSPHLE() { m_InitMixer = false; @@ -130,6 +131,14 @@ void DSPHLE::SwapUCode(u32 _crc) void DSPHLE::DoState(PointerWrap &p) { + bool isHLE = true; + p.Do(isHLE); + if (isHLE != true && p.GetMode() == PointerWrap::MODE_READ) + { + Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000); + p.SetMode(PointerWrap::MODE_VERIFY); + return; + } bool prevInitMixer = m_InitMixer; p.Do(m_InitMixer); if (prevInitMixer != m_InitMixer && p.GetMode() == PointerWrap::MODE_READ) @@ -252,7 +261,7 @@ void DSPHLE::InitMixer() unsigned int AISampleRate, DACSampleRate; AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate); delete soundStream; - soundStream = AudioCommon::InitSoundStream(new HLEMixer(this, AISampleRate, DACSampleRate, ac_Config.iFrequency), m_hWnd); + soundStream = AudioCommon::InitSoundStream(new HLEMixer(this, AISampleRate, DACSampleRate, 48000), m_hWnd); if(!soundStream) PanicAlert("Error starting up sound stream"); // Mixer is initialized m_InitMixer = true; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index da4b10f34e..81ef7c6482 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -12,459 +12,683 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "FileUtil.h" // For IsDirectory() -#include "StringUtil.h" // For StringFromFormat() -#include - -#include "Mixer.h" -#include "../MailHandler.h" -#include "../../DSP.h" -#include "UCodes.h" -#include "UCode_AXStructs.h" #include "UCode_AX.h" +#include "../../DSP.h" + +#define AX_GC #include "UCode_AX_Voice.h" -CUCode_AX::CUCode_AX(DSPHLE *dsp_hle, u32 l_CRC) - : IUCode(dsp_hle, l_CRC) - , m_addressPBs(0xFFFFFFFF) +CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) + , m_cmdlist_size(0) + , m_axthread(&SpawnAXThread, this) { - // we got loaded + WARN_LOG(DSPHLE, "Instantiating CUCode_AX: crc=%08x", crc); m_rMailHandler.PushMail(DSP_INIT); - - templbuffer = new int[1024 * 1024]; - temprbuffer = new int[1024 * 1024]; + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } CUCode_AX::~CUCode_AX() { + m_cmdlist_size = (u16)-1; // Special value to signal end + NotifyAXThread(); + m_axthread.join(); + m_rMailHandler.Clear(); - delete [] templbuffer; - delete [] temprbuffer; } -// Needs A LOT of love! -static void ProcessUpdates(AXPB &PB) +void CUCode_AX::SpawnAXThread(CUCode_AX* self) { - // Make the updates we are told to do. When there are multiple updates for a block they - // are placed in memory directly following updaddr. They are mostly for initial time - // delays, sometimes for the FIR filter or channel volumes. We do all of them at once here. - // If we get both an on and an off update we chose on. Perhaps that makes the RE1 music - // work better. - int numupd = PB.updates.num_updates[0] - + PB.updates.num_updates[1] - + PB.updates.num_updates[2] - + PB.updates.num_updates[3] - + PB.updates.num_updates[4]; - if (numupd > 64) numupd = 64; // prevent crazy values TODO: LOL WHAT - const u32 updaddr = (u32)(PB.updates.data_hi << 16) | PB.updates.data_lo; - int on = 0, off = 0; - for (int j = 0; j < numupd; j++) + self->AXThread(); +} + +void CUCode_AX::AXThread() +{ + while (true) { - const u16 updpar = HLEMemory_Read_U16(updaddr + j*4); - const u16 upddata = HLEMemory_Read_U16(updaddr + j*4 + 2); - // some safety checks, I hope it's enough - if (updaddr > 0x80000000 && updaddr < 0x817fffff - && updpar < 63 && updpar > 3 // updpar > 3 because we don't want to change - // 0-3, those are important - //&& (upd0 || upd1 || upd2 || upd3 || upd4) // We should use these in some way to I think - // but I don't know how or when - ) { - ((u16*)&PB)[updpar] = upddata; // WTF ABOUNDS! + std::unique_lock lk(m_cmdlist_mutex); + while (m_cmdlist_size == 0) + m_cmdlist_cv.wait(lk); } - if (updpar == 7 && upddata != 0) on++; - if (updpar == 7 && upddata == 0) off++; - } - // hack: if we get both an on and an off select on rather than off - if (on > 0 && off > 0) PB.running = 1; -} -static void VoiceHacks(AXPB &pb) -{ - // get necessary values - const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; - const u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; - // const u32 updaddr = (u32)(pb.updates.data_hi << 16) | pb.updates.data_lo; - // const u16 updpar = HLEMemory_Read_U16(updaddr); - // const u16 upddata = HLEMemory_Read_U16(updaddr + 2); + if (m_cmdlist_size == (u16)-1) // End of thread signal + break; - // ======================================================================================= - /* Fix problems introduced with the SSBM fix. Sometimes when a music stream ended sampleEnd - would end up outside of bounds while the block was still playing resulting in noise - a strange noise. This should take care of that. - */ - if ((sampleEnd > (0x017fffff * 2) || loopPos > (0x017fffff * 2))) // ARAM bounds in nibbles - { - pb.running = 0; + m_processing.lock(); + HandleCommandList(); + m_cmdlist_size = 0; - // also reset all values if it makes any difference - pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - pb.src.cur_addr_frac = 0; pb.src.ratio_hi = 0; pb.src.ratio_lo = 0; - pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; - - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - } - - /* - // the fact that no settings are reset (except running) after a SSBM type music stream or another - looping block (for example in Battle Stadium DON) has ended could cause loud garbled sound to be - played from one or more blocks. Perhaps it was in conjunction with the old sequenced music fix below, - I'm not sure. This was an attempt to prevent that anyway by resetting all. But I'm not sure if this - is needed anymore. Please try to play SSBM without it and see if it works anyway. - */ - if ( - // detect blocks that have recently been running that we should reset - pb.running == 0 && pb.audio_addr.looping == 1 - //pb.running == 0 && pb.adpcm_loop_info.pred_scale - - // this prevents us from ruining sequenced music blocks, may not be needed - /* - && !(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2] - || pb.updates.num_updates[3] || pb.updates.num_updates[4]) - */ - //&& !(updpar || upddata) - - && pb.mixer_control == 0 // only use this in SSBM - ) - { - // reset the detection values - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - - //pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - //pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - //pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - //pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0; - //pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; + // Signal end of processing + m_rMailHandler.PushMail(DSP_YIELD); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + m_processing.unlock(); } } -void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) +void CUCode_AX::NotifyAXThread() { - if (_iSize > 1024 * 1024) - _iSize = 1024 * 1024; + std::unique_lock lk(m_cmdlist_mutex); + m_cmdlist_cv.notify_one(); +} - memset(templbuffer, 0, _iSize * sizeof(int)); - memset(temprbuffer, 0, _iSize * sizeof(int)); +void CUCode_AX::HandleCommandList() +{ + // Temp variables for addresses computation + u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; + u16 size; - AXPB PB; + u32 pb_addr = 0; - for (int x = 0; x < numPBaddr; x++) +#if 0 + WARN_LOG(DSPHLE, "Command list:"); + for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) + WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); + WARN_LOG(DSPHLE, "-------------"); +#endif + + u32 curr_idx = 0; + bool end = false; + while (!end) { - //u32 blockAddr = m_addressPBs; - u32 blockAddr = PBaddr[x]; + u16 cmd = m_cmdlist[curr_idx++]; - if (!blockAddr) - return; - - for (int i = 0; i < NUMBER_OF_PBS; i++) + switch (cmd) { - if (!ReadPB(blockAddr, PB)) + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_SETUP: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); break; - ProcessUpdates(PB); + case CMD_DL_AND_VOL_MIX: + { + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + u16 vol_main = m_cmdlist[curr_idx++]; + u16 vol_auxa = m_cmdlist[curr_idx++]; + u16 vol_auxb = m_cmdlist[curr_idx++]; + DownloadAndMixWithVolume(HILO_TO_32(addr), vol_main, vol_auxa, vol_auxb); + break; + } - if (m_CRC != 0x3389a79e) - VoiceHacks(PB); - - MixAddVoice(PB, templbuffer, temprbuffer, _iSize); - - if (!WritePB(blockAddr, PB)) + case CMD_PB_ADDR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + pb_addr = HILO_TO_32(addr); break; - // next PB, or done - blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; - if (!blockAddr) + case CMD_PROCESS: + ProcessPBList(pb_addr); + break; + + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + // These two commands are handled almost the same internally. + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + + case CMD_UPLOAD_LRS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + UploadLRS(HILO_TO_32(addr)); + break; + + case CMD_SET_LR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetMainLR(HILO_TO_32(addr)); + break; + + case CMD_UNK_08: curr_idx += 10; break; // TODO: check + + case CMD_MIX_AUXB_NOWRITE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(false, 0, HILO_TO_32(addr)); + break; + + case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; + case CMD_UNK_0B: break; // TODO: check other versions + case CMD_UNK_0C: break; // TODO: check other versions + + case CMD_MORE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + size = m_cmdlist[curr_idx++]; + + CopyCmdList(HILO_TO_32(addr), size); + curr_idx = 0; + break; + + case CMD_OUTPUT: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr)); + break; + + case CMD_END: + end = true; + break; + + case CMD_MIX_AUXB_LR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXBLR(HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + + case CMD_UNK_11: curr_idx += 2; break; + + case CMD_UNK_12: + { + u16 samp_val = m_cmdlist[curr_idx++]; + u16 idx = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + + // TODO + (void)samp_val; + (void)idx; + + break; + } + + // Send the contents of MAIN LRS, AUXA LRS and AUXB S to RAM, and + // mix data to MAIN LR and AUXB LR. + case CMD_SEND_AUX_AND_MIX: + { + // Address for Main + AUXA LRS upload + u16 main_auxa_up_hi = m_cmdlist[curr_idx++]; + u16 main_auxa_up_lo = m_cmdlist[curr_idx++]; + + // Address for AUXB S upload + u16 auxb_s_up_hi = m_cmdlist[curr_idx++]; + u16 auxb_s_up_lo = m_cmdlist[curr_idx++]; + + // Address to read data for Main L + u16 main_l_dl_hi = m_cmdlist[curr_idx++]; + u16 main_l_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for Main R + u16 main_r_dl_hi = m_cmdlist[curr_idx++]; + u16 main_r_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for AUXB L + u16 auxb_l_dl_hi = m_cmdlist[curr_idx++]; + u16 auxb_l_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for AUXB R + u16 auxb_r_dl_hi = m_cmdlist[curr_idx++]; + u16 auxb_r_dl_lo = m_cmdlist[curr_idx++]; + + SendAUXAndMix(HILO_TO_32(main_auxa_up), HILO_TO_32(auxb_s_up), + HILO_TO_32(main_l_dl), HILO_TO_32(main_r_dl), + HILO_TO_32(auxb_l_dl), HILO_TO_32(auxb_r_dl)); + break; + } + + default: + ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); + end = true; break; } } +} - if (_pBuffer) +static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) +{ + u32 start_idx = 0; + for (int i = 0; i < curr_ms; ++i) + start_idx += pb.updates.num_updates[i]; + + u32 update_addr = HILO_TO_32(pb.updates.data); + for (u32 i = start_idx; i < start_idx + pb.updates.num_updates[curr_ms]; ++i) { - for (int i = 0; i < _iSize; i++) - { - // Clamp into 16-bit. Maybe we should add a volume compressor here. - int left = templbuffer[i] + _pBuffer[0]; - int right = temprbuffer[i] + _pBuffer[1]; - if (left < -32767) left = -32767; - if (left > 32767) left = 32767; - if (right < -32767) right = -32767; - if (right > 32767) right = 32767; - *_pBuffer++ = left; - *_pBuffer++ = right; - } + u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i); + u16 update_val = HLEMemory_Read_U16(update_addr + 4 * i + 2); + + ((u16*)&pb)[update_off] = update_val; } } - -// ------------------------------------------------------------------------------ -// Handle incoming mail -void CUCode_AX::HandleMail(u32 _uMail) +AXMixControl CUCode_AX::ConvertMixerControl(u32 mixer_control) { - if (m_UploadSetupInProgress) + u32 ret = 0; + + // TODO: find other UCode versions with different mixer_control values + if (m_CRC == 0x4e8a8b21) { - PrepareBootUCode(_uMail); - return; + ret |= MIX_L | MIX_R; + if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R; + if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R; + if (mixer_control & 0x0004) + { + ret |= MIX_S; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S; + } + if (mixer_control & 0x0008) + { + ret |= MIX_L_RAMP | MIX_R_RAMP; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP; + if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP; + } } - else { - if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST) - { - // We are expected to get a new CmdBlock - DEBUG_LOG(DSPHLE, "GetNextCmdBlock (%ibytes)", (u16)_uMail); - } - else if (_uMail == 0xCDD10000) // Action 0 - AX_ResumeTask(); - { - m_rMailHandler.PushMail(DSP_RESUME); - } - else if (_uMail == 0xCDD10001) // Action 1 - new ucode upload ( GC: BayBlade S.T.B,...) - { - DEBUG_LOG(DSPHLE,"DSP IROM - New Ucode!"); - // TODO find a better way to protect from HLEMixer? - soundStream->GetMixer()->SetHLEReady(false); - m_UploadSetupInProgress = true; - } - else if (_uMail == 0xCDD10002) // Action 2 - IROM_Reset(); ( GC: NFS Carbon, FF Crystal Chronicles,...) - { - DEBUG_LOG(DSPHLE,"DSP IROM - Reset!"); - m_DSPHLE->SetUCode(UCODE_ROM); - return; - } - else if (_uMail == 0xCDD10003) // Action 3 - AX_GetNextCmdBlock(); - { - } + else + { + if (mixer_control & 0x0001) ret |= MIX_L; + if (mixer_control & 0x0002) ret |= MIX_R; + if (mixer_control & 0x0004) ret |= MIX_S; + if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP; + if (mixer_control & 0x0010) ret |= MIX_AUXA_L; + if (mixer_control & 0x0020) ret |= MIX_AUXA_R; + if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x0080) ret |= MIX_AUXA_S; + if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x0200) ret |= MIX_AUXB_L; + if (mixer_control & 0x0400) ret |= MIX_AUXB_R; + if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x1000) ret |= MIX_AUXB_S; + if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP; + + // TODO: 0x4000 is used for Dolby Pro 2 sound mixing + } + + return (AXMixControl)ret; +} + +void CUCode_AX::SetupProcessing(u32 init_addr) +{ + u16 init_data[0x20]; + + for (u32 i = 0; i < 0x20; ++i) + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); + + // List of all buffers we have to initialize + int* buffers[] = { + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround + }; + + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) + { + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i], 0, 5 * 32 * sizeof (int)); else { - DEBUG_LOG(DSPHLE, " >>>> u32 MAIL : AXTask Mail (%08x)", _uMail); - AXTask(_uMail); + for (u32 j = 0; j < 32 * 5; ++j) + { + buffers[i][j] = init_val; + init_val += delta; + } } } } +void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb) +{ + int* buffers_main[3] = { m_samples_left, m_samples_right, m_samples_surround }; + int* buffers_auxa[3] = { m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround }; + int* buffers_auxb[3] = { m_samples_auxB_left, m_samples_auxB_right, m_samples_auxB_surround }; + int** buffers[3] = { buffers_main, buffers_auxa, buffers_auxb }; + u16 volumes[3] = { vol_main, vol_auxa, vol_auxb }; + + for (u32 i = 0; i < 3; ++i) + { + int* ptr = (int*)HLEMemory_Get_Pointer(addr); + u16 volume = volumes[i]; + for (u32 j = 0; j < 3; ++j) + { + int* buffer = buffers[i][j]; + for (u32 k = 0; k < 5 * 32; ++k) + { + s64 sample = (s64)(s32)Common::swap32(*ptr++); + sample *= volume; + buffer[k] += (s32)(sample >> 15); + } + } + } +} + +void CUCode_AX::ProcessPBList(u32 pb_addr) +{ + // Samples per millisecond. In theory DSP sampling rate can be changed from + // 32KHz to 48KHz, but AX always process at 32KHz. + const u32 spms = 32; + + AXPB pb; + + while (pb_addr) + { + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround + }}; + + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 5; ++curr_ms) + { + ApplyUpdatesForMs(pb, curr_ms); + + Process1ms(pb, buffers, ConvertMixerControl(pb.mixer_control)); + + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; + } + + WritePB(pb_addr, pb); + pb_addr = HILO_TO_32(pb.next_pb); + } +} + +void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) +{ + int* buffers[3] = { 0 }; + + switch (aux_id) + { + case 0: + buffers[0] = m_samples_auxA_left; + buffers[1] = m_samples_auxA_right; + buffers[2] = m_samples_auxA_surround; + break; + + case 1: + buffers[0] = m_samples_auxB_left; + buffers[1] = m_samples_auxB_right; + buffers[2] = m_samples_auxB_surround; + break; + } + + // First, we need to send the contents of our AUX buffers to the CPU. + if (write_addr) + { + int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 5 * 32; ++j) + *ptr++ = Common::swap32(buffers[i][j]); + } + + // Then, we read the new temp from the CPU and add to our current + // temp. + int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_left[i] += (int)Common::swap32(*ptr++); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_right[i] += (int)Common::swap32(*ptr++); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_surround[i] += (int)Common::swap32(*ptr++); +} + +void CUCode_AX::UploadLRS(u32 dst_addr) +{ + int buffers[3][5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + { + buffers[0][i] = Common::swap32(m_samples_left[i]); + buffers[1][i] = Common::swap32(m_samples_right[i]); + buffers[2][i] = Common::swap32(m_samples_surround[i]); + } + memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); +} + +void CUCode_AX::SetMainLR(u32 src_addr) +{ + int* ptr = (int*)HLEMemory_Get_Pointer(src_addr); + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = (int)Common::swap32(*ptr++); + m_samples_left[i] = samp; + m_samples_right[i] = samp; + m_samples_surround[i] = 0; + } +} + +void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) +{ + int surround_buffer[5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + + // 32 samples per ms, 5 ms, 2 channels + short buffer[5 * 32 * 2]; + + // Output samples clamped to 16 bits and interlaced RLRLRLRLRL... + for (u32 i = 0; i < 5 * 32; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + buffer[2 * i] = Common::swap16(right); + buffer[2 * i + 1] = Common::swap16(left); + } + + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); +} + +void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr) +{ + // Upload AUXB L/R + int* ptr = (int*)HLEMemory_Get_Pointer(ul_addr); + for (u32 i = 0; i < 5 * 32; ++i) + *ptr++ = Common::swap32(m_samples_auxB_left[i]); + for (u32 i = 0; i < 5 * 32; ++i) + *ptr++ = Common::swap32(m_samples_auxB_right[i]); + + // Mix AUXB L/R to MAIN L/R, and replace AUXB L/R + ptr = (int*)HLEMemory_Get_Pointer(dl_addr); + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = Common::swap32(*ptr++); + m_samples_auxB_left[i] = samp; + m_samples_left[i] += samp; + } + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = Common::swap32(*ptr++); + m_samples_auxB_right[i] = samp; + m_samples_right[i] += samp; + } +} + +void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, + u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl) +{ + // Buffers to upload first + int* up_buffers[] = { + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround + }; + + // Upload AUXA LRS + int* ptr = (int*)HLEMemory_Get_Pointer(main_auxa_up); + for (u32 i = 0; i < sizeof (up_buffers) / sizeof (up_buffers[0]); ++i) + for (u32 j = 0; j < 32 * 5; ++j) + *ptr++ = Common::swap32(up_buffers[i][j]); + + // Upload AUXB S + ptr = (int*)HLEMemory_Get_Pointer(auxb_s_up); + for (u32 i = 0; i < 32 * 5; ++i) + *ptr++ = Common::swap32(m_samples_auxB_surround[i]); + + // Download buffers and addresses + int* dl_buffers[] = { + m_samples_left, + m_samples_right, + m_samples_auxB_left, + m_samples_auxB_right + }; + u32 dl_addrs[] = { + main_l_dl, + main_r_dl, + auxb_l_dl, + auxb_r_dl + }; + + // Download and mix + for (u32 i = 0; i < sizeof (dl_buffers) / sizeof (dl_buffers[0]); ++i) + { + int* dl_src = (int*)HLEMemory_Get_Pointer(dl_addrs[i]); + for (u32 j = 0; j < 32 * 5; ++j) + dl_buffers[i][j] += (int)Common::swap32(*dl_src++); + } +} + +void CUCode_AX::HandleMail(u32 mail) +{ + // Indicates if the next message is a command list address. + static bool next_is_cmdlist = false; + static u16 cmdlist_size = 0; + + bool set_next_is_cmdlist = false; + + // Wait for DSP processing to be done before answering any mail. This is + // safe to do because it matches what the DSP does on real hardware: there + // is no interrupt when a mail from CPU is received. + m_processing.lock(); + + if (next_is_cmdlist) + { + CopyCmdList(mail, cmdlist_size); + NotifyAXThread(); + } + else if (m_UploadSetupInProgress) + { + PrepareBootUCode(mail); + } + else if (mail == MAIL_RESUME) + { + // Acknowledge the resume request + m_rMailHandler.PushMail(DSP_RESUME); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } + else if (mail == MAIL_NEW_UCODE) + { + soundStream->GetMixer()->SetHLEReady(false); + m_UploadSetupInProgress = true; + } + else if (mail == MAIL_RESET) + { + m_DSPHLE->SetUCode(UCODE_ROM); + } + else if (mail == MAIL_CONTINUE) + { + // We don't have to do anything here - the CPU does not wait for a ACK + // and sends a cmdlist mail just after. + } + else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST) + { + // A command list address is going to be sent next. + set_next_is_cmdlist = true; + cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK); + } + else + { + ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail); + } + + m_processing.unlock(); + next_is_cmdlist = set_next_is_cmdlist; +} + +void CUCode_AX::CopyCmdList(u32 addr, u16 size) +{ + if (size >= (sizeof (m_cmdlist) / sizeof (u16))) + { + ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size); + return; + } + + for (u32 i = 0; i < size; ++i, addr += 2) + m_cmdlist[i] = HLEMemory_Read_U16(addr); + m_cmdlist_size = size; +} + +void CUCode_AX::MixAdd(short* out_buffer, int nsamples) +{ + // Should never be called: we do not set HLE as ready. + // We accurately send samples to RAM instead of directly to the mixer. +} -// ------------------------------------------------------------------------------ -// Update with DSP Interrupt void CUCode_AX::Update(int cycles) { + // Used for UCode switching. if (NeedsResumeMail()) { m_rMailHandler.PushMail(DSP_RESUME); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } - // check if we have to send something - else if (!m_rMailHandler.IsEmpty()) - { - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - } } -// ============================================ -// AX seems to bootup one task only and waits for resume-callbacks -// everytime the DSP has "spare time" it sends a resume-mail to the CPU -// and the __DSPHandler calls a AX-Callback which generates a new AXFrame -bool CUCode_AX::AXTask(u32& _uMail) +void CUCode_AX::DoAXState(PointerWrap& p) { - u32 uAddress = _uMail; - DEBUG_LOG(DSPHLE, "Begin"); - DEBUG_LOG(DSPHLE, "====================================================================="); - DEBUG_LOG(DSPHLE, "%08x : AXTask - AXCommandList-Addr:", uAddress); + p.Do(m_cmdlist); + p.Do(m_cmdlist_size); - u32 Addr__AXStudio; - u32 Addr__AXOutSBuffer; - u32 Addr__AXOutSBuffer_1; - u32 Addr__AXOutSBuffer_2; - u32 Addr__A; - u32 Addr__12; - u32 Addr__4_1; - u32 Addr__4_2; - //u32 Addr__4_3; - //u32 Addr__4_4; - u32 Addr__5_1; - u32 Addr__5_2; - u32 Addr__6; - u32 Addr__9; - - bool bExecuteList = true; - - numPBaddr = 0; - - while (bExecuteList) - { - static int last_valid_command = 0; - u16 iCommand = HLEMemory_Read_U16(uAddress); - uAddress += 2; - - switch (iCommand) - { - case AXLIST_STUDIOADDR: //00 - Addr__AXStudio = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST studio address: %08x", uAddress, Addr__AXStudio); - break; - - case 0x001: // 2byte x 10 - { - u32 address = HLEMemory_Read_U32(uAddress); - uAddress += 4; - u16 param1 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - u16 param2 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - u16 param3 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 1: %08x, %04x, %04x, %04x", uAddress, address, param1, param2, param3); - } - break; - - // - // Somewhere we should be getting a bitmask of AX_SYNC values - // that tells us what has been updated - // Dunno if important - // - case AXLIST_PBADDR: //02 - { - PBaddr[numPBaddr] = HLEMemory_Read_U32(uAddress); - numPBaddr++; - - m_addressPBs = HLEMemory_Read_U32(uAddress); // left in for now - uAddress += 4; - soundStream->GetMixer()->SetHLEReady(true); - DEBUG_LOG(DSPHLE, "%08x : AXLIST PB address: %08x", uAddress, m_addressPBs); - } - break; - - case 0x0003: - DEBUG_LOG(DSPHLE, "%08x : AXLIST command 0x0003 ????", uAddress); - break; - - case 0x0004: // AUX? - Addr__4_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - Addr__4_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 4_1 4_2 addresses: %08x %08x", uAddress, Addr__4_1, Addr__4_2); - break; - - case 0x0005: - Addr__5_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - Addr__5_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 5_1 5_2 addresses: %08x %08x", uAddress, Addr__5_1, Addr__5_2); - break; - - case 0x0006: - Addr__6 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 6 address: %08x", uAddress, Addr__6); - break; - - case AXLIST_SBUFFER: - Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST OutSBuffer address: %08x", uAddress, Addr__AXOutSBuffer); - break; - - case 0x0009: - Addr__9 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 6 address: %08x", uAddress, Addr__9); - break; - - case AXLIST_COMPRESSORTABLE: // 0xa - Addr__A = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST CompressorTable address: %08x", uAddress, Addr__A); - break; - - case 0x000e: - Addr__AXOutSBuffer_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - - // Addr__AXOutSBuffer_2 is the address in RAM that we are supposed to mix to. - // Although we don't, currently. - Addr__AXOutSBuffer_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST sbuf2 addresses: %08x %08x", uAddress, Addr__AXOutSBuffer_1, Addr__AXOutSBuffer_2); - break; - - case AXLIST_END: - bExecuteList = false; - DEBUG_LOG(DSPHLE, "%08x : AXLIST end", uAddress); - break; - - case 0x0010: //Super Monkey Ball 2 - DEBUG_LOG(DSPHLE, "%08x : AXLIST 0x0010", uAddress); - //should probably read/skip stuff here - uAddress += 8; - break; - - case 0x0011: - uAddress += 4; - break; - - case 0x0012: - Addr__12 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - break; - - case 0x0013: - uAddress += 6 * 4; // 6 Addresses. - break; - - default: - { - static bool bFirst = true; - if (bFirst) - { - char szTemp[2048]; - sprintf(szTemp, "Unknown AX-Command 0x%x (address: 0x%08x). Last valid: %02x\n", - iCommand, uAddress - 2, last_valid_command); - int num = -32; - while (num < 64+32) - { - char szTemp2[128] = ""; - sprintf(szTemp2, "%s0x%04x\n", num == 0 ? ">>" : " ", HLEMemory_Read_U16(uAddress + num)); - strcat(szTemp, szTemp2); - num += 2; - } - - PanicAlert("%s", szTemp); - // bFirst = false; - } - - // unknown command so stop the execution of this TaskList - bExecuteList = false; - } - break; - } - if (bExecuteList) - last_valid_command = iCommand; - } - DEBUG_LOG(DSPHLE, "AXTask - done, send resume"); - DEBUG_LOG(DSPHLE, "====================================================================="); - DEBUG_LOG(DSPHLE, "End"); - - m_rMailHandler.PushMail(DSP_YIELD); - return true; + p.Do(m_samples_left); + p.Do(m_samples_right); + p.Do(m_samples_surround); + p.Do(m_samples_auxA_left); + p.Do(m_samples_auxA_right); + p.Do(m_samples_auxA_surround); + p.Do(m_samples_auxB_left); + p.Do(m_samples_auxB_right); + p.Do(m_samples_auxB_surround); } -void CUCode_AX::DoState(PointerWrap &p) +void CUCode_AX::DoState(PointerWrap& p) { - std::lock_guard lk(m_csMix); - - p.Do(numPBaddr); - p.Do(m_addressPBs); - p.Do(PBaddr); + std::lock_guard lk(m_processing); DoStateShared(p); + DoAXState(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index edb52a2801..8fd2a2af5f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -12,52 +12,162 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _UCODE_AX -#define _UCODE_AX +// High-level emulation for the AX Gamecube UCode. +// +// TODO: +// * Depop support +// * ITD support +// * Polyphase sample interpolation support (not very useful) +// * Dolby Pro 2 mixing with recent AX versions -#include -#include "UCode_AXStructs.h" +#ifndef _UCODE_AX_H +#define _UCODE_AX_H -enum +#include "UCodes.h" +#include "UCode_AX_Structs.h" + +// We can't directly use the mixer_control field from the PB because it does +// not mean the same in all AX versions. The AX UCode converts the +// mixer_control value to an AXMixControl bitfield. +enum AXMixControl { - NUMBER_OF_PBS = 128 + MIX_L = 0x000001, + MIX_L_RAMP = 0x000002, + MIX_R = 0x000004, + MIX_R_RAMP = 0x000008, + MIX_S = 0x000010, + MIX_S_RAMP = 0x000020, + + MIX_AUXA_L = 0x000040, + MIX_AUXA_L_RAMP = 0x000080, + MIX_AUXA_R = 0x000100, + MIX_AUXA_R_RAMP = 0x000200, + MIX_AUXA_S = 0x000400, + MIX_AUXA_S_RAMP = 0x000800, + + MIX_AUXB_L = 0x001000, + MIX_AUXB_L_RAMP = 0x002000, + MIX_AUXB_R = 0x004000, + MIX_AUXB_R_RAMP = 0x008000, + MIX_AUXB_S = 0x010000, + MIX_AUXB_S_RAMP = 0x020000, + + MIX_AUXC_L = 0x040000, + MIX_AUXC_L_RAMP = 0x080000, + MIX_AUXC_R = 0x100000, + MIX_AUXC_R_RAMP = 0x200000, + MIX_AUXC_S = 0x400000, + MIX_AUXC_S_RAMP = 0x800000 }; -class CUCode_AX : public IUCode +class CUCode_AX : public IUCode { public: - CUCode_AX(DSPHLE *dsp_hle, u32 _CRC); + CUCode_AX(DSPHLE* dsp_hle, u32 crc); virtual ~CUCode_AX(); - void HandleMail(u32 _uMail); - void MixAdd(short* _pBuffer, int _iSize); - void Update(int cycles); - void DoState(PointerWrap &p); + virtual void HandleMail(u32 mail); + virtual void MixAdd(short* out_buffer, int nsamples); + virtual void Update(int cycles); + virtual void DoState(PointerWrap& p); - // PBs - u8 numPBaddr; - u32 PBaddr[8]; //2 needed for MP2 - u32 m_addressPBs; + // Needed because StdThread.h std::thread implem does not support member + // pointers. + static void SpawnAXThread(CUCode_AX* self); -private: - enum +protected: + enum MailType { - MAIL_AX_ALIST = 0xBABE0000, - AXLIST_STUDIOADDR = 0x0000, - AXLIST_PBADDR = 0x0002, - AXLIST_SBUFFER = 0x0007, - AXLIST_COMPRESSORTABLE = 0x000A, - AXLIST_END = 0x000F + MAIL_RESUME = 0xCDD10000, + MAIL_NEW_UCODE = 0xCDD10001, + MAIL_RESET = 0xCDD10002, + MAIL_CONTINUE = 0xCDD10003, + + // CPU sends 0xBABE0000 | cmdlist_size to the DSP + MAIL_CMDLIST = 0xBABE0000, + MAIL_CMDLIST_MASK = 0xFFFF0000 }; - int *templbuffer; - int *temprbuffer; + // 32 * 5 because 32 samples per millisecond, for max 5 milliseconds. + int m_samples_left[32 * 5]; + int m_samples_right[32 * 5]; + int m_samples_surround[32 * 5]; + int m_samples_auxA_left[32 * 5]; + int m_samples_auxA_right[32 * 5]; + int m_samples_auxA_surround[32 * 5]; + int m_samples_auxB_left[32 * 5]; + int m_samples_auxB_right[32 * 5]; + int m_samples_auxB_surround[32 * 5]; - // ax task message handler - bool AXTask(u32& _uMail); + // Volatile because it's set by HandleMail and accessed in + // HandleCommandList, which are running in two different threads. + volatile u16 m_cmdlist[512]; + volatile u32 m_cmdlist_size; + + std::thread m_axthread; + + // Sync objects + std::mutex m_processing; + std::condition_variable m_cmdlist_cv; + std::mutex m_cmdlist_mutex; + + // Copy a command list from memory to our temp buffer + void CopyCmdList(u32 addr, u16 size); + + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + + // Send a notification to the AX thread to tell him a new cmdlist addr is + // available for processing. + void NotifyAXThread(); + + void AXThread(); + + virtual void HandleCommandList(); + + void SetupProcessing(u32 init_addr); + void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb); + void ProcessPBList(u32 pb_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); + void UploadLRS(u32 dst_addr); + void SetMainLR(u32 src_addr); + void OutputSamples(u32 out_addr, u32 surround_addr); + void MixAUXBLR(u32 ul_addr, u32 dl_addr); + void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, + u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl); + + // Handle save states for main AX. + void DoAXState(PointerWrap& p); + +private: + enum CmdType + { + CMD_SETUP = 0x00, + CMD_DL_AND_VOL_MIX = 0x01, + CMD_PB_ADDR = 0x02, + CMD_PROCESS = 0x03, + CMD_MIX_AUXA = 0x04, + CMD_MIX_AUXB = 0x05, + CMD_UPLOAD_LRS = 0x06, + CMD_SET_LR = 0x07, + CMD_UNK_08 = 0x08, + CMD_MIX_AUXB_NOWRITE = 0x09, + CMD_COMPRESSOR_TABLE_ADDR = 0x0A, + CMD_UNK_0B = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_MORE = 0x0D, + CMD_OUTPUT = 0x0E, + CMD_END = 0x0F, + CMD_MIX_AUXB_LR = 0x10, + CMD_UNK_11 = 0x11, + CMD_UNK_12 = 0x12, + CMD_SEND_AUX_AND_MIX = 0x13, + }; }; -#endif // _UCODE_AX +#endif // !_UCODE_AX_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 03b1d3b75b..f4effbba6d 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -21,10 +21,10 @@ #include "Mixer.h" #include "UCodes.h" -#include "UCode_AXStructs.h" +#include "UCode_AXWii_Structs.h" #include "UCode_AX.h" // for some functions in CUCode_AX #include "UCode_AXWii.h" -#include "UCode_AX_Voice.h" +#include "UCode_AXWii_Voice.h" CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) @@ -159,8 +159,8 @@ void CUCode_AXWii::Update(int cycles) bool CUCode_AXWii::AXTask(u32& _uMail) { u32 uAddress = _uMail; - u32 Addr__AXStudio; - u32 Addr__AXOutSBuffer; + //u32 Addr__AXStudio; + //u32 Addr__AXOutSBuffer; bool bExecuteList = true; /* @@ -178,7 +178,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) switch (iCommand) { case 0x0000: - Addr__AXStudio = HLEMemory_Read_U32(uAddress); + //Addr__AXStudio = HLEMemory_Read_U32(uAddress); uAddress += 4; break; @@ -193,7 +193,8 @@ bool CUCode_AXWii::AXTask(u32& _uMail) case 0x0004: // PBs are here now m_addressPBs = HLEMemory_Read_U32(uAddress); - soundStream->GetMixer()->SetHLEReady(true); + if (soundStream) + soundStream->GetMixer()->SetHLEReady(true); // soundStream->Update(); uAddress += 4; break; @@ -208,7 +209,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) break; case 0x0007: // AXLIST_SBUFFER - Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); + //Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); uAddress += 10; break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h index 1e6cffcba0..dc07e71a63 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -18,7 +18,7 @@ #ifndef _UCODE_AXWII #define _UCODE_AXWII -#include "UCode_AXStructs.h" +#include "UCode_AXWii_Structs.h" #define NUMBER_OF_PBS 128 diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h similarity index 100% rename from Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h rename to Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h similarity index 100% rename from Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h rename to Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h new file mode 100644 index 0000000000..55f7face27 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h @@ -0,0 +1,271 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_AXWII_VOICE_H +#define _UCODE_AXWII_VOICE_H + +#include "UCodes.h" +#include "UCode_AXWii_ADPCM.h" +#include "UCode_AX.h" +#include "Mixer.h" +#include "../../AudioInterface.h" + +// MRAM -> ARAM for GC +inline bool ReadPB(u32 addr, AXPB &PB) +{ + const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + u16* PB_in_aram = (u16*)&PB; + + for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) + { + PB_in_aram[p] = Common::swap16(PB_in_mram[p]); + } + + return true; +} + +// MRAM -> ARAM for Wii +inline bool ReadPB(u32 addr, AXPBWii &PB) +{ + const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + u16* PB_in_aram = (u16*)&PB; + + // preswap the mixer_control + PB.mixer_control = ((u32)PB_in_mram[7] << 16) | ((u32)PB_in_mram[6] >> 16); + + for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) + { + PB_in_aram[p] = Common::swap16(PB_in_mram[p]); + } + + return true; +} + +// ARAM -> MRAM for GC +inline bool WritePB(u32 addr, AXPB &PB) +{ + const u16* PB_in_aram = (const u16*)&PB; + u16* PB_in_mram = (u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + + for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) + { + PB_in_mram[p] = Common::swap16(PB_in_aram[p]); + } + + return true; +} + +// ARAM -> MRAM for Wii +inline bool WritePB(u32 addr, AXPBWii &PB) +{ + const u16* PB_in_aram = (const u16*)&PB; + u16* PB_in_mram = (u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + + // preswap the mixer_control + *(u32*)&PB_in_mram[6] = (PB.mixer_control << 16) | (PB.mixer_control >> 16); + + for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) + { + PB_in_mram[p] = Common::swap16(PB_in_aram[p]); + } + + return true; +} + +////////////////////////////////////////////////////////////////////////// +// TODO: fix handling of gc/wii PB differences +// TODO: generally fix up the mess - looks crazy and kinda wrong +template +inline void MixAddVoice(ParamBlockType &pb, + int *templbuffer, int *temprbuffer, + int _iSize) +{ + if (pb.running) + { + const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) + * /*ratioFactor:*/((float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate())); + u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; + u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; + + u32 samplePos = (pb.audio_addr.cur_addr_hi << 16) | pb.audio_addr.cur_addr_lo; + u32 frac = pb.src.cur_addr_frac; + + // ======================================================================================= + // Handle No-SRC streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0 + // and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This + // makes samplePos update in the correct way. I'm unsure how we are actually supposed to + // detect that this setting. Updates did not fix this automatically. + // --------------------------------------------------------------------------------------- + // Stream settings + // src_type = 2 (most other games have src_type = 0) + // Affected games: + // Baten Kaitos - Eternal Wings (2003) + // Baten Kaitos - Origins (2006)? + // Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps + // the sound format plays in to, Baten use ADPCM, SC2 use PCM16 + //if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) + if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) + { + pb.src.ratio_hi = 1; + } + + // ======================================================================================= + // Games that use looping to play non-looping music streams - SSBM has info in all + // pb.adpcm_loop_info parameters but has pb.audio_addr.looping = 0. If we treat these streams + // like any other looping streams the music works. I'm unsure how we are actually supposed to + // detect that these kinds of blocks should be looping. It seems like pb.mixer_control == 0 may + // identify these types of blocks. Updates did not write any looping values. + if ( + (pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2) + && pb.mixer_control == 0 && pb.adpcm_loop_info.pred_scale <= 0x7F + ) + { + pb.audio_addr.looping = 1; + } + + + + // Top Spin 3 Wii + if (pb.audio_addr.sample_format > 25) + pb.audio_addr.sample_format = 0; + + // ======================================================================================= + // Walk through _iSize. _iSize = numSamples. If the game goes slow _iSize will be higher to + // compensate for that. _iSize can be as low as 100 or as high as 2000 some cases. + for (int s = 0; s < _iSize; s++) + { + int sample = 0; + u32 oldFrac = frac; + frac += ratio; + u32 newSamplePos = samplePos + (frac >> 16); //whole number of frac + + // ======================================================================================= + // Process sample format + switch (pb.audio_addr.sample_format) + { + case AUDIOFORMAT_PCM8: + pb.adpcm.yn2 = ((s8)DSP::ReadARAM(samplePos)) << 8; //current sample + pb.adpcm.yn1 = ((s8)DSP::ReadARAM(samplePos + 1)) << 8; //next sample + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; + + samplePos = newSamplePos; + break; + + case AUDIOFORMAT_PCM16: + pb.adpcm.yn2 = (s16)(u16)((DSP::ReadARAM(samplePos * 2) << 8) | (DSP::ReadARAM((samplePos * 2 + 1)))); //current sample + pb.adpcm.yn1 = (s16)(u16)((DSP::ReadARAM((samplePos + 1) * 2) << 8) | (DSP::ReadARAM(((samplePos + 1) * 2 + 1)))); //next sample + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; + + samplePos = newSamplePos; + break; + + case AUDIOFORMAT_ADPCM: + ADPCM_Step(pb.adpcm, samplePos, newSamplePos, frac); + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac) + pb.adpcm.yn2) >> 16; //adpcm moves on frac + + break; + + default: + break; + } + + // =================================================================== + // Overall volume control. In addition to this there is also separate volume settings to + // different channels (left, right etc). + frac &= 0xffff; + + int vol = pb.vol_env.cur_volume >> 9; + sample = sample * vol >> 8; + + if (pb.mixer_control & MIXCONTROL_RAMPING) + { + int x = pb.vol_env.cur_volume; + x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game + // that use this? Or how does it work? + if (x < 0) + x = 0; + if (x >= 0x7fff) + x = 0x7fff; + pb.vol_env.cur_volume = x; // maybe not per sample?? :P + } + + int leftmix = pb.mixer.left >> 5; + int rightmix = pb.mixer.right >> 5; + int left = sample * leftmix >> 8; + int right = sample * rightmix >> 8; + // adpcm has to walk from oldSamplePos to samplePos here + templbuffer[s] += left; + temprbuffer[s] += right; + + // Control the behavior when we reach the end of the sample + if (samplePos >= sampleEnd) + { + if (pb.audio_addr.looping == 1) + { + if ((samplePos & ~0x1f) == (sampleEnd & ~0x1f) || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) + samplePos = loopPos; + if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) + { + pb.adpcm.yn1 = pb.adpcm_loop_info.yn1; + pb.adpcm.yn2 = pb.adpcm_loop_info.yn2; + pb.adpcm.pred_scale = pb.adpcm_loop_info.pred_scale; + } + } + else + { + pb.running = 0; + samplePos = loopPos; + //samplePos = samplePos - sampleEnd + loopPos; + memset(&pb.dpop, 0, sizeof(pb.dpop)); + memset(pb.src.last_samples, 0, 8); + break; + } + } + } // end of the _iSize loop + + // Update volume + pb.mixer.left = ADPCM_Vol(pb.mixer.left, pb.mixer.left_delta); + pb.mixer.right = ADPCM_Vol(pb.mixer.right, pb.mixer.right_delta); + + pb.src.cur_addr_frac = (u16)frac; + pb.audio_addr.cur_addr_hi = samplePos >> 16; + pb.audio_addr.cur_addr_lo = (u16)samplePos; + + } // if (pb.running) +} + +#endif diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h new file mode 100644 index 0000000000..c92196dd49 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h @@ -0,0 +1,392 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_AX_STRUCTS_H +#define _UCODE_AX_STRUCTS_H + +struct PBMixer +{ + u16 left; + u16 left_delta; + u16 right; + u16 right_delta; + + u16 auxA_left; + u16 auxA_left_delta; + u16 auxA_right; + u16 auxA_right_delta; + + u16 auxB_left; + u16 auxB_left_delta; + u16 auxB_right; + u16 auxB_right_delta; + + u16 auxB_surround; + u16 auxB_surround_delta; + u16 surround; + u16 surround_delta; + u16 auxA_surround; + u16 auxA_surround_delta; +}; + +struct PBMixerWii +{ + // volume mixing values in .15, 0x8000 = ca. 1.0 + u16 left; + u16 left_delta; + u16 right; + u16 right_delta; + + u16 auxA_left; + u16 auxA_left_delta; + u16 auxA_right; + u16 auxA_right_delta; + + u16 auxB_left; + u16 auxB_left_delta; + u16 auxB_right; + u16 auxB_right_delta; + + // Note: the following elements usage changes a little in DPL2 mode + // TODO: implement and comment it in the mixer + u16 auxC_left; + u16 auxC_left_delta; + u16 auxC_right; + u16 auxC_right_delta; + + u16 surround; + u16 surround_delta; + u16 auxA_surround; + u16 auxA_surround_delta; + u16 auxB_surround; + u16 auxB_surround_delta; + u16 auxC_surround; + u16 auxC_surround_delta; +}; + +struct PBMixerWM +{ + u16 main0; + u16 main0_delta; + u16 aux0; + u16 aux0_delta; + + u16 main1; + u16 main1_delta; + u16 aux1; + u16 aux1_delta; + + u16 main2; + u16 main2_delta; + u16 aux2; + u16 aux2_delta; + + u16 main3; + u16 main3_delta; + u16 aux3; + u16 aux3_delta; +}; + +struct PBInitialTimeDelay +{ + u16 on; + u16 addrMemHigh; + u16 addrMemLow; + u16 offsetLeft; + u16 offsetRight; + u16 targetLeft; + u16 targetRight; +}; + +// Update data - read these each 1ms subframe and use them! +// It seems that to provide higher time precisions for MIDI events, some games +// use this thing to update the parameter blocks per 1ms sub-block (a block is 5ms). +// Using this data should fix games that are missing MIDI notes. +struct PBUpdates +{ + u16 num_updates[5]; + u16 data_hi; // These point to main RAM. Not sure about the structure of the data. + u16 data_lo; +}; + +// The DSP stores the final sample values for each voice after every frame of processing. +// The values are then accumulated for all dropped voices, added to the next frame of audio, +// and ramped down on a per-sample basis to provide a gentle "roll off." +struct PBDpop +{ + s16 left; + s16 auxA_left; + s16 auxB_left; + + s16 right; + s16 auxA_right; + s16 auxB_right; + + s16 surround; + s16 auxA_surround; + s16 auxB_surround; +}; + +struct PBDpopWii +{ + s16 left; + s16 auxA_left; + s16 auxB_left; + s16 auxC_left; + + s16 right; + s16 auxA_right; + s16 auxB_right; + s16 auxC_right; + + s16 surround; + s16 auxA_surround; + s16 auxB_surround; + s16 auxC_surround; +}; + +struct PBDpopWM +{ + s16 aMain0; + s16 aMain1; + s16 aMain2; + s16 aMain3; + + s16 aAux0; + s16 aAux1; + s16 aAux2; + s16 aAux3; +}; + +struct PBVolumeEnvelope +{ + u16 cur_volume; // volume at start of frame + s16 cur_volume_delta; // signed per sample delta (96 samples per frame) +}; + +struct PBUnknown2 +{ + u16 unknown_reserved[3]; +}; + +struct PBAudioAddr +{ + u16 looping; + u16 sample_format; + u16 loop_addr_hi; // Start of loop (this will point to a shared "zero" buffer if one-shot mode is active) + u16 loop_addr_lo; + u16 end_addr_hi; // End of sample (and loop), inclusive + u16 end_addr_lo; + u16 cur_addr_hi; + u16 cur_addr_lo; +}; + +struct PBADPCMInfo +{ + s16 coefs[16]; + u16 gain; + u16 pred_scale; + s16 yn1; + s16 yn2; +}; + +struct PBSampleRateConverter +{ + // ratio = (f32)ratio * 0x10000; + // valid range is 1/512 to 4.0000 + u16 ratio_hi; // integer part of sampling ratio + u16 ratio_lo; // fraction part of sampling ratio + u16 cur_addr_frac; + u16 last_samples[4]; +}; + +struct PBSampleRateConverterWM +{ + u16 currentAddressFrac; + u16 last_samples[4]; +}; + +struct PBADPCMLoopInfo +{ + u16 pred_scale; + u16 yn1; + u16 yn2; +}; + +struct PBLowPassFilter +{ + u16 enabled; + u16 yn1; + u16 a0; + u16 b0; +}; + +struct AXPB +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, ?, linear) + u16 coef_select; + u16 mixer_control; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixer mixer; + PBInitialTimeDelay initial_time_delay; + PBUpdates updates; + PBDpop dpop; + PBVolumeEnvelope vol_env; + PBUnknown2 unknown3; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + PBLowPassFilter lpf; + + u16 padding[25]; +}; + +struct PBBiquadFilter +{ + + u16 on; // on = 2, off = 0 + u16 xn1; // History data + u16 xn2; + u16 yn1; + u16 yn2; + u16 b0; // Filter coefficients + u16 b1; + u16 b2; + u16 a1; + u16 a2; + +}; + +union PBInfImpulseResponseWM +{ + PBLowPassFilter lpf; + PBBiquadFilter biquad; +}; + +struct AXPBWii +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, 4-tap, linear) + u16 coef_select; // coef for the 4-tap src + u16 mixer_control_hi; + u16 mixer_control_lo; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixerWii mixer; + PBInitialTimeDelay initial_time_delay; + PBDpopWii dpop; + PBVolumeEnvelope vol_env; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + PBLowPassFilter lpf; + PBBiquadFilter biquad; + + // WIIMOTE :D + u16 remote; + u16 remote_mixer_control; + + PBMixerWM remote_mixer; + PBDpopWM remote_dpop; + PBSampleRateConverterWM remote_src; + PBInfImpulseResponseWM remote_iir; + + u16 pad[12]; // align us, captain! (32B) +}; + +// Seems like nintendo used an early version of AXWii and forgot to remove the update functionality ;p +struct PBUpdatesWiiSports +{ + u16 num_updates[3]; + u16 data_hi; + u16 data_lo; +}; + +struct AXPBWiiSports +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, 4-tap, linear) + u16 coef_select; // coef for the 4-tap src + u32 mixer_control; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixerWii mixer; + PBInitialTimeDelay initial_time_delay; + PBUpdatesWiiSports updates; + PBDpopWii dpop; + PBVolumeEnvelope vol_env; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + PBLowPassFilter lpf; + PBBiquadFilter biquad; + + // WIIMOTE :D + u16 remote; + u16 remote_mixer_control; + + PBMixerWM remote_mixer; + PBDpopWM remote_dpop; + PBSampleRateConverterWM remote_src; + PBInfImpulseResponseWM remote_iir; + + u16 pad[7]; // align us, captain! (32B) +}; + +// TODO: All these enums have changed a lot for wii +enum { + AUDIOFORMAT_ADPCM = 0, + AUDIOFORMAT_PCM8 = 0x19, + AUDIOFORMAT_PCM16 = 0xA, +}; + +enum { + SRCTYPE_POLYPHASE = 0, + SRCTYPE_LINEAR = 1, + SRCTYPE_NEAREST = 2, +}; + +// Both may be used at once +enum { + FILTER_LOWPASS = 1, + FILTER_BIQUAD = 2, +}; + +#endif // _UCODE_AX_STRUCTS_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index e6ee063ae3..349dc7e03b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -12,259 +12,389 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +// This file is UGLY (full of #ifdef) so that it can be used with both GC and +// Wii version of AX. Maybe it would be better to abstract away the parts that +// can be made common. + #ifndef _UCODE_AX_VOICE_H #define _UCODE_AX_VOICE_H -#include "UCodes.h" -#include "UCode_AX_ADPCM.h" -#include "UCode_AX.h" -#include "Mixer.h" -#include "../../AudioInterface.h" - -// MRAM -> ARAM for GC -inline bool ReadPB(u32 addr, AXPB &PB) -{ - const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - u16* PB_in_aram = (u16*)&PB; - - for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) - { - PB_in_aram[p] = Common::swap16(PB_in_mram[p]); - } - - return true; -} - -// MRAM -> ARAM for Wii -inline bool ReadPB(u32 addr, AXPBWii &PB) -{ - const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - u16* PB_in_aram = (u16*)&PB; - - // preswap the mixer_control - PB.mixer_control = ((u32)PB_in_mram[7] << 16) | ((u32)PB_in_mram[6] >> 16); - - for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) - { - PB_in_aram[p] = Common::swap16(PB_in_mram[p]); - } - - return true; -} - -// ARAM -> MRAM for GC -inline bool WritePB(u32 addr, AXPB &PB) -{ - const u16* PB_in_aram = (const u16*)&PB; - u16* PB_in_mram = (u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - - for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) - { - PB_in_mram[p] = Common::swap16(PB_in_aram[p]); - } - - return true; -} - -// ARAM -> MRAM for Wii -inline bool WritePB(u32 addr, AXPBWii &PB) -{ - const u16* PB_in_aram = (const u16*)&PB; - u16* PB_in_mram = (u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - - // preswap the mixer_control - *(u32*)&PB_in_mram[6] = (PB.mixer_control << 16) | (PB.mixer_control >> 16); - - for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) - { - PB_in_mram[p] = Common::swap16(PB_in_aram[p]); - } - - return true; -} - -////////////////////////////////////////////////////////////////////////// -// TODO: fix handling of gc/wii PB differences -// TODO: generally fix up the mess - looks crazy and kinda wrong -template -inline void MixAddVoice(ParamBlockType &pb, - int *templbuffer, int *temprbuffer, - int _iSize) -{ - if (pb.running) - { - const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) - * /*ratioFactor:*/((float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate())); - u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; - u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; - - u32 samplePos = (pb.audio_addr.cur_addr_hi << 16) | pb.audio_addr.cur_addr_lo; - u32 frac = pb.src.cur_addr_frac; - - // ======================================================================================= - // Handle No-SRC streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0 - // and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This - // makes samplePos update in the correct way. I'm unsure how we are actually supposed to - // detect that this setting. Updates did not fix this automatically. - // --------------------------------------------------------------------------------------- - // Stream settings - // src_type = 2 (most other games have src_type = 0) - // Affected games: - // Baten Kaitos - Eternal Wings (2003) - // Baten Kaitos - Origins (2006)? - // Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps - // the sound format plays in to, Baten use ADPCM, SC2 use PCM16 - //if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) - if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) - { - pb.src.ratio_hi = 1; - } - - // ======================================================================================= - // Games that use looping to play non-looping music streams - SSBM has info in all - // pb.adpcm_loop_info parameters but has pb.audio_addr.looping = 0. If we treat these streams - // like any other looping streams the music works. I'm unsure how we are actually supposed to - // detect that these kinds of blocks should be looping. It seems like pb.mixer_control == 0 may - // identify these types of blocks. Updates did not write any looping values. - if ( - (pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2) - && pb.mixer_control == 0 && pb.adpcm_loop_info.pred_scale <= 0x7F - ) - { - pb.audio_addr.looping = 1; - } - - - - // Top Spin 3 Wii - if (pb.audio_addr.sample_format > 25) - pb.audio_addr.sample_format = 0; - - // ======================================================================================= - // Walk through _iSize. _iSize = numSamples. If the game goes slow _iSize will be higher to - // compensate for that. _iSize can be as low as 100 or as high as 2000 some cases. - for (int s = 0; s < _iSize; s++) - { - int sample = 0; - u32 oldFrac = frac; - frac += ratio; - u32 newSamplePos = samplePos + (frac >> 16); //whole number of frac - - // ======================================================================================= - // Process sample format - switch (pb.audio_addr.sample_format) - { - case AUDIOFORMAT_PCM8: - pb.adpcm.yn2 = ((s8)DSP::ReadARAM(samplePos)) << 8; //current sample - pb.adpcm.yn1 = ((s8)DSP::ReadARAM(samplePos + 1)) << 8; //next sample - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; - - samplePos = newSamplePos; - break; - - case AUDIOFORMAT_PCM16: - pb.adpcm.yn2 = (s16)(u16)((DSP::ReadARAM(samplePos * 2) << 8) | (DSP::ReadARAM((samplePos * 2 + 1)))); //current sample - pb.adpcm.yn1 = (s16)(u16)((DSP::ReadARAM((samplePos + 1) * 2) << 8) | (DSP::ReadARAM(((samplePos + 1) * 2 + 1)))); //next sample - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; - - samplePos = newSamplePos; - break; - - case AUDIOFORMAT_ADPCM: - ADPCM_Step(pb.adpcm, samplePos, newSamplePos, frac); - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac) + pb.adpcm.yn2) >> 16; //adpcm moves on frac - - break; - - default: - break; - } - - // =================================================================== - // Overall volume control. In addition to this there is also separate volume settings to - // different channels (left, right etc). - frac &= 0xffff; - - int vol = pb.vol_env.cur_volume >> 9; - sample = sample * vol >> 8; - - if (pb.mixer_control & MIXCONTROL_RAMPING) - { - int x = pb.vol_env.cur_volume; - x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game - // that use this? Or how does it work? - if (x < 0) - x = 0; - if (x >= 0x7fff) - x = 0x7fff; - pb.vol_env.cur_volume = x; // maybe not per sample?? :P - } - - int leftmix = pb.mixer.left >> 5; - int rightmix = pb.mixer.right >> 5; - int left = sample * leftmix >> 8; - int right = sample * rightmix >> 8; - // adpcm has to walk from oldSamplePos to samplePos here - templbuffer[s] += left; - temprbuffer[s] += right; - - // Control the behavior when we reach the end of the sample - if (samplePos >= sampleEnd) - { - if (pb.audio_addr.looping == 1) - { - samplePos = loopPos; - if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) - { - pb.adpcm.yn1 = pb.adpcm_loop_info.yn1; - pb.adpcm.yn2 = pb.adpcm_loop_info.yn2; - pb.adpcm.pred_scale = pb.adpcm_loop_info.pred_scale; - } - } - else - { - pb.running = 0; - samplePos = loopPos; - //samplePos = samplePos - sampleEnd + loopPos; - memset(&pb.dpop, 0, sizeof(pb.dpop)); - memset(pb.src.last_samples, 0, 8); - break; - } - } - } // end of the _iSize loop - - // Update volume - pb.mixer.left = ADPCM_Vol(pb.mixer.left, pb.mixer.left_delta); - pb.mixer.right = ADPCM_Vol(pb.mixer.right, pb.mixer.right_delta); - - pb.src.cur_addr_frac = (u16)frac; - pb.audio_addr.cur_addr_hi = samplePos >> 16; - pb.audio_addr.cur_addr_lo = (u16)samplePos; - - } // if (pb.running) -} - +#if !defined(AX_GC) && !defined(AX_WII) +#error UCode_AX_Voice.h included without specifying version #endif + +#include "Common.h" +#include "UCode_AX_Structs.h" +#include "../../DSP.h" + +#ifdef AX_GC +# define PB_TYPE AXPB +#else +# define PB_TYPE AXPBWii +#endif + +// Put all of that in an anonymous namespace to avoid stupid compilers merging +// functions from AX GC and AX Wii. +namespace { + +// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. +#define HILO_TO_32(name) \ + ((name##_hi << 16) | name##_lo) + +// Used to pass a large amount of buffers to the mixing function. +union AXBuffers +{ + struct + { + int* left; + int* right; + int* surround; + + int* auxA_left; + int* auxA_right; + int* auxA_surround; + + int* auxB_left; + int* auxB_right; + int* auxB_surround; + +#ifdef AX_WII + int* auxC_left; + int* auxC_right; + int* auxC_surround; +#endif + }; + +#ifdef AX_GC + int* ptrs[9]; +#else + int* ptrs[12]; +#endif +}; + +// Read a PB from MRAM/ARAM +bool ReadPB(u32 addr, PB_TYPE& pb) +{ + u16* dst = (u16*)&pb; + const u16* src = (const u16*)Memory::GetPointer(addr); + if (!src) + return false; + + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); + + return true; +} + +// Write a PB back to MRAM/ARAM +bool WritePB(u32 addr, const PB_TYPE& pb) +{ + const u16* src = (const u16*)&pb; + u16* dst = (u16*)Memory::GetPointer(addr); + if (!dst) + return false; + + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); + + return true; +} + +// Dump the value of a PB for debugging +#define DUMP_U16(field) WARN_LOG(DSPHLE, " %04x (%s)", pb.field, #field) +#define DUMP_U32(field) WARN_LOG(DSPHLE, " %08x (%s)", HILO_TO_32(pb.field), #field) +void DumpPB(const PB_TYPE& pb) +{ + DUMP_U32(next_pb); + DUMP_U32(this_pb); + DUMP_U16(src_type); + DUMP_U16(coef_select); +#ifdef AX_GC + DUMP_U16(mixer_control); +#else + DUMP_U32(mixer_control); +#endif + DUMP_U16(running); + DUMP_U16(is_stream); + + // TODO: complete as needed +} + +// Simulated accelerator state. +static u32 acc_loop_addr, acc_end_addr; +static u32* acc_cur_addr; +static PB_TYPE* acc_pb; + +// Sets up the simulated accelerator. +void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) +{ + acc_pb = pb; + acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); + acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr); + acc_cur_addr = cur_addr; +} + +// Reads a sample from the simulated accelerator. Also handles looping and +// disabling streams that reached the end (this is done by an exception raised +// by the accelerator on real hardware). +u16 AcceleratorGetSample() +{ + u16 ret; + + switch (acc_pb->audio_addr.sample_format) + { + case 0x00: // ADPCM + { + // ADPCM decoding, not much to explain here. + if ((*acc_cur_addr & 15) == 0) + { + acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1); + *acc_cur_addr += 2; + } + + int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF); + int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7; + + s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0]; + s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1]; + + int temp = (*acc_cur_addr & 1) ? + (DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) : + (DSP::ReadARAM(*acc_cur_addr >> 1) >> 4); + + if (temp >= 8) + temp -= 16; + + int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11); + + if (val > 0x7FFF) val = 0x7FFF; + else if (val < -0x7FFF) val = -0x7FFF; + + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = val; + *acc_cur_addr += 1; + ret = val; + break; + } + + case 0x0A: // 16-bit PCM audio + ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1); + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + case 0x19: // 8-bit PCM audio + ret = DSP::ReadARAM(*acc_cur_addr) << 8; + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + default: + ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format); + return 0; + } + + // Have we reached the end address? + // + // On real hardware, this would raise an interrupt that is handled by the + // UCode. We simulate what this interrupt does here. + if (*acc_cur_addr >= acc_end_addr) + { + // If we are really at the end (and we don't simply have cur_addr > + // end_addr all the time), loop back to loop_addr. + if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) + *acc_cur_addr = acc_loop_addr; + + if (acc_pb->audio_addr.looping) + { + // Set the ADPCM infos to continue processing at loop_addr. + // + // For some reason, yn1 and yn2 aren't set if the voice is not of + // stream type. This is what the AX UCode does and I don't really + // know why. + acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale; + if (!acc_pb->is_stream) + { + acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1; + acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2; + } + } + else + { + // Non looping voice reached the end -> running = 0. + acc_pb->running = 0; + } + } + + return ret; +} + +// Read 32 input samples from ARAM, decoding and converting rate if required. +void GetInputSamples(PB_TYPE& pb, s16* samples) +{ + u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); + AcceleratorSetup(&pb, &cur_addr); + + // TODO: support polyphase interpolation if coefficients are available. + if (pb.src_type == SRCTYPE_POLYPHASE || pb.src_type == SRCTYPE_LINEAR) + { + // Convert the input to a higher or lower sample rate using a linear + // interpolation algorithm. The input to output ratio is set in + // pb.src.ratio, which is a floating point num stored as a 32b integer: + // * Upper 16 bits of the ratio are the integer part + // * Lower 16 bits are the decimal part + u32 ratio = HILO_TO_32(pb.src.ratio); + + // We start getting samples not from sample 0, but 0.. + // This avoids discontinuties in the audio stream, especially with very + // low ratios which interpolate a lot of values between two "real" + // samples. + u32 curr_pos = pb.src.cur_addr_frac; + + // These are the two samples between which we interpolate. The initial + // values are stored in the PB, and we update them when resampling the + // input data. + s16 curr0 = pb.src.last_samples[2]; + s16 curr1 = pb.src.last_samples[3]; + + for (u32 i = 0; i < 32; ++i) + { + // Get our current fractional position, used to know how much of + // curr0 and how much of curr1 the output sample should be. + s32 curr_frac_pos = curr_pos & 0xFFFF; + + // Linear interpolation: s1 + (s2 - s1) * pos + s16 sample = curr0 + (s16)(((curr1 - curr0) * (s32)curr_frac_pos) >> 16); + samples[i] = sample; + + curr_pos += ratio; + + // While our current position is >= 1.0, shift to the next 2 + // samples for interpolation. + while ((curr_pos >> 16) != 0) + { + curr0 = curr1; + curr1 = AcceleratorGetSample(); + curr_pos -= 0x10000; + } + } + + // Update the two last_samples values in the PB as well as the current + // position. + pb.src.last_samples[2] = curr0; + pb.src.last_samples[3] = curr1; + pb.src.cur_addr_frac = curr_pos & 0xFFFF; + } + else // SRCTYPE_NEAREST + { + // No sample rate conversion here: simply read 32 samples from the + // accelerator to the output buffer. + for (u32 i = 0; i < 32; ++i) + samples[i] = AcceleratorGetSample(); + + memcpy(pb.src.last_samples, samples + 28, 4 * sizeof (u16)); + } + + // Update current position in the PB. + pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16); + pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF); +} + +// Add samples to an output buffer, with optional volume ramping. +void MixAdd(int* out, const s16* input, u16* pvol, s16* dpop, bool ramp) +{ + u16& volume = pvol[0]; + u16 volume_delta = pvol[1]; + + // If volume ramping is disabled, set volume_delta to 0. That way, the + // mixing loop can avoid testing if volume ramping is enabled at each step, + // and just add volume_delta. + if (!ramp) + volume_delta = 0; + + for (u32 i = 0; i < 32; ++i) + { + s64 sample = input[i]; + sample *= volume; + sample >>= 15; + + out[i] += (s16)sample; + volume += volume_delta; + + *dpop = (s16)sample; + } +} + +// Process 1ms of audio (32 samples) from a PB and mix it to the buffers. +void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl) +{ + // If the voice is not running, nothing to do. + if (!pb.running) + return; + + // Read input samples, performing sample rate conversion if needed. + s16 samples[32]; + GetInputSamples(pb, samples); + + // Apply a global volume ramp using the volume envelope parameters. + for (u32 i = 0; i < 32; ++i) + { + s64 sample = 2 * (s16)samples[i] * (s16)pb.vol_env.cur_volume; + samples[i] = (s16)(sample >> 16); + pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta; + } + + // Optionally, execute a low pass filter + if (pb.lpf.enabled) + { + // TODO + } + + // Mix LRS, AUXA and AUXB depending on mixer_control + // TODO: Handle DPL2 on AUXB. + + if (mctrl & MIX_L) + MixAdd(buffers.left, samples, &pb.mixer.left, &pb.dpop.left, mctrl & MIX_L_RAMP); + if (mctrl & MIX_R) + MixAdd(buffers.right, samples, &pb.mixer.right, &pb.dpop.right, mctrl & MIX_R_RAMP); + if (mctrl & MIX_S) + MixAdd(buffers.surround, samples, &pb.mixer.surround, &pb.dpop.surround, mctrl & MIX_S_RAMP); + + if (mctrl & MIX_AUXA_L) + MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, &pb.dpop.auxA_left, mctrl & MIX_AUXA_L_RAMP); + if (mctrl & MIX_AUXA_R) + MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, &pb.dpop.auxA_right, mctrl & MIX_AUXA_R_RAMP); + if (mctrl & MIX_AUXA_S) + MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, &pb.dpop.auxA_surround, mctrl & MIX_AUXA_S_RAMP); + + if (mctrl & MIX_AUXB_L) + MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, &pb.dpop.auxB_left, mctrl & MIX_AUXB_L_RAMP); + if (mctrl & MIX_AUXB_R) + MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, &pb.dpop.auxB_right, mctrl & MIX_AUXB_R_RAMP); + if (mctrl & MIX_AUXB_S) + MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, &pb.dpop.auxB_surround, mctrl & MIX_AUXB_S_RAMP); + +#ifdef AX_WII + if (mctrl & MIX_AUXC_L) + MixAdd(buffers.auxC_left, samples, &pb.mixer.auxC_left, &pb.dpop.auxC_left, mctrl & MIX_AUXC_L_RAMP); + if (mctrl & MIX_AUXC_R) + MixAdd(buffers.auxC_right, samples, &pb.mixer.auxC_right, &pb.dpop.auxC_right, mctrl & MIX_AUXC_R_RAMP); + if (mctrl & MIX_AUXC_S) + MixAdd(buffers.auxC_surround, samples, &pb.mixer.auxC_surround, &pb.dpop.auxC_surround, mctrl & MIX_AUXC_S_RAMP); +#endif + + // Optionally, phase shift left or right channel to simulate 3D sound. + if (pb.initial_time_delay.on) + { + // TODO + } +} + +} // namespace + +#endif // !_UCODE_AX_VOICE_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp new file mode 100644 index 0000000000..40ad6e1947 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp @@ -0,0 +1,383 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "StringUtil.h" + +#include "../MailHandler.h" +#include "Mixer.h" + +#include "UCodes.h" +#include "UCode_AX_Structs.h" +#include "UCode_NewAXWii.h" + +#define AX_WII +#include "UCode_AX_Voice.h" + + +CUCode_NewAXWii::CUCode_NewAXWii(DSPHLE *dsp_hle, u32 l_CRC) + : CUCode_AX(dsp_hle, l_CRC) +{ + WARN_LOG(DSPHLE, "Instantiating CUCode_NewAXWii"); +} + +CUCode_NewAXWii::~CUCode_NewAXWii() +{ +} + +void CUCode_NewAXWii::HandleCommandList() +{ + // Temp variables for addresses computation + u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; + u16 volume; + +// WARN_LOG(DSPHLE, "Command list:"); +// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) +// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); +// WARN_LOG(DSPHLE, "-------------"); + + u32 curr_idx = 0; + bool end = false; + while (!end) + { + u16 cmd = m_cmdlist[curr_idx++]; + + switch (cmd) + { + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_SETUP: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); + break; + + case CMD_UNK_01: curr_idx += 2; break; + case CMD_UNK_02: curr_idx += 2; break; + case CMD_UNK_03: curr_idx += 2; break; + + case CMD_PROCESS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + ProcessPBList(HILO_TO_32(addr)); + break; + + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + case CMD_MIX_AUXC: + volume = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume); + break; + + // These two go together and manipulate some AUX buffers. + case CMD_UNK_08: curr_idx += 13; break; + case CMD_UNK_09: curr_idx += 13; break; + + case CMD_UNK_0A: curr_idx += 4; break; + + case CMD_OUTPUT: + volume = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume); + break; + + case CMD_UNK_0C: curr_idx += 5; break; + + case CMD_WM_OUTPUT: + { + u32 addresses[4] = { + (u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1], + (u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3], + (u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5], + (u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7], + }; + curr_idx += 8; + OutputWMSamples(addresses); + break; + } + + case CMD_END: + end = true; + break; + } + } +} + +void CUCode_NewAXWii::SetupProcessing(u32 init_addr) +{ + // TODO: should be easily factorizable with AX + s16 init_data[60]; + + for (u32 i = 0; i < 60; ++i) + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); + + // List of all buffers we have to initialize + struct { + int* ptr; + u32 samples; + } buffers[] = { + { m_samples_left, 32 }, + { m_samples_right, 32 }, + { m_samples_surround, 32 }, + { m_samples_auxA_left, 32 }, + { m_samples_auxA_right, 32 }, + { m_samples_auxA_surround, 32 }, + { m_samples_auxB_left, 32 }, + { m_samples_auxB_right, 32 }, + { m_samples_auxB_surround, 32 }, + { m_samples_auxC_left, 32 }, + { m_samples_auxC_right, 32 }, + { m_samples_auxC_surround, 32 }, + + { m_samples_wm0, 6 }, + { m_samples_aux0, 6 }, + { m_samples_wm1, 6 }, + { m_samples_aux1, 6 }, + { m_samples_wm2, 6 }, + { m_samples_aux2, 6 }, + { m_samples_wm3, 6 }, + { m_samples_aux3, 6 } + }; + + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) + { + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i].ptr, 0, 3 * buffers[i].samples * sizeof (int)); + else + { + for (u32 j = 0; j < 3 * buffers[i].samples; ++j) + { + buffers[i].ptr[j] = init_val; + init_val += delta; + } + } + } +} + +AXMixControl CUCode_NewAXWii::ConvertMixerControl(u32 mixer_control) +{ + u32 ret = 0; + + if (mixer_control & 0x00000001) ret |= MIX_L; + if (mixer_control & 0x00000002) ret |= MIX_R; + if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP; + if (mixer_control & 0x00000008) ret |= MIX_S; + if (mixer_control & 0x00000010) ret |= MIX_S_RAMP; + if (mixer_control & 0x00010000) ret |= MIX_AUXA_L; + if (mixer_control & 0x00020000) ret |= MIX_AUXA_R; + if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x00080000) ret |= MIX_AUXA_S; + if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x00200000) ret |= MIX_AUXB_L; + if (mixer_control & 0x00400000) ret |= MIX_AUXB_R; + if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x01000000) ret |= MIX_AUXB_S; + if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP; + if (mixer_control & 0x04000000) ret |= MIX_AUXC_L; + if (mixer_control & 0x08000000) ret |= MIX_AUXC_R; + if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP; + if (mixer_control & 0x20000000) ret |= MIX_AUXC_S; + if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP; + + return (AXMixControl)ret; +} + +void CUCode_NewAXWii::ProcessPBList(u32 pb_addr) +{ + const u32 spms = 32; + + AXPBWii pb; + + while (pb_addr) + { + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround, + m_samples_auxC_left, + m_samples_auxC_right, + m_samples_auxC_surround + }}; + + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 3; ++curr_ms) + { + Process1ms(pb, buffers, ConvertMixerControl(HILO_TO_32(pb.mixer_control))); + + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; + } + + WritePB(pb_addr, pb); + pb_addr = HILO_TO_32(pb.next_pb); + } +} + +void CUCode_NewAXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume) +{ + int* buffers[3] = { 0 }; + int* main_buffers[3] = { + m_samples_left, + m_samples_right, + m_samples_surround + }; + + switch (aux_id) + { + case 0: + buffers[0] = m_samples_auxA_left; + buffers[1] = m_samples_auxA_right; + buffers[2] = m_samples_auxA_surround; + break; + + case 1: + buffers[0] = m_samples_auxB_left; + buffers[1] = m_samples_auxB_right; + buffers[2] = m_samples_auxB_surround; + break; + + case 2: + buffers[0] = m_samples_auxC_left; + buffers[1] = m_samples_auxC_right; + buffers[2] = m_samples_auxC_surround; + break; + } + + // Send the content of AUX buffers to the CPU + if (write_addr) + { + int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) + *ptr++ = Common::swap32(buffers[i][j]); + } + + // Then read the buffers from the CPU and add to our main buffers. + int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) + { + s64 new_val = main_buffers[i][j] + Common::swap32(*ptr++); + main_buffers[i][j] = (new_val * volume) >> 15; + } +} + +void CUCode_NewAXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) +{ + int surround_buffer[3 * 32] = { 0 }; + + for (u32 i = 0; i < 3 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + + short buffer[3 * 32 * 2]; + + // Clamp internal buffers to 16 bits. + for (u32 i = 0; i < 3 * 32; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + // Apply global volume. Cast to s64 to avoid overflow. + left = ((s64)left * volume) >> 15; + right = ((s64)right * volume) >> 15; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + m_samples_left[i] = left; + m_samples_right[i] = right; + } + + for (u32 i = 0; i < 3 * 32; ++i) + { + buffer[2 * i] = Common::swap16(m_samples_left[i]); + buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + } + + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); +} + +void CUCode_NewAXWii::OutputWMSamples(u32* addresses) +{ + int* buffers[] = { + m_samples_wm0, + m_samples_wm1, + m_samples_wm2, + m_samples_wm3 + }; + + for (u32 i = 0; i < 4; ++i) + { + int* in = buffers[i]; + u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]); + for (u32 j = 0; j < 3 * 6; ++j) + { + int sample = in[j]; + if (sample < -32767) sample = -32767; + if (sample > 32767) sample = 32767; + out[j] = Common::swap16((u16)sample); + } + } +} + +void CUCode_NewAXWii::DoState(PointerWrap &p) +{ + std::lock_guard lk(m_processing); + + DoStateShared(p); + DoAXState(p); + + p.Do(m_samples_auxC_left); + p.Do(m_samples_auxC_right); + p.Do(m_samples_auxC_surround); + + p.Do(m_samples_wm0); + p.Do(m_samples_wm1); + p.Do(m_samples_wm2); + p.Do(m_samples_wm3); + + p.Do(m_samples_aux0); + p.Do(m_samples_aux1); + p.Do(m_samples_aux2); + p.Do(m_samples_aux3); +} diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h new file mode 100644 index 0000000000..4c9bc5757c --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h @@ -0,0 +1,80 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_NEWAXWII_H +#define _UCODE_NEWAXWII_H + +#include "UCode_AX.h" + +class CUCode_NewAXWii : public CUCode_AX +{ +public: + CUCode_NewAXWii(DSPHLE *dsp_hle, u32 _CRC); + virtual ~CUCode_NewAXWii(); + + virtual void DoState(PointerWrap &p); + +protected: + int m_samples_auxC_left[32 * 3]; + int m_samples_auxC_right[32 * 3]; + int m_samples_auxC_surround[32 * 3]; + + // Wiimote buffers + int m_samples_wm0[6 * 3]; + int m_samples_aux0[6 * 3]; + int m_samples_wm1[6 * 3]; + int m_samples_aux1[6 * 3]; + int m_samples_wm2[6 * 3]; + int m_samples_aux2[6 * 3]; + int m_samples_wm3[6 * 3]; + int m_samples_aux3[6 * 3]; + + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + + virtual void HandleCommandList(); + + void SetupProcessing(u32 init_addr); + void ProcessPBList(u32 pb_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume); + void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); + void OutputWMSamples(u32* addresses); // 4 addresses + +private: + enum CmdType + { + CMD_SETUP = 0x00, + CMD_UNK_01 = 0x01, + CMD_UNK_02 = 0x02, + CMD_UNK_03 = 0x03, + CMD_PROCESS = 0x04, + CMD_MIX_AUXA = 0x05, + CMD_MIX_AUXB = 0x06, + CMD_MIX_AUXC = 0x07, + CMD_UNK_08 = 0x08, + CMD_UNK_09 = 0x09, + CMD_UNK_0A = 0x0A, + CMD_OUTPUT = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_WM_OUTPUT = 0x0D, + CMD_END = 0x0E + }; +}; + +#endif // _UCODE_AXWII diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp index c04bf41403..86773ad020 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp @@ -19,6 +19,7 @@ #include "UCode_AX.h" #include "UCode_AXWii.h" +#include "UCode_NewAXWii.h" #include "UCode_Zelda.h" #include "UCode_ROM.h" #include "UCode_CARD.h" @@ -26,6 +27,12 @@ #include "UCode_GBA.h" #include "Hash.h" +#if 0 +# define AXWII CUCode_NewAXWii +#else +# define AXWII CUCode_AXWii +#endif + IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) { switch (_CRC) @@ -90,13 +97,13 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) case 0x4cc52064: // Bleach: Versus Crusade case 0xd9c4bf34: // WiiMenu INFO_LOG(DSPHLE, "CRC %08x: Wii - AXWii chosen", _CRC); - return new CUCode_AXWii(dsp_hle, _CRC); + return new AXWII(dsp_hle, _CRC); default: if (bWii) { PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE emulator if this is homebrew.", _CRC); - return new CUCode_AXWii(dsp_hle, _CRC); + return new AXWII(dsp_hle, _CRC); } else { diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp index 2e2816ae77..58534f137a 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp @@ -134,7 +134,7 @@ void DSPDebugInterface::toggleMemCheck(unsigned int address) PanicAlert("MemCheck functionality not supported in DSP module."); } -void DSPDebugInterface::insertBLR(unsigned int address) +void DSPDebugInterface::insertBLR(unsigned int address, unsigned int value) { PanicAlert("insertBLR functionality not supported in DSP module."); } diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h index 5ace467ae6..dafe91f28b 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h @@ -27,7 +27,7 @@ public: virtual void setPC(unsigned int address); virtual void step() {} virtual void runToBreakpoint(); - virtual void insertBLR(unsigned int address); + virtual void insertBLR(unsigned int address, unsigned int value); virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); }; diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index a44ff65f21..2cbf39f457 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -26,6 +26,7 @@ #include "IniFile.h" #include "ConfigManager.h" #include "CPUDetect.h" +#include "Core.h" #include "DSPLLEGlobals.h" // Local #include "DSP/DSPInterpreter.h" @@ -56,6 +57,14 @@ Common::Event ppcEvent; void DSPLLE::DoState(PointerWrap &p) { + bool isHLE = false; + p.Do(isHLE); + if (isHLE != false && p.GetMode() == PointerWrap::MODE_READ) + { + Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000); + p.SetMode(PointerWrap::MODE_VERIFY); + return; + } p.Do(g_dsp.r); p.Do(g_dsp.pc); #if PROFILE @@ -104,27 +113,6 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) { Common::SetCurrentThreadName("DSP thread"); - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads) - { - if (cpu_info.num_cores > 3) - { - // HACK (delroth): there is no way to know where hyperthreads are in - // the current Dolphin version. - bool windows = false; -#ifdef _WIN32 - windows = true; -#endif - - u8 core_id; - if (windows && cpu_info.num_cores > 4) // Probably HT - core_id = 5; // 3rd non HT core - else - core_id = 3; // 3rd core - - Common::SetCurrentThreadAffinity(1 << (core_id - 1)); - } - } - while (dsp_lle->m_bIsRunning) { int cycles = (int)dsp_lle->m_cycle_count; @@ -204,7 +192,7 @@ void DSPLLE::InitMixer() unsigned int AISampleRate, DACSampleRate; AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate); delete soundStream; - soundStream = AudioCommon::InitSoundStream(new CMixer(AISampleRate, DACSampleRate, ac_Config.iFrequency), m_hWnd); + soundStream = AudioCommon::InitSoundStream(new CMixer(AISampleRate, DACSampleRate, 48000), m_hWnd); if(!soundStream) PanicAlert("Error starting up sound stream"); // Mixer is initialized m_InitMixer = true; diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp index f2b387fbd6..214fb5dc02 100644 --- a/Source/Core/Core/Src/HW/DVDInterface.cpp +++ b/Source/Core/Core/Src/HW/DVDInterface.cpp @@ -29,6 +29,7 @@ #include "Memmap.h" #include "../VolumeHandler.h" #include "AudioInterface.h" +#include "../Movie.h" // Disc transfer rate measured in bytes per second static const u32 DISC_TRANSFER_RATE_GC = 3125 * 1024; @@ -334,6 +335,17 @@ void ChangeDisc(const char* _newFileName) std::string* _FileName = new std::string(_newFileName); CoreTiming::ScheduleEvent_Threadsafe(0, ejectDisc); CoreTiming::ScheduleEvent_Threadsafe(500000000, insertDisc, (u64)_FileName); + if (Movie::IsRecordingInput()) + { + Movie::g_bDiscChange = true; + std::string fileName = _newFileName; + int sizeofpath = fileName.find_last_of("/\\") + 1; + if (fileName.substr(sizeofpath).length() > 40) + { + PanicAlert("Saving iso filename to .dtm failed; max file name length is 40 characters."); + } + Movie::g_discChange = fileName.substr(sizeofpath); + } } void SetLidOpen(bool _bOpen) diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp index 8800ea6095..1e86bd1b90 100644 --- a/Source/Core/Core/Src/HW/EXI.cpp +++ b/Source/Core/Core/Src/HW/EXI.cpp @@ -25,6 +25,7 @@ #include "EXI.h" #include "Sram.h" +#include "../Movie.h" SRAM g_SRAM; namespace ExpansionInterface @@ -44,7 +45,12 @@ void Init() for (u32 i = 0; i < NUM_CHANNELS; i++) g_Channels[i] = new CEXIChannel(i); - g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA + if (Movie::IsPlayingInput() && Movie::IsUsingMemcard() && Movie::IsConfigSaved()) + g_Channels[0]->AddDevice(EXIDEVICE_MEMORYCARD, 0); // SlotA + else if(Movie::IsPlayingInput() && !Movie::IsUsingMemcard() && Movie::IsConfigSaved()) + g_Channels[0]->AddDevice(EXIDEVICE_NONE, 0); // SlotA + else + g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA g_Channels[0]->AddDevice(EXIDEVICE_MASKROM, 1); g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2], 2); // Serial Port 1 g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1], 0); // SlotB diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp index 4197d01350..50c7de4cd2 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp @@ -290,7 +290,7 @@ bool CEXIETHERNET::IsWriteCommand(u32 const data) return IsMXCommand(data) ? !!(data & (1 << 30)) : !!(data & (1 << 14)); } -char const * const CEXIETHERNET::GetRegisterName() const +const char* CEXIETHERNET::GetRegisterName() const { #define STR_RETURN(x) case x: return #x; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h index 6a3a552f38..0ee352eea5 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h @@ -297,7 +297,7 @@ public: bool IsMXCommand(u32 const data); bool IsWriteCommand(u32 const data); - char const * const GetRegisterName() const; + const char* GetRegisterName() const; void MXHardReset(); void MXCommandHandler(u32 data, u32 size); void DirectFIFOWrite(u8 *data, u32 size); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index 93b7cd5d09..26e220d7cf 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -98,8 +98,8 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill) client_running = false; clientThread.join(); - recv_fifo = std::queue(); - send_fifo = std::queue(); + recv_fifo = std::deque(); + send_fifo = std::deque(); } clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this); client_count++; @@ -120,28 +120,39 @@ void GeckoSockServer::ClientThread() while (client_running) { - u8 data; - std::size_t got = 0; + bool did_nothing = true; { std::lock_guard lk(transfer_lock); - if (client.Receive((char*)&data, sizeof(data), got) - == sf::Socket::Disconnected) + // what's an ideal buffer size? + char data[128]; + std::size_t got = 0; + + if (client.Receive(&data[0], ARRAYSIZE(data), got) == sf::Socket::Disconnected) client_running = false; - if (got) - recv_fifo.push(data); - - if (send_fifo.size()) + + if (got != 0) { - if (client.Send((char*)&send_fifo.front(), sizeof(u8)) - == sf::Socket::Disconnected) + did_nothing = false; + + recv_fifo.insert(recv_fifo.end(), &data[0], &data[got]); + } + + if (!send_fifo.empty()) + { + did_nothing = false; + + std::vector packet(send_fifo.begin(), send_fifo.end()); + send_fifo.clear(); + + if (client.Send(&packet[0], packet.size()) == sf::Socket::Disconnected) client_running = false; - send_fifo.pop(); } } // unlock transfer - SLEEP(1); + if (did_nothing) + Common::YieldCPU(); } client.Close(); @@ -180,7 +191,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize) if (!recv_fifo.empty()) { _uData = 0x08000000 | (recv_fifo.front() << 16); - recv_fifo.pop(); + recv_fifo.pop_front(); } break; } @@ -190,7 +201,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize) case CMD_SEND: { std::lock_guard lk(transfer_lock); - send_fifo.push(_uData >> 20); + send_fifo.push_back(_uData >> 20); _uData = 0x04000000; break; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h index 9b427e21c8..da055b3c8a 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h @@ -20,6 +20,8 @@ #include "SFML/Network.hpp" #include "Thread.h" + +#include #include class GeckoSockServer @@ -36,8 +38,8 @@ public: std::thread clientThread; std::mutex transfer_lock; - std::queue send_fifo; - std::queue recv_fifo; + std::deque send_fifo; + std::deque recv_fifo; private: static int client_count; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h index 4788f21adb..bce8fee9ed 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h @@ -78,7 +78,7 @@ private: virtual void TransferByte(u8 &_uByte); bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } - u32 const CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } + u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } void LoadFileToIPL(std::string filename, u32 offset); }; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 4705e849be..c157e55d1b 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -47,22 +47,16 @@ void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate) pThis->Flush(); } -void CEXIMemoryCard::CmdDoneCallback(u64 userdata, int cyclesLate) -{ - int card_index = (int)userdata; - CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index); - if (pThis) - pThis->CmdDone(); -} - CEXIMemoryCard::CEXIMemoryCard(const int index) : card_index(index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; + if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave()) + m_strFilename = "Movie.raw"; + // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential - et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardFlushA" : "memcardFlushB", FlushCallback); - et_cmd_done = CoreTiming::RegisterEvent((card_index == 0) ? "memcardDoneA" : "memcardDoneB", CmdDoneCallback); + et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardA" : "memcardB", FlushCallback); interruptSwitch = 0; m_bInterruptSet = 0; @@ -184,21 +178,6 @@ bool CEXIMemoryCard::IsPresent() return true; } -void CEXIMemoryCard::CmdDone() -{ - status |= MC_STATUS_READY; - status &= ~MC_STATUS_BUSY; - - m_bInterruptSet = 1; - m_bDirty = true; -} - -void CEXIMemoryCard::CmdDoneLater(u64 cycles) -{ - CoreTiming::RemoveEvent(et_cmd_done); - CoreTiming::ScheduleEvent(cycles, et_cmd_done, (u64)card_index); -} - void CEXIMemoryCard::SetCS(int cs) { // So that memory card won't be invalidated during flushing @@ -222,7 +201,11 @@ void CEXIMemoryCard::SetCS(int cs) //??? - CmdDoneLater(5000); + status |= MC_STATUS_READY; + status &= ~MC_STATUS_BUSY; + + m_bInterruptSet = 1; + m_bDirty = true; } break; @@ -249,7 +232,11 @@ void CEXIMemoryCard::SetCS(int cs) address = (address & ~0x1FF) | ((address+1) & 0x1FF); } - CmdDoneLater(5000); + status |= MC_STATUS_READY; + status &= ~MC_STATUS_BUSY; + + m_bInterruptSet = 1; + m_bDirty = true; } // Page written to memory card, not just to buffer - let's schedule a flush 0.5b cycles into the future (1 sec) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index 33b94ca530..dfdc6349aa 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -47,18 +47,9 @@ private: // through the userdata parameter, so that it can then call Flush on the right card. static void FlushCallback(u64 userdata, int cyclesLate); - // Scheduled when a command that required delayed end signaling is done. - static void CmdDoneCallback(u64 userdata, int cyclesLate); - // Flushes the memory card contents to disk. void Flush(bool exiting = false); - // Signals that the command that was previously executed is now done. - void CmdDone(); - - // Variant of CmdDone which schedules an event later in the future to complete the command. - void CmdDoneLater(u64 cycles); - enum { cmdNintendoID = 0x00, @@ -80,7 +71,7 @@ private: std::string m_strFilename; int card_index; - int et_this_card, et_cmd_done; + int et_this_card; //! memory card state // STATE_TO_SAVE diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 5ba0c2aaa6..dd15a32914 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -265,7 +265,7 @@ bool GCMemcard::Save() mcdFile.WriteBytes(&dir_backup, BLOCK_SIZE); mcdFile.WriteBytes(&bat, BLOCK_SIZE); mcdFile.WriteBytes(&bat_backup, BLOCK_SIZE); - for (int i = 0; i < maxBlock - MC_FST_BLOCKS; ++i) + for (unsigned int i = 0; i < maxBlock - MC_FST_BLOCKS; ++i) { mcdFile.WriteBytes(mc_data_blocks[i].block, BLOCK_SIZE); } @@ -473,11 +473,20 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const return format; } -u16 GCMemcard::DEntry_AnimSpeed(u8 index) const +std::string GCMemcard::DEntry_AnimSpeed(u8 index) const { if (!m_valid || index > DIRLEN) - return 0xFF; - return BE16(CurrentDir->Dir[index].AnimSpeed); + return ""; + int x = CurrentDir->Dir[index].AnimSpeed[0]; + std::string speed; + for(int i = 0; i < 16; i++) + { + if (i == 8) x = CurrentDir->Dir[index].AnimSpeed[1]; + speed.push_back((x & 0x80) ? '1' : '0'); + x = x << 1; + } + speed.push_back(0); + return speed; } std::string GCMemcard::DEntry_Permissions(u8 index) const @@ -578,7 +587,7 @@ u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const for (u16 i = StartingBlock; i < BAT_SIZE; ++i) if (Map[i-MC_FST_BLOCKS] == 0) return i; - for (u16 i = 0; i < StartingBlock; ++i) + for (u16 i = MC_FST_BLOCKS; i < StartingBlock; ++i) if (Map[i-MC_FST_BLOCKS] == 0) return i; } @@ -600,7 +609,7 @@ bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount) { return false; } - for (int i = 0; i < length; ++i) + for (unsigned int i = 0; i < length; ++i) Map[blocks.at(i)-MC_FST_BLOCKS] = 0; FreeBlocks = BE16(BE16(FreeBlocks) + BlockCount); @@ -616,7 +625,7 @@ u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const u16 block = DEntry_FirstBlock(index); u16 BlockCount = DEntry_BlockCount(index); - u16 memcardSize = BE16(hdr.SizeMb) * MBIT_TO_BLOCKS; + //u16 memcardSize = BE16(hdr.SizeMb) * MBIT_TO_BLOCKS; if ((block == 0xFFFF) || (BlockCount == 0xFFFF)) { @@ -660,12 +669,10 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) Directory UpdatedDir = *CurrentDir; // find first free dir entry - int index = -1; for (int i=0; i < DIRLEN; i++) { if (BE32(UpdatedDir.Dir[i].Gamecode) == 0xFFFFFFFF) { - index = i; UpdatedDir.Dir[i] = direntry; *(u16*)&UpdatedDir.Dir[i].FirstBlock = BE16(firstBlock); UpdatedDir.Dir[i].CopyCounter = UpdatedDir.Dir[i].CopyCounter+1; @@ -687,6 +694,8 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) int fileBlocks = BE16(direntry.BlockCount); + FZEROGX_MakeSaveGameValid(direntry, saveBlocks); + PSO_MakeSaveGameValid(direntry, saveBlocks); BlockAlloc UpdatedBat = *CurrentBat; u16 nextBlock; @@ -876,7 +885,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s std::vector saveData; saveData.reserve(size); - for (int i = 0; i < size; ++i) + for (unsigned int i = 0; i < size; ++i) { GCMBlock b; gci.ReadBytes(b.block, BLOCK_SIZE); @@ -989,7 +998,7 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire return NOMEMCARD; } gci.Seek(DENTRY_SIZE + offset, SEEK_SET); - for (int i = 0; i < size; ++i) + for (unsigned int i = 0; i < size; ++i) { gci.WriteBytes(saveData[i].block, BLOCK_SIZE); } @@ -1084,15 +1093,18 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const // To ensure only one type of icon is used // Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon - int fmtCheck = 0; + //int fmtCheck = 0; int formats = BE16(CurrentDir->Dir[index].IconFmt); int fdelays = BE16(CurrentDir->Dir[index].AnimSpeed); int flags = CurrentDir->Dir[index].BIFlags; - // Timesplitters 2 is the only game that I see this in + // Timesplitters 2 and 3 is the only game that I see this in // May be a hack - if (flags == 0xFB) flags = ~flags; + //if (flags == 0xFB) flags = ~flags; + // Batten Kaitos has 0x65 as flag too. Everything but the first 3 bytes seems irrelevant. + // Something similar happens with Wario Ware Inc. AnimSpeed + int bnrFormat = (flags&3); u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); @@ -1108,7 +1120,6 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const switch (bnrFormat) { case 1: - case 3: animData += 96*32 + 2*256; // image+palette break; case 2: @@ -1120,40 +1131,48 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const u8* data[8]; int frames = 0; - for (int i = 0; i < 8; i++) { fmts[i] = (formats >> (2*i))&3; - delays[i] = ((fdelays >> (2*i))&3) << 2; + delays[i] = ((fdelays >> (2*i))&3); data[i] = animData; - if (!fmtCheck) fmtCheck = fmts[i]; - if (fmtCheck == fmts[i]) + if (!delays[i]) + { + //First icon_speed = 0 indicates there aren't any more icons + break; + } + //If speed is set there is an icon (it can be a "blank frame") + frames++; + if (fmts[i] != 0) { switch (fmts[i]) { case CI8SHARED: // CI8 with shared palette animData += 32*32; - frames++; break; case RGB5A3: // RGB5A3 animData += 32*32*2; - frames++; break; case CI8: // CI8 with own palette animData += 32*32 + 2*256; - frames++; break; } } } u16* sharedPal = (u16*)(animData); + int j = 0; for (int i = 0; i < 8; i++) { - if (fmtCheck == fmts[i]) + if (!delays[i]) + { + //First icon_speed = 0 indicates there aren't any more icons + break; + } + if (fmts[i] != 0) { switch (fmts[i]) { @@ -1163,6 +1182,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const break; case RGB5A3: // RGB5A3 decode5A3image(buffer, (u16*)(data[i]), 32, 32); + buffer += 32*32; break; case CI8: // CI8 with own palette u16 *paldata = (u16*)(data[i] + 32*32); @@ -1171,6 +1191,33 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const break; } } + else + { + //Speed is set but there's no actual icon + //This is used to reduce animation speed in Pikmin and Luigi's Mansion for example + //These "blank frames" show the next icon + for(j=i; j<8;++j) + { + if (fmts[j] != 0) + { + switch (fmts[j]) + { + case CI8SHARED: // CI8 with shared palette + decodeCI8image(buffer,data[j],sharedPal,32,32); + break; + case RGB5A3: // RGB5A3 + decode5A3image(buffer, (u16*)(data[j]), 32, 32); + buffer += 32*32; + break; + case CI8: // CI8 with own palette + u16 *paldata = (u16*)(data[j] + 32*32); + decodeCI8image(buffer, data[j], paldata, 32, 32); + buffer += 32*32; + break; + } + } + } + } } return frames; @@ -1266,3 +1313,129 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) calc_checksumsBE((u16*)p_bat+2, 0xFFE, &p_bat->Checksum, &p_bat->Checksum_Inv); calc_checksumsBE((u16*)p_bat_backup+2, 0xFFE, &p_bat_backup->Checksum, &p_bat_backup->Checksum_Inv); } + +void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2) +{ + u32 serial[8]; + int i; + for (i = 0; i < 8; i++) + { + memcpy(&serial[i], (u8 *) &hdr+(i*4), 4); + } + + *serial1 = serial[0]^serial[2]^serial[4]^serial[6]; + *serial2 = serial[1]^serial[3]^serial[5]^serial[7]; +} + + +/*************************************************************/ +/* FZEROGX_MakeSaveGameValid */ +/* (use just before writing a F-Zero GX system .gci file) */ +/* */ +/* chn: Destination memory card port */ +/* ret: Error code */ +/*************************************************************/ + +s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) +{ + u32 i,j; + u32 serial1,serial2; + u16 chksum = 0xFFFF; + int block = 0; + + // check for F-Zero GX system file + if (strcmp((char*)direntry.Filename,"f_zero.dat")!=0) return 0; + + // get encrypted destination memory card serial numbers + CARD_GetSerialNo(&serial1,&serial2); + + // set new serial numbers + *(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16); + *(u16*)&FileBuffer[3].block[0x1580] = BE16(BE32(serial2) >> 16); + *(u16*)&FileBuffer[1].block[0x0060] = BE16(BE32(serial1) & 0xFFFF); + *(u16*)&FileBuffer[1].block[0x0200] = BE16(BE32(serial2) & 0xFFFF); + + // calc 16-bit checksum + for (i=0x02;i<0x8000;i++) + { + chksum ^= (FileBuffer[block].block[i-(block*0x2000)]&0xFF); + for (j=8; j > 0; j--) + { + if (chksum&1) chksum = (chksum>>1)^0x8408; + else chksum >>= 1; + } + if (!(i%0x2000)) block ++; + } + + // set new checksum + *(u16*)&FileBuffer[0].block[0x00] = BE16(~chksum); + + return 1; +} + +/***********************************************************/ +/* PSO_MakeSaveGameValid */ +/* (use just before writing a PSO system .gci file) */ +/* */ +/* chn: Destination memory card port */ +/* ret: Error code */ +/***********************************************************/ + +s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) +{ + u32 i,j; + u32 chksum; + u32 crc32LUT[256]; + u32 serial1,serial2; + u32 pso3offset = 0x00; + + // check for PSO1&2 system file + if (strcmp((char*)direntry.Filename,"PSO_SYSTEM")!=0) + { + // check for PSO3 system file + if (strcmp((char*)direntry.Filename,"PSO3_SYSTEM")==0) + { + // PSO3 data block size adjustment + pso3offset = 0x10; + } + else + { + // nothing to do + return 0; + } + } + + // get encrypted destination memory card serial numbers + CARD_GetSerialNo(&serial1,&serial2); + + // set new serial numbers + *(u32*)&FileBuffer[1].block[0x0158] = serial1; + *(u32*)&FileBuffer[1].block[0x015C] = serial2; + + // generate crc32 LUT + for (i=0; i < 256; i++) + { + chksum = i; + for (j=8; j > 0; j--) + { + if (chksum&1) chksum = (chksum>>1)^0xEDB88320; + else chksum >>= 1; + } + + crc32LUT[i] = chksum; + } + + // PSO initial crc32 value + chksum = 0xDEBB20E3; + + // calc 32-bit checksum + for (i=0x004C; i < 0x0164+pso3offset; i++) + { + chksum = ((chksum>>8)&0xFFFFFF)^crc32LUT[(chksum^FileBuffer[1].block[i])&0xFF]; + } + + // set new checksum + *(u32*)&FileBuffer[1].block[0x0048] = BE32(chksum^0xFFFFFFFF); + + return 1; +} diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index be78bb527c..557187b384 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -116,8 +116,8 @@ private: // bits 0 and 1: image format // 00 no banner // 01 CI8 banner - // 01 RGB5A3 banner - // 11 ? maybe ==01? haven't seen it + // 10 RGB5A3 banner + // 11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner // u8 Filename[DENTRY_STRLEN]; //0x08 0x20 filename u8 ModTime[4]; //0x28 0x04 Time of file's last modification in seconds since 12am, January 1st, 2000 @@ -213,7 +213,7 @@ public: u32 DEntry_ModTime(u8 index) const; u32 DEntry_ImageOffset(u8 index) const; std::string DEntry_IconFmt(u8 index) const; - u16 DEntry_AnimSpeed(u8 index) const; + std::string DEntry_AnimSpeed(u8 index) const; std::string DEntry_Permissions(u8 index) const; u8 DEntry_CopyCounter(u8 index) const; // get first block for file @@ -256,6 +256,10 @@ public: // reads the animation frames u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const; + + void CARD_GetSerialNo(u32 *serial1,u32 *serial2); + s32 FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer); + s32 PSO_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer); }; #endif diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 4c1b4dabdd..c4798b3964 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -20,6 +20,7 @@ #include "ControllerInterface/ControllerInterface.h" #include "GCPadEmu.h" +#include "../ConfigManager.h" #include "../../InputCommon/Src/InputConfig.h" @@ -55,7 +56,7 @@ void Initialize(void* const hwnd) g_controller_interface.Initialize(); // load the saved controller config - g_plugin.LoadConfig(); + g_plugin.LoadConfig(true); } void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) @@ -101,7 +102,36 @@ void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) { // TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time // set rumble - ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput( 1 == _uType && _uStrength > 2 ); + if (1 == _uType && _uStrength > 2) + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(255); + } + else + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(0); + } + } +} + +// __________________________________________________________________________________________________ +// Function: Motor +// Purpose: For devices with constant Force feedback +// input: Type - 06 = Motor On, 04 = Motor Off +// Strength - 00 = Left Strong, 127 = Left Weak, 128 = Right Weak, 255 = Right Strong +// output: none +// +void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) +{ + std::unique_lock lk(g_plugin.controls_lock, std::try_to_lock); + + if (lk.owns_lock()) + { + // TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time + // set rumble + if (_uType == 6) + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetMotor(_uStrength); + } } } diff --git a/Source/Core/Core/Src/HW/GCPad.h b/Source/Core/Core/Src/HW/GCPad.h index f7f6af2f20..fb07e82ccc 100644 --- a/Source/Core/Core/Src/HW/GCPad.h +++ b/Source/Core/Core/Src/HW/GCPad.h @@ -32,6 +32,7 @@ InputPlugin *GetPlugin(); void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus); void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); +void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); bool GetMicButton(u8 pad); } diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index 837c9104cc..a2c0c2afa9 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -130,7 +130,21 @@ void GCPad::GetInput(SPADStatus* const pad) } } -void GCPad::SetOutput(const bool on) +void GCPad::SetMotor(const u8 on) +{ + float state = (float)on / 255; + float force = abs(state - 0.5) * 2; + if (state < 0.5) + force = -force; + + // only rumble if window has focus or background input is enabled + if (Host_RendererHasFocus() || m_options[0].settings[0]->value) + m_rumble->controls[0]->control_ref->State(force); + else + m_rumble->controls[0]->control_ref->State(0); +} + +void GCPad::SetOutput(const u8 on) { // only rumble if window has focus or background input is enabled m_rumble->controls[0]->control_ref->State(on && (Host_RendererHasFocus() || m_options[0].settings[0]->value)); diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h index 5185ff221c..e57e6b0b68 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.h +++ b/Source/Core/Core/Src/HW/GCPadEmu.h @@ -28,7 +28,8 @@ public: GCPad(const unsigned int index); void GetInput(SPADStatus* const pad); - void SetOutput(const bool on); + void SetOutput(const u8 on); + void SetMotor(const u8 on); bool GetMicButton() const; diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 1156d456ad..6a6fb14212 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -416,136 +416,7 @@ bool AreMemoryBreakpointsActivated() u32 Read_Instruction(const u32 em_address) { UGeckoInstruction inst = ReadUnchecked_U32(em_address); - if (inst.OPCD == 1) - return HLE::GetOrigInstruction(em_address); - else - return inst.hex; -} - -u32 Read_Opcode_JIT_Uncached(const u32 _Address) -{ - u8* iCache; - u32 addr; - if (_Address & JIT_ICACHE_VMEM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheVMEM(); - addr = _Address & JIT_ICACHE_MASK; - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheEx(); - addr = _Address & JIT_ICACHEEX_MASK; - } - else - { - iCache = jit->GetBlockCache()->GetICache(); - addr = _Address & JIT_ICACHE_MASK; - } - u32 inst = *(u32*)(iCache + addr); - if (inst == JIT_ICACHE_INVALID_WORD) - { - u32 cache_block_start = addr & ~0x1f; - u32 mem_block_start = _Address & ~0x1f; - u8 *pMem = Memory::GetPointer(mem_block_start); - memcpy(iCache + cache_block_start, pMem, 32); - inst = *(u32*)(iCache + addr); - } - inst = Common::swap32(inst); - - if ((inst & 0xfc000000) == 0) - { - inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); - } - - return inst; -} - -u32 Read_Opcode_JIT(u32 _Address) -{ -#ifdef FAST_ICACHE - if (bMMU && !bFakeVMEM && (_Address & ADDR_MASK_MEM1)) - { - _Address = Memory::TranslateAddress(_Address, FLAG_OPCODE); - if (_Address == 0) - { - return 0; - } - } - u32 inst = 0; - - // Bypass the icache for the external interrupt exception handler - if ( (_Address & 0x0FFFFF00) == 0x00000500 ) - inst = Read_Opcode_JIT_Uncached(_Address); - else - inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); -#else - u32 inst = Memory::ReadUnchecked_U32(_Address); -#endif - return inst; -} - -// The following function is deprecated in favour of FAST_ICACHE -u32 Read_Opcode_JIT_LC(const u32 _Address) -{ -#ifdef JIT_UNLIMITED_ICACHE - if ((_Address & ~JIT_ICACHE_MASK) != 0x80000000 && (_Address & ~JIT_ICACHE_MASK) != 0x00000000 && - (_Address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area - (_Address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (_Address & ~JIT_ICACHEEX_MASK) != 0x10000000) - { - PanicAlertT("iCacheJIT: Reading Opcode from %x. Please report.", _Address); - ERROR_LOG(MEMMAP, "iCacheJIT: Reading Opcode from %x. Please report.", _Address); - return 0; - } - u8* iCache; - u32 addr; - if (_Address & JIT_ICACHE_VMEM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheVMEM(); - addr = _Address & JIT_ICACHE_MASK; - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheEx(); - addr = _Address & JIT_ICACHEEX_MASK; - } - else - { - iCache = jit->GetBlockCache()->GetICache(); - addr = _Address & JIT_ICACHE_MASK; - } - u32 inst = *(u32*)(iCache + addr); - if (inst == JIT_ICACHE_INVALID_WORD) - inst = Memory::ReadUnchecked_U32(_Address); - else - inst = Common::swap32(inst); -#else - u32 inst = Memory::ReadUnchecked_U32(_Address); -#endif - if ((inst & 0xfc000000) == 0) - { - inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); - } - return inst; -} - -// WARNING! No checks! -// We assume that _Address is cached -void Write_Opcode_JIT(const u32 _Address, const u32 _Value) -{ -#ifdef JIT_UNLIMITED_ICACHE - if (_Address & JIT_ICACHE_VMEM_BIT) - { - *(u32*)(jit->GetBlockCache()->GetICacheVMEM() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - *(u32*)(jit->GetBlockCache()->GetICacheEx() + (_Address & JIT_ICACHEEX_MASK)) = Common::swap32(_Value); - } - else - *(u32*)(jit->GetBlockCache()->GetICache() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); -#else - Memory::WriteUnchecked_U32(_Value, _Address); -#endif + return inst.hex; } void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 _iSize) @@ -656,8 +527,10 @@ u8 *GetPointer(const u32 _Address) case 0x9: case 0xd: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) + { if ((_Address & 0xfffffff) < EXRAM_SIZE) return m_pPhysicalEXRAM + (_Address & EXRAM_MASK); + } else break; diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index 42ceb737ca..8662804185 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -119,11 +119,6 @@ inline u32 ReadFast32(const u32 _Address) // used by interpreter to read instructions, uses iCache u32 Read_Opcode(const u32 _Address); -// used by JIT to read instructions -u32 Read_Opcode_JIT(const u32 _Address); -// used by JIT. uses iCacheJIT. Reads in the "Locked cache" mode -u32 Read_Opcode_JIT_LC(const u32 _Address); -void Write_Opcode_JIT(const u32 _Address, const u32 _Value); // this is used by Debugger a lot. // For now, just reads from memory! u32 Read_Instruction(const u32 _Address); diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index b391eea975..e01eedaaab 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -956,7 +956,7 @@ u32 TranslateAddress(const u32 _Address, const XCheckTLBFlag _Flag) // Check MSR[DR] bit before translating data addresses //if (((_Flag == FLAG_READ) || (_Flag == FLAG_WRITE)) && !(MSR & (1 << (31 - 27)))) return _Address; - u32 tlb_addr = Core::g_CoreStartupParameter.bMMUBAT?TranslateBlockAddress(_Address, _Flag):0; + u32 tlb_addr = TranslateBlockAddress(_Address, _Flag); if (tlb_addr == 0) { tlb_addr = TranslatePageAddress(_Address, _Flag); diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp index 4a18ce63b5..9e72cc2169 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp @@ -96,8 +96,7 @@ void Init() m_FlipperRev = 0x246500B1; // revision C m_Unknown = 0; - // Bleh, why? - //m_ResetCode |= 0x80000000; + m_ResetCode = 0x80000000; // Cold reset m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI; toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", &ToggleResetButtonCallback); @@ -199,6 +198,7 @@ void Write32(const u32 _uValue, const u32 _iAddress) case PI_RESET_CODE: DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to PI_RESET_CODE", _uValue); + m_ResetCode = _uValue; break; case PI_FLIPPER_UNK: diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index 84a3744d6f..0f563806ce 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -273,7 +273,7 @@ void Init() g_Channel[i].m_InLo.Hex = 0; if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) - AddDevice(Movie::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + AddDevice(Movie::IsUsingPad(i) ? (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); else AddDevice(SConfig::GetInstance().m_SIDevice[i], i); } diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp index 8abddbe472..062499f16f 100644 --- a/Source/Core/Core/Src/HW/SI_Device.cpp +++ b/Source/Core/Core/Src/HW/SI_Device.cpp @@ -17,6 +17,7 @@ #include "SI_Device.h" #include "SI_DeviceGCController.h" +#include "SI_DeviceGCSteeringWheel.h" #include "SI_DeviceGBA.h" #include "SI_DeviceAMBaseboard.h" @@ -76,6 +77,10 @@ ISIDevice* SIDevice_Create(const SIDevices device, const int port_number) return new CSIDevice_GCController(device, port_number); break; + case SIDEVICE_GC_STEERING: + return new CSIDevice_GCSteeringWheel(device, port_number); + break; + case SIDEVICE_GC_TARUKONGA: return new CSIDevice_TaruKonga(device, port_number); break; diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp index 897b6d1227..3537ed3747 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp @@ -262,7 +262,6 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) { int cmd = *jvs_io++; - int unknown = 0; DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, cmd=%02x", node, cmd); switch (cmd) @@ -362,10 +361,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) } case 0xf0: if (*jvs_io++ == 0xD9) - { ERROR_LOG(AMBASEBOARDDEBUG, "JVS RESET"); - } else - unknown = 1; msg.addData(1); d10_1 |= 1; diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index a9b708324d..8c4c562b82 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -132,15 +132,15 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) if(Movie::IsPlayingInput()) { Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Core::g_CoreStartupParameter.bWii) - Movie::InputUpdate(); + Movie::InputUpdate(); } else if(Movie::IsRecordingInput()) { Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Core::g_CoreStartupParameter.bWii) - Movie::InputUpdate(); + Movie::InputUpdate(); } + else + Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); // Thankfully changing mode does not change the high bits ;) _Hi = (u32)((u8)PadStatus.stickY); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp new file mode 100644 index 0000000000..ade19b758e --- /dev/null +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -0,0 +1,314 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include +#include + +#include "SI.h" +#include "SI_Device.h" +#include "SI_DeviceGCSteeringWheel.h" + +#include "EXI_Device.h" +#include "EXI_DeviceMic.h" + +#include "GCPad.h" + +#include "../Movie.h" + +#include "../CoreTiming.h" +#include "SystemTimers.h" +#include "ProcessorInterface.h" +#include "../Core.h" + +// --- standard gamecube controller --- +CSIDevice_GCSteeringWheel::CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber) + : ISIDevice(device, _iDeviceNumber) + , m_TButtonComboStart(0) + , m_TButtonCombo(0) + , m_LastButtonCombo(COMBO_NONE) +{ + memset(&m_Origin, 0, sizeof(SOrigin)); + m_Origin.uCommand = CMD_ORIGIN; + m_Origin.uOriginStickX = 0x80; // center + m_Origin.uOriginStickY = 0x80; + m_Origin.uSubStickStickX = 0x80; + m_Origin.uSubStickStickY = 0x80; + m_Origin.uTrigger_L = 0x1F; // 0-30 is the lower deadzone + m_Origin.uTrigger_R = 0x1F; + + // Dunno if we need to do this, game/lib should set it? + m_Mode = 0x03; +} + +int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength) +{ + // For debug logging only + ISIDevice::RunBuffer(_pBuffer, _iLength); + + // Read the command + EBufferCommands command = static_cast(_pBuffer[3]); + + // Handle it + switch (command) + { + case CMD_RESET: + *(u32*)&_pBuffer[0] = SI_GC_STEERING; + break; + + case CMD_ORIGIN: + { + INFO_LOG(SERIALINTERFACE, "PAD - Get Origin"); + u8* pCalibration = reinterpret_cast(&m_Origin); + for (int i = 0; i < (int)sizeof(SOrigin); i++) + { + _pBuffer[i ^ 3] = *pCalibration++; + } + } + break; + + // Recalibrate (FiRES: i am not 100 percent sure about this) + case CMD_RECALIBRATE: + { + INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate"); + u8* pCalibration = reinterpret_cast(&m_Origin); + for (int i = 0; i < (int)sizeof(SOrigin); i++) + { + _pBuffer[i ^ 3] = *pCalibration++; + } + } + break; + + // Seen in F-Zero GX + case CMD_MOTOR_OFF: + break; + + // DEFAULT + default: + { + ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); + } + break; + } + + return _iLength; +} + + +// GetData + +// Return true on new data (max 7 Bytes and 6 bits ;) +// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r] +// |\_ ERR_LATCH (error latched - check SISR) +// |_ ERR_STATUS (error on last GetData or SendCmd?) +bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) +{ + SPADStatus PadStatus; + memset(&PadStatus, 0, sizeof(PadStatus)); + + Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus); + Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber); + + u32 netValues[2]; + if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues)) + { + _Hi = netValues[0]; // first 4 bytes + _Low = netValues[1]; // last 4 bytes + return true; + } + + Movie::SetPolledDevice(); + + if(Movie::IsPlayingInput()) + { + Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); + Movie::InputUpdate(); + } + else if(Movie::IsRecordingInput()) + { + Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); + Movie::InputUpdate(); + } + else + Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); + + // Thankfully changing mode does not change the high bits ;) + _Hi = (u32)((u8)PadStatus.stickX); // Steering + _Hi |= 0x800; // Pedal connected flag + _Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16); + + // Low bits are packed differently per mode + if (m_Mode == 0 || m_Mode == 5 || m_Mode == 7) + { + _Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.substickY) << 16); // All 8 bits + _Low |= (u32)((u8)(PadStatus.substickX) << 24); // All 8 bits + } + else if (m_Mode == 1) + { + _Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits + _Low |= (u32)((u8)PadStatus.triggerRight << 8); // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits + } + else if (m_Mode == 2) + { + _Low = (u8)(PadStatus.analogB); // All 8 bits + _Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits + _Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits + } + else if (m_Mode == 3) + { + // Analog A/B are always 0 + _Low = (u8)PadStatus.triggerRight; // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 8); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits + } + else if (m_Mode == 4) + { + _Low = (u8)(PadStatus.analogB); // All 8 bits + _Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits + // triggerLeft/Right are always 0 + _Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits + } + else if (m_Mode == 6) + { + _Low = (u8)PadStatus.triggerRight; // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 8); // All 8 bits + + // The GC Steering Wheel appears to have combined pedals + // (both the Accelerate and Brake pedals are mapped to a single axis) + // We use the stickY axis for the pedals. + if (PadStatus.stickY < 128) + _Low |= (u32)((u8)(255 - ((PadStatus.stickY & 0x7f) * 2)) << 16); // All 8 bits (Brake) + if (PadStatus.stickY >= 128) + _Low |= (u32)((u8)((PadStatus.stickY & 0x7f) * 2) << 24); // All 8 bits (Accelerate) + } + + // Keep track of the special button combos (embedded in controller hardware... :( ) + EButtonCombo tempCombo; + if ((PadStatus.button & 0xff00) == (PAD_BUTTON_Y|PAD_BUTTON_X|PAD_BUTTON_START)) + tempCombo = COMBO_ORIGIN; + else if ((PadStatus.button & 0xff00) == (PAD_BUTTON_B|PAD_BUTTON_X|PAD_BUTTON_START)) + tempCombo = COMBO_RESET; + else + tempCombo = COMBO_NONE; + if (tempCombo != m_LastButtonCombo) + { + m_LastButtonCombo = tempCombo; + if (m_LastButtonCombo != COMBO_NONE) + m_TButtonComboStart = CoreTiming::GetTicks(); + } + if (m_LastButtonCombo != COMBO_NONE) + { + m_TButtonCombo = CoreTiming::GetTicks(); + if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3) + { + if (m_LastButtonCombo == COMBO_RESET) + ProcessorInterface::ResetButton_Tap(); + else if (m_LastButtonCombo == COMBO_ORIGIN) + { + m_Origin.uOriginStickX = PadStatus.stickX; + m_Origin.uOriginStickY = PadStatus.stickY; + m_Origin.uSubStickStickX = PadStatus.substickX; + m_Origin.uSubStickStickY = PadStatus.substickY; + m_Origin.uTrigger_L = PadStatus.triggerLeft; + m_Origin.uTrigger_R = PadStatus.triggerRight; + } + m_LastButtonCombo = COMBO_NONE; + } + } + + return true; +} + + +// SendCommand +void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) +{ + UCommand command(_Cmd); + + switch (command.Command) + { + // Costis sent it in some demos :) + case 0x00: + break; + + case CMD_FORCE: + { + unsigned int uStrength = command.Parameter1; // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong + unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off + + // get the correct pad number that should rumble locally when using netplay + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + + if (numPAD < 4) + Pad::Motor(numPAD, uType, uStrength); + + if (!_Poll) + { + m_Mode = command.Parameter2; + INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); + } + } + break; + + case CMD_WRITE: + { + unsigned int uType = command.Parameter1; // 0 = stop, 1 = rumble, 2 = stop hard + unsigned int uStrength = command.Parameter2; + + // get the correct pad number that should rumble locally when using netplay + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + + if (numPAD < 4) + Pad::Rumble(numPAD, uType, uStrength); + + if (!_Poll) + { + m_Mode = command.Parameter2; + INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); + } + } + break; + + default: + { + ERROR_LOG(SERIALINTERFACE, "unknown direct command (0x%x)", _Cmd); + } + break; + } +} + +// Savestate support +void CSIDevice_GCSteeringWheel::DoState(PointerWrap& p) +{ + p.Do(m_Origin); + p.Do(m_Mode); + p.Do(m_TButtonComboStart); + p.Do(m_TButtonCombo); + p.Do(m_LastButtonCombo); +} diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h new file mode 100644 index 0000000000..2245765863 --- /dev/null +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -0,0 +1,119 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _SI_DEVICEGCSTEERINGWHEEL_H +#define _SI_DEVICEGCSTEERINGWHEEL_H + +#include "SI_Device.h" +#include "GCPadStatus.h" + + +// standard gamecube controller +class CSIDevice_GCSteeringWheel : public ISIDevice +{ +private: + + // Commands + enum EBufferCommands + { + CMD_RESET = 0x00, + CMD_ORIGIN = 0x41, + CMD_RECALIBRATE = 0x42, + CMD_MOTOR_OFF = 0xff, + }; + + struct SOrigin + { + u8 uCommand;// Maybe should be button bits? + u8 unk_1; // ..and this would be the other half + u8 uOriginStickX; + u8 uOriginStickY; + u8 uSubStickStickX; + u8 uSubStickStickY; + u8 uTrigger_L; + u8 uTrigger_R; + u8 unk_4; + u8 unk_5; + u8 unk_6; + u8 unk_7; + }; + + enum EDirectCommands + { + CMD_FORCE = 0x30, + CMD_WRITE = 0x40 + }; + + union UCommand + { + u32 Hex; + struct + { + u32 Parameter1 : 8; + u32 Parameter2 : 8; + u32 Command : 8; + u32 : 8; + }; + UCommand() {Hex = 0;} + UCommand(u32 _iValue) {Hex = _iValue;} + }; + + enum EButtonCombo + { + COMBO_NONE = 0, + COMBO_ORIGIN, + COMBO_RESET + }; + + // struct to compare input against + // Set on connection and (standard pad only) on button combo + SOrigin m_Origin; + + // PADAnalogMode + u8 m_Mode; + + // Timer to track special button combos: + // y, X, start for 3 seconds updates origin with current status + // Technically, the above is only on standard pad, wavebird does not support it for example + // b, x, start for 3 seconds triggers reset (PI reset button interrupt) + u64 m_TButtonComboStart, m_TButtonCombo; + // Type of button combo from the last/current poll + EButtonCombo m_LastButtonCombo; + +public: + + // Constructor + CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber); + + // Run the SI Buffer + virtual int RunBuffer(u8* _pBuffer, int _iLength); + + // Send and Receive pad input from network + static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); + static u8 NetPlay_GetPadNum(u8 numPAD); + + // Return true on new data + virtual bool GetData(u32& _Hi, u32& _Low); + + // Send a command directly + virtual void SendCommand(u32 _Cmd, u8 _Poll); + + // Savestate support + virtual void DoState(PointerWrap& p); +}; + +#endif diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index b9f9fe0107..a041a3b0ad 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -251,12 +251,11 @@ void Init() // Now the 1500 is a pure assumption // We need to figure out the real frequency though - // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) - const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 15000 : 4000; + // FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32 + const int freq = 1500; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; - IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); + IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); } else { diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index cc2ce18ce0..bf9f7f8b84 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -144,8 +144,8 @@ void Preset(bool _bNTSC) m_HorizontalStepping.FbSteps = 40; m_HorizontalStepping.FieldSteps = 40; - m_HBeamPos = 1; - m_VBeamPos = 1; + m_HBeamPos = -1; // NTSC-U N64 VC games check for a non-zero HBeamPos + m_VBeamPos = 0; // RG4JC0 checks for a zero VBeamPos // 54MHz, capable of progressive scan m_Clock = Core::g_CoreStartupParameter.bProgressive; diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp index 74af1ecdea..3651eef8ab 100644 --- a/Source/Core/Core/Src/HW/WII_IPC.cpp +++ b/Source/Core/Core/Src/HW/WII_IPC.cpp @@ -221,6 +221,7 @@ void Write32(const u32 _Value, const u32 _Address) break; } + WII_IPC_HLE_Interface::Update(); UpdateInterrupts(); } diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index 30ab7af141..59fe8b7fa5 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -5,6 +5,7 @@ #include "WiimoteReal/WiimoteReal.h" #include "WiimoteEmu/WiimoteEmu.h" #include "Movie.h" +#include "../ConfigManager.h" #include "ControllerInterface/ControllerInterface.h" @@ -44,7 +45,7 @@ void Initialize(void* const hwnd) g_controller_interface.SetHwnd(hwnd); g_controller_interface.Initialize(); - g_plugin.LoadConfig(); + g_plugin.LoadConfig(false); WiimoteReal::Initialize(); @@ -136,9 +137,9 @@ void DoState(unsigned char **ptr, int mode) { // TODO: - //PointerWrap p(ptr, mode); - //for (unsigned int i=0; i<4; ++i) - // ((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p); + PointerWrap p(ptr, mode); + for (unsigned int i=0; i<4; ++i) + ((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p); } // ___________________________________________________________________________ diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h index 5e0ab8d05e..dd0e6df389 100644 --- a/Source/Core/Core/Src/HW/Wiimote.h +++ b/Source/Core/Core/Src/HW/Wiimote.h @@ -38,17 +38,12 @@ void Update(int _number); namespace WiimoteReal { -unsigned int Initialize(); +void Initialize(); void Shutdown(); void Refresh(); void LoadSettings(); -#ifdef _WIN32 -int PairUp(bool unpair = false); -int UnPair(); -#endif - } #endif diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp index 292d9c5a86..182170f501 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -97,8 +97,9 @@ void Turntable::GetState(u8* const data, const bool focus) // crossfade slider { - u8 cfs = 0; - m_crossfade->GetState(&cfs, 8, 7); + s8 cfs = 0; + m_crossfade->GetState(&cfs, focus ? 7 : 0); + cfs += 8; ttdata->slider = cfs; } diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index e7036c8fcb..5c2a28b57a 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -248,13 +248,12 @@ void Wiimote::RequestStatus(const wm_request_status* const rs) { using namespace WiimoteReal; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[m_index]) { - wm_request_status rpt; - rpt.rumble = 0; - g_wiimotes[m_index]->SendPacket(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); + wm_request_status rpt = {}; + g_wiimotes[m_index]->QueueReport(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); } return; @@ -594,13 +593,69 @@ void Wiimote::SendReadDataReply(ReadRequest& _request) void Wiimote::DoState(PointerWrap& p) { - // not working :( - //if (p.MODE_READ == p.GetMode()) - //{ - // // LOAD - // Reset(); // should cause a status report to be sent, then wii should re-setup wiimote - //} - //p.Do(m_reporting_channel); + p.Do(m_extension->active_extension); + p.Do(m_extension->switch_extension); + + p.Do(m_accel); + p.Do(m_index); + p.Do(ir_sin); + p.Do(ir_cos); + p.Do(m_rumble_on); + p.Do(m_speaker_mute); + p.Do(m_motion_plus_present); + p.Do(m_motion_plus_active); + p.Do(m_reporting_auto); + p.Do(m_reporting_mode); + p.Do(m_reporting_channel); + p.Do(m_shake_step); + p.Do(m_sensor_bar_on_top); + p.Do(m_status); + p.Do(m_adpcm_state); + p.Do(m_ext_key); + p.DoArray(m_eeprom, sizeof(m_eeprom)); + p.Do(m_reg_motion_plus); + p.Do(m_reg_ir); + p.Do(m_reg_ext); + p.Do(m_reg_speaker); + + //Do 'm_read_requests' queue + { + u32 size = 0; + if (p.mode == PointerWrap::MODE_READ) + { + //clear + while (m_read_requests.size()) + m_read_requests.pop(); + + p.Do(size); + while (size--) + { + ReadRequest tmp; + p.Do(tmp.address); + p.Do(tmp.position); + p.Do(tmp.size); + tmp.data = new u8[tmp.size]; + p.DoArray(tmp.data, tmp.size); + m_read_requests.push(tmp); + } + } + else + { + std::queue tmp_queue(m_read_requests); + size = m_read_requests.size(); + p.Do(size); + while (!tmp_queue.empty()) + { + ReadRequest tmp = tmp_queue.front(); + p.Do(tmp.address); + p.Do(tmp.position); + p.Do(tmp.size); + p.DoArray(tmp.data, tmp.size); + tmp_queue.pop(); + } + } + } + p.DoMarker("Wiimote"); } } diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 6f7f80ece7..92018f7c21 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -15,6 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include + #include "Attachment/Classic.h" #include "Attachment/Nunchuk.h" #include "Attachment/Guitar.h" @@ -39,6 +41,13 @@ inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } #include "../../Movie.h" +namespace +{ +// :) +auto const TAU = 6.28318530717958647692; +auto const PI = TAU / 2.0; +} + namespace WiimoteEmu { @@ -89,23 +98,32 @@ const ReportFeatures reporting_mode_features[] = { 0, 0, 0, 0, 23 }, }; -void EmulateShake( AccelData* const accel +void EmulateShake(AccelData* const accel , ControllerEmu::Buttons* const buttons_group , u8* const shake_step ) { - static const double shake_data[] = { -2.5f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 2.5f, 0.0f }; + // frame count of one up/down shake + // < 9 no shake detection in "Wario Land: Shake It" + auto const shake_step_max = 15; + + // peak G-force + auto const shake_intensity = 3.f; + + // shake is a bitfield of X,Y,Z shake button states static const unsigned int btns[] = { 0x01, 0x02, 0x04 }; unsigned int shake = 0; - buttons_group->GetState( &shake, btns ); - for ( unsigned int i=0; i<3; ++i ) + + for (int i = 0; i != 3; ++i) + { if (shake & (1 << i)) { - (&(accel->x))[i] = shake_data[shake_step[i]++]; - shake_step[i] %= sizeof(shake_data)/sizeof(double); + (&(accel->x))[i] = std::sin(TAU * shake_step[i] / shake_step_max) * shake_intensity; + shake_step[i] = (shake_step[i] + 1) % shake_step_max; } else shake_step[i] = 0; + } } void EmulateTilt(AccelData* const accel @@ -113,7 +131,8 @@ void EmulateTilt(AccelData* const accel , const bool focus, const bool sideways, const bool upright) { float roll, pitch; - tilt_group->GetState( &roll, &pitch, 0, focus ? (PI / 2) : 0 ); // 90 degrees + // 180 degrees + tilt_group->GetState(&roll, &pitch, 0, focus ? PI : 0); unsigned int ud = 0, lr = 0, fb = 0; @@ -256,6 +275,9 @@ Wiimote::Wiimote( const unsigned int index ) for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons); ++i) m_buttons->controls.push_back(new ControlGroup::Input( named_buttons[i])); + // udp + groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote"))); + // ir groups.push_back(m_ir = new Cursor(_trans("IR"))); @@ -265,9 +287,6 @@ Wiimote::Wiimote( const unsigned int index ) // tilt groups.push_back(m_tilt = new Tilt(_trans("Tilt"))); - // udp - groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote"))); - // shake groups.push_back(m_shake = new Buttons(_trans("Shake"))); m_shake->controls.push_back(new ControlGroup::Input("X")); @@ -685,7 +704,7 @@ void Wiimote::Update() { using namespace WiimoteReal; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[m_index]) { Report rpt = g_wiimotes[m_index]->ProcessReadQueue(); @@ -762,9 +781,9 @@ void Wiimote::Update() } } } - if (Movie::IsRecordingInput()) + if (!Movie::IsPlayingInput()) { - Movie::RecordWiimote(m_index, data, rptf, m_reg_ir.mode); + Movie::CheckWiimoteStatus(m_index, data, rptf, m_reg_ir.mode); } // don't send a data report if auto reporting is off diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index 17a3a2adfc..36f0da406b 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -30,8 +30,6 @@ #include #include -#define PI 3.14159265358979323846 - // Registry sizes #define WIIMOTE_EEPROM_SIZE (16*1024) #define WIIMOTE_EEPROM_FREE_SIZE 0x1700 diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h index fd7c549e8d..9d1a2092a0 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h @@ -201,6 +201,7 @@ struct wm_report #define WM_LEDS 0x11 struct wm_leds { u8 rumble : 1; + // real wii also sets bit 0x2 (unknown purpose) u8 : 3; u8 leds : 4; }; @@ -208,8 +209,9 @@ struct wm_leds { #define WM_REPORT_MODE 0x12 struct wm_report_mode { u8 rumble : 1; - u8 continuous : 1; // these 2 seem to be named wrong + // unsure what "all_the_time" actually is, the real wii does set it (bit 0x2) u8 all_the_time : 1; + u8 continuous : 1; u8 : 5; u8 mode; }; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 0b3d16454b..3a017354eb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -21,9 +21,25 @@ namespace WiimoteReal { -int FindWiimotes(Wiimote **wm, int max_wiimotes) +WiimoteScanner::WiimoteScanner() { - return 0; + return; +} + +WiimoteScanner::~WiimoteScanner() +{} + +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() +{ + return std::vector(); +} + +bool WiimoteScanner::IsReady() const +{ + return false; } bool Wiimote::Connect() @@ -31,17 +47,22 @@ bool Wiimote::Connect() return 0; } -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { return; } -int Wiimote::IORead(unsigned char* buf) +bool Wiimote::IsConnected() const +{ + return false; +} + +int Wiimote::IORead(u8* buf) { return 0; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::IOWrite(const u8* buf, int len) { return 0; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index b01caf06c8..87ddc5086b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -15,16 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include -#include - -#include -#include -#include -#include -#include -#include - #include #include #include @@ -32,205 +22,186 @@ #include "Common.h" #include "WiimoteReal.h" -#include "Host.h" - -// Identify the wiimote device by its class -#define WM_DEV_CLASS_0 0x04 -#define WM_DEV_CLASS_1 0x25 -#define WM_DEV_CLASS_2 0x00 namespace WiimoteReal { -// Find wiimotes. -// Does not replace already found wiimotes even if they are disconnected. -// wm is an array of max_wiimotes wiimotes -// Returns the total number of found wiimotes. -int FindWiimotes(Wiimote** wm, int max_wiimotes) +WiimoteScanner::WiimoteScanner() + : m_run_thread() + , m_want_wiimotes() + , device_id(-1) + , device_sock(-1) { - int device_id; - int device_sock; - int found_devices; - int found_wiimotes = 0; - int i; - - // Count the number of already found wiimotes - for (i = 0; i < MAX_WIIMOTES; ++i) - { - if (wm[i]) - found_wiimotes++; - } - // Get the id of the first bluetooth device. - if ((device_id = hci_get_route(NULL)) < 0) + device_id = hci_get_route(NULL); + if (device_id < 0) { NOTICE_LOG(WIIMOTE, "Bluetooth not found."); - return found_wiimotes; + return; } // Create a socket to the device - if ((device_sock = hci_open_dev(device_id)) < 0) + device_sock = hci_open_dev(device_id); + if (device_sock < 0) { ERROR_LOG(WIIMOTE, "Unable to open bluetooth."); + return; + } +} + +bool WiimoteScanner::IsReady() const +{ + return device_sock > 0; +} + +WiimoteScanner::~WiimoteScanner() +{ + if (IsReady()) + close(device_sock); +} + +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() +{ + std::vector found_wiimotes; + + // supposedly 1.28 seconds + int const wait_len = 1; + + int const max_infos = 255; + inquiry_info scan_infos[max_infos] = {}; + auto* scan_infos_ptr = scan_infos; + + // Scan for bluetooth devices + int const found_devices = hci_inquiry(device_id, wait_len, max_infos, NULL, &scan_infos_ptr, IREQ_CACHE_FLUSH); + if (found_devices < 0) + { + ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices."); return found_wiimotes; } - int try_num = 0; - while ((try_num < 5) && (found_wiimotes < max_wiimotes)) - { - inquiry_info scan_info_arr[128]; - inquiry_info* scan_info = scan_info_arr; - memset(&scan_info_arr, 0, sizeof(scan_info_arr)); + DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices); - // Scan for bluetooth devices for approximately one second - found_devices = hci_inquiry(device_id, 1, 128, NULL, &scan_info, IREQ_CACHE_FLUSH); - if (found_devices < 0) + // Display discovered devices + for (int i = 0; i < found_devices; ++i) + { + ERROR_LOG(WIIMOTE, "found a device..."); + + // BT names are a maximum of 248 bytes apparently + char name[255] = {}; + if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 0) < 0) { - ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices."); - return found_wiimotes; + ERROR_LOG(WIIMOTE, "name request failed"); + continue; } - DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices); - - // Display discovered devices - for (i = 0; (i < found_devices) && (found_wiimotes < max_wiimotes); ++i) + ERROR_LOG(WIIMOTE, "device name %s", name); + if (IsValidBluetoothName(name)) { - if ((scan_info[i].dev_class[0] == WM_DEV_CLASS_0) && - (scan_info[i].dev_class[1] == WM_DEV_CLASS_1) && - (scan_info[i].dev_class[2] == WM_DEV_CLASS_2)) + bool new_wiimote = true; + + // TODO: do this + + // Determine if this wiimote has already been found. + //for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j) + //{ + // if (wm[j] && bacmp(&scan_infos[i].bdaddr,&wm[j]->bdaddr) == 0) + // new_wiimote = false; + //} + + if (new_wiimote) { - bool new_wiimote = true; - // Determine if this wiimote has already been found. - for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j) - { - if (wm[j] && bacmp(&scan_info[i].bdaddr,&wm[j]->bdaddr) == 0) - new_wiimote = false; - } + // Found a new device + char bdaddr_str[18] = {}; + ba2str(&scan_infos[i].bdaddr, bdaddr_str); - if (new_wiimote) - { - // Find an unused slot - unsigned int k = 0; - for (; k < MAX_WIIMOTES && !(WIIMOTE_SRC_REAL & g_wiimote_sources[k] && !wm[k]); ++k); - wm[k] = new Wiimote(k); - - // Found a new device - char bdaddr_str[18]; - ba2str(&scan_info[i].bdaddr, bdaddr_str); - - NOTICE_LOG(WIIMOTE, "Found wiimote %i, (%s).", - wm[k]->index + 1, bdaddr_str); - - wm[k]->bdaddr = scan_info[i].bdaddr; - ++found_wiimotes; - } + auto* const wm = new Wiimote; + wm->bdaddr = scan_infos[i].bdaddr; + found_wiimotes.push_back(wm); + + NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str); } } - try_num++; } - close(device_sock); return found_wiimotes; } // Connect to a wiimote with a known address. bool Wiimote::Connect() { - struct sockaddr_l2 addr; - - if (IsConnected()) return false; - + sockaddr_l2 addr; addr.l2_family = AF_BLUETOOTH; addr.l2_bdaddr = bdaddr; addr.l2_cid = 0; // Output channel addr.l2_psm = htobs(WM_OUTPUT_CHANNEL); - if ((out_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(out_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + if ((cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || + connect(cmd_sock, (sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open output socket to wiimote."); - close(out_sock); - out_sock = -1; + close(cmd_sock); + cmd_sock = -1; return false; } // Input channel addr.l2_psm = htobs(WM_INPUT_CHANNEL); - if ((in_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(in_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + if ((int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || + connect(int_sock, (sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open input socket from wiimote."); - close(in_sock); - close(out_sock); - in_sock = out_sock = -1; + close(int_sock); + close(cmd_sock); + int_sock = cmd_sock = -1; return false; } - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); - - m_connected = true; - - // Do the handshake - Handshake(); - - // Set LEDs - SetLEDs(WIIMOTE_LED_1 << index); - - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); - return true; } -// Disconnect a wiimote. -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { - if (!IsConnected()) - return; + close(cmd_sock); + close(int_sock); - NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i.", index + 1); - - m_connected = false; - - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); - - Host_ConnectWiimote(index, false); - - close(out_sock); - close(in_sock); - - out_sock = -1; - in_sock = -1; + cmd_sock = -1; + int_sock = -1; } -int Wiimote::IORead(unsigned char *buf) +bool Wiimote::IsConnected() const { - struct timeval tv; - fd_set fds; - int r; - - if (!IsConnected()) - return 0; + return cmd_sock != -1;// && int_sock != -1; +} +// positive = read packet +// negative = didn't read packet +// zero = error +int Wiimote::IORead(u8* buf) +{ // Block select for 1/2000th of a second + timeval tv; tv.tv_sec = 0; tv.tv_usec = WIIMOTE_DEFAULT_TIMEOUT * 1000; + fd_set fds; FD_ZERO(&fds); - FD_SET(in_sock, &fds); + FD_SET(int_sock, &fds); - if (select(in_sock + 1, &fds, NULL, NULL, &tv) == -1) + if (select(int_sock + 1, &fds, NULL, NULL, &tv) == -1) { ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1); - return 0; + return -1; } - if (!FD_ISSET(in_sock, &fds)) - return 0; + if (!FD_ISSET(int_sock, &fds)) + return -1; // Read the pending message into the buffer - r = read(in_sock, buf, MAX_PAYLOAD); + int r = read(int_sock, buf, MAX_PAYLOAD); if (r == -1) { // Error reading data @@ -241,23 +212,17 @@ int Wiimote::IORead(unsigned char *buf) // This can happen if the bluetooth dongle is disconnected ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected. " "Wiimote %i will be disconnected.", index + 1); - RealDisconnect(); } - return 0; - } - if (!r) - { - // Disconnect - RealDisconnect(); - return 0; + r = 0; } + return r; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::IOWrite(u8 const* buf, int len) { - return write(out_sock, buf, len); + return write(int_sock, buf, len); } }; // WiimoteReal diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index c22e1972dc..2ae34a7ca5 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include #include #include @@ -32,6 +35,8 @@ #include #include +//#define AUTHENTICATE_WIIMOTES + typedef struct _HIDD_ATTRIBUTES { ULONG Size; @@ -53,6 +58,7 @@ typedef BOOL (__stdcall *PBth_BluetoothFindRadioClose)(HBLUETOOTH_RADIO_FIND); typedef DWORD (__stdcall *PBth_BluetoothGetRadioInfo)(HANDLE, PBLUETOOTH_RADIO_INFO); typedef DWORD (__stdcall *PBth_BluetoothRemoveDevice)(const BLUETOOTH_ADDRESS*); typedef DWORD (__stdcall *PBth_BluetoothSetServiceState)(HANDLE, const BLUETOOTH_DEVICE_INFO*, const GUID*, DWORD); +typedef DWORD (__stdcall *PBth_BluetoothAuthenticateDevice)(HWND, HANDLE, BLUETOOTH_DEVICE_INFO*, PWCHAR, ULONG); PHidD_GetHidGuid HidD_GetHidGuid = NULL; PHidD_GetAttributes HidD_GetAttributes = NULL; @@ -67,12 +73,15 @@ PBth_BluetoothFindRadioClose Bth_BluetoothFindRadioClose = NULL; PBth_BluetoothGetRadioInfo Bth_BluetoothGetRadioInfo = NULL; PBth_BluetoothRemoveDevice Bth_BluetoothRemoveDevice = NULL; PBth_BluetoothSetServiceState Bth_BluetoothSetServiceState = NULL; +PBth_BluetoothAuthenticateDevice Bth_BluetoothAuthenticateDevice = NULL; HINSTANCE hid_lib = NULL; HINSTANCE bthprops_lib = NULL; static int initialized = 0; +std::unordered_map g_connect_times; + inline void init_lib() { if (!initialized) @@ -109,12 +118,13 @@ inline void init_lib() Bth_BluetoothGetRadioInfo = (PBth_BluetoothGetRadioInfo)GetProcAddress(bthprops_lib, "BluetoothGetRadioInfo"); Bth_BluetoothRemoveDevice = (PBth_BluetoothRemoveDevice)GetProcAddress(bthprops_lib, "BluetoothRemoveDevice"); Bth_BluetoothSetServiceState = (PBth_BluetoothSetServiceState)GetProcAddress(bthprops_lib, "BluetoothSetServiceState"); + Bth_BluetoothAuthenticateDevice = (PBth_BluetoothAuthenticateDevice)GetProcAddress(bthprops_lib, "BluetoothAuthenticateDevice"); if (!Bth_BluetoothFindDeviceClose || !Bth_BluetoothFindFirstDevice || !Bth_BluetoothFindFirstRadio || !Bth_BluetoothFindNextDevice || !Bth_BluetoothFindNextRadio || !Bth_BluetoothFindRadioClose || !Bth_BluetoothGetRadioInfo || !Bth_BluetoothRemoveDevice || - !Bth_BluetoothSetServiceState) + !Bth_BluetoothSetServiceState || !Bth_BluetoothAuthenticateDevice) { PanicAlertT("Failed to load bthprops.cpl"); exit(EXIT_FAILURE); @@ -127,306 +137,335 @@ inline void init_lib() namespace WiimoteReal { +template +void ProcessWiimotes(bool new_scan, T& callback); + +bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT&); +void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&); +bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&); + +WiimoteScanner::WiimoteScanner() + : m_run_thread() + , m_want_wiimotes() +{ + init_lib(); +} + +WiimoteScanner::~WiimoteScanner() +{ + // TODO: what do we want here? + ProcessWiimotes(false, [](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + { + RemoveWiimote(btdi); + }); +} + +void WiimoteScanner::Update() +{ + bool forgot_some = false; + + ProcessWiimotes(false, [&](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + { + forgot_some |= ForgetWiimote(btdi); + }); + + // Some hacks that allows disconnects to be detected before connections are handled + // workaround for wiimote 1 moving to slot 2 on temporary disconnect + if (forgot_some) + SLEEP(100); +} + // Find and connect wiimotes. // Does not replace already found wiimotes even if they are disconnected. // wm is an array of max_wiimotes wiimotes // Returns the total number of found and connected wiimotes. -int FindWiimotes(Wiimote** wm, int max_wiimotes) +std::vector WiimoteScanner::FindWiimotes() { - GUID device_id; - HANDLE dev; - HDEVINFO device_info; - int found_wiimotes = 0; - DWORD len; - SP_DEVICE_INTERFACE_DATA device_data; - PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; - HIDD_ATTRIBUTES attr; - - init_lib(); - - // Count the number of already found wiimotes - for (int i = 0; i < MAX_WIIMOTES; ++i) + ProcessWiimotes(true, [](HANDLE hRadio, const BLUETOOTH_RADIO_INFO& rinfo, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { - if (wm[i]) - found_wiimotes++; - } - - device_data.cbSize = sizeof(device_data); + ForgetWiimote(btdi); + AttachWiimote(hRadio, rinfo, btdi); + }); // Get the device id + GUID device_id; HidD_GetHidGuid(&device_id); // Get all hid devices connected - device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); + HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); - for (int index = 0; found_wiimotes < max_wiimotes; ++index) + std::vector wiimotes; + + SP_DEVICE_INTERFACE_DATA device_data; + device_data.cbSize = sizeof(device_data); + PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; + + for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data); ++index) { - if (detail_data) - { - free(detail_data); - detail_data = NULL; - } - - // Query the next hid device info - if (!SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data)) - break; - // Get the size of the data block required + DWORD len; SetupDiGetDeviceInterfaceDetail(device_info, &device_data, NULL, 0, &len, NULL); detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len); detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); // Query the data for this device - if (!SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) - continue; - - // Determine if this wiimote has already been found. - bool found = false; - for(int i = 0; i < MAX_WIIMOTES; i++) + if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) { - if(wm[i] && strcmp(wm[i]->devicepath, detail_data->DevicePath) == 0) - { - found = true; - break; - } + auto const wm = new Wiimote; + wm->devicepath = detail_data->DevicePath; + wiimotes.push_back(wm); } - if (found) - continue; - // Open new device - dev = CreateFile(detail_data->DevicePath, - (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE), - NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - if (dev == INVALID_HANDLE_VALUE) - continue; - - // Get device attributes - attr.Size = sizeof(attr); - HidD_GetAttributes(dev, &attr); - - // 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; - CloseHandle(dev); - } - else - { - ++found_wiimotes; - } - } - - if (detail_data) free(detail_data); + } SetupDiDestroyDeviceInfoList(device_info); - return found_wiimotes; + // Don't mind me, just a random sleep to fix stuff on Windows + //if (!wiimotes.empty()) + // SLEEP(2000); + + return wiimotes; +} + +bool WiimoteScanner::IsReady() const +{ + // TODO: don't search for a radio each time + + BLUETOOTH_FIND_RADIO_PARAMS radioParam; + radioParam.dwSize = sizeof(radioParam); + + HANDLE hRadio; + HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); + + if (NULL != hFindRadio) + { + Bth_BluetoothFindRadioClose(hFindRadio); + return true; + } + else + { + return false; + } } // Connect to a wiimote with a known device path. bool Wiimote::Connect() { - if (IsConnected()) return false; + if (IsConnected()) + return false; - if (!dev_handle) + dev_handle = CreateFile(devicepath.c_str(), + GENERIC_READ | GENERIC_WRITE, + // Having no FILE_SHARE_WRITE disallows us from connecting to the same wiimote twice. + // This is what "WiiYourself" does. + FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + + if (dev_handle == INVALID_HANDLE_VALUE) { - dev_handle = CreateFile(devicepath, - (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE), - NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - if (dev_handle == INVALID_HANDLE_VALUE) - return false; - } - - hid_overlap.hEvent = CreateEvent(NULL, 1, 1, _T("")); - hid_overlap.Offset = 0; - hid_overlap.OffsetHigh = 0; - - m_connected = true; - - // Try a handshake to see if the device is actually connected - if (!Handshake()) - { - m_connected = false; + dev_handle = 0; return false; } - // Set LEDs - SetLEDs(WIIMOTE_LED_1 << index); +#if 0 + HIDD_ATTRIBUTES attr; + attr.Size = sizeof(attr); + if (!HidD_GetAttributes(dev_handle, &attr)) + { + CloseHandle(dev_handle); + dev_handle = 0; + return false; + } +#endif - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); + hid_overlap_read = OVERLAPPED(); + hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL); + hid_overlap_write = OVERLAPPED(); + hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL); + + // TODO: thread isn't started here now, do this elsewhere // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate +/* if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL)) { ERROR_LOG(WIIMOTE, "Failed to set wiimote thread priority"); } - - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); - +*/ return true; } -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { if (!IsConnected()) return; - m_connected = false; - - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); - CloseHandle(dev_handle); dev_handle = 0; - ResetEvent(&hid_overlap); + CloseHandle(hid_overlap_read.hEvent); + CloseHandle(hid_overlap_write.hEvent); } -int Wiimote::IORead(unsigned char* buf) +bool Wiimote::IsConnected() const { - DWORD b, r; - - init_lib(); - - if (!IsConnected()) - return 0; + return dev_handle != 0; +} +// positive = read packet +// negative = didn't read packet +// zero = error +int Wiimote::IORead(u8* buf) +{ + // used below for a warning *buf = 0; - if (!ReadFile(dev_handle, buf, MAX_PAYLOAD, &b, &hid_overlap)) + + DWORD bytes; + ResetEvent(hid_overlap_read.hEvent); + if (!ReadFile(dev_handle, buf, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read)) { - // Partial read - b = GetLastError(); + auto const err = GetLastError(); - if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) + if (ERROR_IO_PENDING == err) + { + auto const r = WaitForSingleObject(hid_overlap_read.hEvent, WIIMOTE_DEFAULT_TIMEOUT); + if (WAIT_TIMEOUT == r) + { + // Timeout - cancel and continue + if (*buf) + WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", + WIIMOTE_DEFAULT_TIMEOUT); + + CancelIo(dev_handle); + bytes = -1; + } + else if (WAIT_FAILED == r) + { + WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); + bytes = 0; + } + else if (WAIT_OBJECT_0 == r) + { + if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE)) + { + WARN_LOG(WIIMOTE, "GetOverlappedResult failed on wiimote %i.", index + 1); + bytes = 0; + } + } + else + { + bytes = 0; + } + } + else if (ERROR_HANDLE_EOF == err) { // Remote disconnect - RealDisconnect(); - return 0; + bytes = 0; } - - r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); - if (r == WAIT_TIMEOUT) + else if (ERROR_DEVICE_NOT_CONNECTED == err) { - // Timeout - cancel and continue - - if (*buf) - WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", - WIIMOTE_DEFAULT_TIMEOUT); - - CancelIo(dev_handle); - ResetEvent(hid_overlap.hEvent); - return 0; + // Remote disconnect + bytes = 0; } - else if (r == WAIT_FAILED) + else { - WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); - return 0; - } - - if (!GetOverlappedResult(dev_handle, &hid_overlap, &b, 0)) - { - return 0; + bytes = 0; } } - // This needs to be done even if ReadFile fails, essential during init - // Move the data over one, so we can add back in data report indicator byte (here, 0xa1) - memmove(buf + 1, buf, MAX_PAYLOAD - 1); - buf[0] = 0xa1; + if (bytes > 0) + { + // Move the data over one, so we can add back in data report indicator byte (here, 0xa1) + std::copy_n(buf, MAX_PAYLOAD - 1, buf + 1); + buf[0] = 0xa1; - ResetEvent(hid_overlap.hEvent); - return MAX_PAYLOAD; // XXX + // TODO: is this really needed? + bytes = MAX_PAYLOAD; + } + + return bytes; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::IOWrite(const u8* buf, int len) { - DWORD bytes, dw; - int i; - - init_lib(); - - if (!IsConnected()) - return 0; - switch (stack) { - case MSBT_STACK_UNKNOWN: - { - // Try to auto-detect the stack type - if (i = WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap)) - { - // Bluesoleil will always return 1 here, even if it's not connected - stack = MSBT_STACK_BLUESOLEIL; - return i; - } + case MSBT_STACK_UNKNOWN: + { + // Try to auto-detect the stack type + stack = MSBT_STACK_BLUESOLEIL; + if (IOWrite(buf, len)) + return 1; - if (i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1)) - { - stack = MSBT_STACK_MS; - return i; - } + stack = MSBT_STACK_MS; + if (IOWrite(buf, len)) + return 1; - dw = GetLastError(); - // Checking for 121 = timeout on semaphore/device off/disconnected to - // avoid trouble with other stacks toshiba/widcomm - if (dw == 121) - { - NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: Timeout"); - RealDisconnect(); - } - else ERROR_LOG(WIIMOTE, - "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); - return 0; - } + stack = MSBT_STACK_UNKNOWN; + break; + } + case MSBT_STACK_MS: + { + auto result = HidD_SetOutputReport(dev_handle, const_cast(buf) + 1, len - 1); + //FlushFileBuffers(dev_handle); - case MSBT_STACK_MS: - i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); - dw = GetLastError(); - - if (dw == 121) + if (!result) + { + auto err = GetLastError(); + if (err == 121) { // Semaphore timeout NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); - RealDisconnect(); - return 0; } - return i; + else + { + WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err); + } + } - case MSBT_STACK_BLUESOLEIL: - return WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + return result; + break; + } + case MSBT_STACK_BLUESOLEIL: + { + u8 big_buf[MAX_PAYLOAD]; + if (len < MAX_PAYLOAD) + { + std::copy(buf, buf + len, big_buf); + std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0); + buf = big_buf; + } + + ResetEvent(hid_overlap_write.hEvent); + DWORD bytes = 0; + if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write)) + { + // WriteFile always returns true with bluesoleil. + return 1; + } + else + { + auto const err = GetLastError(); + if (ERROR_IO_PENDING == err) + { + CancelIo(dev_handle); + } + } + break; + } } return 0; } -int UnPair() +// invokes callback for each found wiimote bluetooth device +template +void ProcessWiimotes(bool new_scan, T& callback) { - // TODO: - return 0; -} - -// WiiMote Pair-Up, function will return amount of either new paired or unpaired devices -// negative number on failure -int PairUp(bool unpair) -{ - init_lib(); - // match strings like "Nintendo RVL-WBC-01", "Nintendo RVL-CNT-01", "Nintendo RVL-CNT-01-TR" - const std::wregex wiimote_device_name(L"Nintendo RVL-\\w{3}-\\d{2}(-\\w{2})?"); - - int nPaired = 0; + const std::wregex wiimote_device_name(L"Nintendo RVL-.*"); BLUETOOTH_DEVICE_SEARCH_PARAMS srch; srch.dwSize = sizeof(srch); @@ -436,83 +475,50 @@ int PairUp(bool unpair) // fConnected BT Devices srch.fReturnConnected = true; srch.fReturnUnknown = true; - srch.fIssueInquiry = true; - srch.cTimeoutMultiplier = 2; // == (2 * 1.28) seconds + srch.fIssueInquiry = new_scan; + // multiple of 1.28 seconds + srch.cTimeoutMultiplier = 2; BLUETOOTH_FIND_RADIO_PARAMS radioParam; radioParam.dwSize = sizeof(radioParam); HANDLE hRadio; + + // TODO: save radio(s) in the WiimoteScanner constructor? // Enumerate BT radios HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); - - if (NULL == hFindRadio) - return -1; - while (hFindRadio) { BLUETOOTH_RADIO_INFO radioInfo; radioInfo.dwSize = sizeof(radioInfo); - // TODO: check for SUCCEEDED() - Bth_BluetoothGetRadioInfo(hRadio, &radioInfo); - - srch.hRadio = hRadio; - - BLUETOOTH_DEVICE_INFO btdi; - btdi.dwSize = sizeof(btdi); - - // Enumerate BT devices - HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi); - while (hFindDevice) + auto const rinfo_result = Bth_BluetoothGetRadioInfo(hRadio, &radioInfo); + if (ERROR_SUCCESS == rinfo_result) { - // btdi.szName is sometimes missings it's content - it's a bt feature.. - DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ", - btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered); + srch.hRadio = hRadio; - if (std::regex_match(btdi.szName, wiimote_device_name)) + BLUETOOTH_DEVICE_INFO btdi; + btdi.dwSize = sizeof(btdi); + + // Enumerate BT devices + HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi); + while (hFindDevice) { - if (unpair) - { - if (SUCCEEDED(Bth_BluetoothRemoveDevice(&btdi.Address))) - { - NOTICE_LOG(WIIMOTE, - "Pair-Up: Automatically removed BT Device on shutdown: %08x", - GetLastError()); - ++nPaired; - } - } - else - { - if (false == btdi.fConnected) - { - // TODO: improve the read of the BT driver, esp. when batteries - // of the wiimote are removed while being fConnected - if (btdi.fRemembered) - { - // Make Windows forget old expired pairing. We can pretty - // much ignore the return value here. It either worked - // (ERROR_SUCCESS), or the device did not exist - // (ERROR_NOT_FOUND). In both cases, there is nothing left. - Bth_BluetoothRemoveDevice(&btdi.Address); - } + // btdi.szName is sometimes missings it's content - it's a bt feature.. + DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ", + btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered); - // Activate service - const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, - &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); - if (SUCCEEDED(hr)) - ++nPaired; - else - ERROR_LOG(WIIMOTE, "Pair-Up: BluetoothSetServiceState() returned %08x", hr); - } + if (std::regex_match(btdi.szName, wiimote_device_name)) + { + callback(hRadio, radioInfo, btdi); } - } - if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi)) - { - Bth_BluetoothFindDeviceClose(hFindDevice); - hFindDevice = NULL; + if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi)) + { + Bth_BluetoothFindDeviceClose(hFindDevice); + hFindDevice = NULL; + } } } @@ -522,8 +528,76 @@ int PairUp(bool unpair) hFindRadio = NULL; } } +} - return nPaired; +void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + //if (btdi.fConnected) + { + if (SUCCEEDED(Bth_BluetoothRemoveDevice(&btdi.Address))) + { + NOTICE_LOG(WIIMOTE, "Removed BT Device", GetLastError()); + } + } +} + +bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + // We don't want "remembered" devices. + // SetServiceState will just fail with them.. + if (!btdi.fConnected && !btdi.fRemembered) + { + auto const& wm_addr = btdi.Address.rgBytes; + + NOTICE_LOG(WIIMOTE, "Found wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.", + wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]); + +#if defined(AUTHENTICATE_WIIMOTES) + // Authenticate + auto const& radio_addr = radio_info.address.rgBytes; + const DWORD auth_result = Bth_BluetoothAuthenticateDevice(NULL, hRadio, &btdi, + std::vector(radio_addr, radio_addr + 6).data(), 6); + + if (ERROR_SUCCESS != auth_result) + ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothAuthenticateDevice returned %08x", auth_result); +#endif + // Activate service + const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, + &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); + + g_connect_times[btdi.Address.ullLong] = std::time(nullptr); + + if (FAILED(hr)) + ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothSetServiceState returned %08x", hr); + else + return true; + } + + return false; +} + +// Removes remembered non-connected devices +bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + if (!btdi.fConnected && btdi.fRemembered) + { + // Time to avoid RemoveDevice after SetServiceState. + // Sometimes SetServiceState takes a while.. + auto const avoid_forget_seconds = 5.0; + + auto pair_time = g_connect_times.find(btdi.Address.ullLong); + if (pair_time == g_connect_times.end() + || std::difftime(time(nullptr), pair_time->second) >= avoid_forget_seconds) + { + // Make Windows forget about device so it will re-find it if visible. + // This is also required to detect a disconnect for some reason.. + NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); + Bth_BluetoothRemoveDevice(&btdi.Address); + return true; + } + } + + return false; } }; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 8e3586f7d9..cec18ed63a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -40,8 +40,11 @@ { IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; + + std::lock_guard lk(WiimoteReal::g_refresh_lock); - for (int i = 0; i < MAX_WIIMOTES; i++) { + for (int i = 0; i < MAX_WIIMOTES; i++) + { if (WiimoteReal::g_wiimotes[i] == NULL) continue; if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE) @@ -77,8 +80,11 @@ { IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; + + std::lock_guard lk(WiimoteReal::g_refresh_lock); - for (int i = 0; i < MAX_WIIMOTES; i++) { + for (int i = 0; i < MAX_WIIMOTES; i++) + { if (WiimoteReal::g_wiimotes[i] == NULL) continue; if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE) @@ -92,41 +98,47 @@ WARN_LOG(WIIMOTE, "Lost channel to wiimote %i", wm->index + 1); - wm->RealDisconnect(); + wm->Disconnect(); } @end namespace WiimoteReal { -// Find wiimotes. -// wm is an array of max_wiimotes wiimotes -// Returns the total number of found wiimotes. -int FindWiimotes(Wiimote **wm, int max_wiimotes) +WiimoteScanner::WiimoteScanner() + : m_run_thread() + , m_want_wiimotes() +{} + +WiimoteScanner::~WiimoteScanner() +{} + +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() { + // TODO: find the device in the constructor and save it for later + + std::vector wiimotes; IOBluetoothHostController *bth; IOBluetoothDeviceInquiry *bti; SearchBT *sbt; NSEnumerator *en; - int found_devices = 0, found_wiimotes = 0; - - // Count the number of already found wiimotes - for (int i = 0; i < MAX_WIIMOTES; ++i) - if (wm[i]) - found_wiimotes++; bth = [[IOBluetoothHostController alloc] init]; - if ([bth addressAsString] == nil) { + if ([bth addressAsString] == nil) + { WARN_LOG(WIIMOTE, "No bluetooth host controller"); [bth release]; - return found_wiimotes; + return wiimotes; } sbt = [[SearchBT alloc] init]; - sbt->maxDevices = max_wiimotes - found_wiimotes; + sbt->maxDevices = 32; bti = [[IOBluetoothDeviceInquiry alloc] init]; [bti setDelegate: sbt]; - [bti setInquiryLength: 5]; + [bti setInquiryLength: 2]; if ([bti start] == kIOReturnSuccess) [bti retain]; @@ -136,10 +148,10 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes) CFRunLoopRun(); [bti stop]; - found_devices = [[bti foundDevices] count]; + int found_devices = [[bti foundDevices] count]; - NOTICE_LOG(WIIMOTE, "Found %i bluetooth device%c", found_devices, - found_devices == 1 ? '\0' : 's'); + if (found_devices) + NOTICE_LOG(WIIMOTE, "Found %i bluetooth devices", found_devices); en = [[bti foundDevices] objectEnumerator]; for (int i = 0; i < found_devices; i++) @@ -147,78 +159,88 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes) IOBluetoothDevice *dev = [en nextObject]; if (!IsValidBluetoothName([[dev name] UTF8String])) continue; - // Find an unused slot - for (int k = 0; k < MAX_WIIMOTES; k++) { - if (wm[k] != NULL || - !(g_wiimote_sources[k] & WIIMOTE_SRC_REAL)) - continue; - wm[k] = new Wiimote(k); - wm[k]->btd = dev; - found_wiimotes++; - break; - } + Wiimote *wm = new Wiimote(); + wm->btd = dev; + wiimotes.push_back(wm); } [bth release]; [bti release]; [sbt release]; - return found_wiimotes; + return wiimotes; +} + +bool WiimoteScanner::IsReady() const +{ + // TODO: only return true when a BT device is present + return true; } // Connect to a wiimote with a known address. bool Wiimote::Connect() { - ConnectBT *cbt = [[ConnectBT alloc] init]; - if (IsConnected()) return false; + ConnectBT *cbt = [[ConnectBT alloc] init]; + [btd openL2CAPChannelSync: &cchan withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; [btd openL2CAPChannelSync: &ichan withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt]; - if (ichan == NULL || cchan == NULL) { + if (ichan == NULL || cchan == NULL) + { ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); - RealDisconnect(); + Disconnect(); + + [cbt release]; return false; } + + // As of 10.8 these need explicit retaining or writing to the wiimote has a very high + // chance of crashing and burning. + [ichan retain]; + [cchan retain]; NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", index + 1, [[btd getAddressString] UTF8String]); m_connected = true; - Handshake(); - SetLEDs(WIIMOTE_LED_1 << index); - - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); - [cbt release]; - return true; } // Disconnect a wiimote. -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { + if (btd != NULL) + [btd closeConnection]; + + if (ichan != NULL) + [ichan release]; + + if (cchan != NULL) + [cchan release]; + + btd = NULL; + cchan = NULL; + ichan = NULL; + if (!IsConnected()) return; NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1); m_connected = false; +} - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); - - [btd closeConnection]; - - btd = NULL; - cchan = NULL; - ichan = NULL; +bool Wiimote::IsConnected() const +{ + return m_connected; } int Wiimote::IORead(unsigned char *buf) @@ -235,14 +257,14 @@ int Wiimote::IORead(unsigned char *buf) return bytes; } -int Wiimote::IOWrite(unsigned char *buf, int len) +int Wiimote::IOWrite(const unsigned char *buf, int len) { IOReturn ret; if (!IsConnected()) return 0; - ret = [ichan writeAsync: buf length: len refcon: nil]; + ret = [ichan writeAsync: const_cast((void *)buf) length: len refcon: nil]; if (ret == kIOReturnSuccess) return len; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 5e03e36e68..3608c060fc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -16,12 +16,15 @@ // http://code.google.com/p/dolphin-emu/ #include +#include #include #include "Common.h" #include "IniFile.h" #include "StringUtil.h" #include "Timer.h" +#include "Host.h" +#include "ConfigManager.h" #include "WiimoteReal.h" @@ -32,36 +35,43 @@ unsigned int g_wiimote_sources[MAX_WIIMOTES]; namespace WiimoteReal { +void HandleFoundWiimotes(const std::vector&); +void TryToConnectWiimote(Wiimote*); +void HandleWiimoteDisconnect(int index); +void DoneWithWiimote(int index); + bool g_real_wiimotes_initialized = false; -unsigned int g_wiimotes_found = 0; -std::mutex g_refresh_lock; +std::recursive_mutex g_refresh_lock; -Wiimote *g_wiimotes[MAX_WIIMOTES]; +Wiimote* g_wiimotes[MAX_WIIMOTES]; -Wiimote::Wiimote(const unsigned int _index) - : index(_index) +WiimoteScanner g_wiimote_scanner; + +Wiimote::Wiimote() + : index() #ifdef __APPLE__ - , inputlen(0) + , btd(), ichan(), cchan(), inputlen(), m_connected() #elif defined(__linux__) && HAVE_BLUEZ - , out_sock(-1), in_sock(-1) + , cmd_sock(-1), int_sock(-1) #elif defined(_WIN32) , dev_handle(0), stack(MSBT_STACK_UNKNOWN) #endif - , leds(0), m_last_data_report(Report((u8 *)NULL, 0)) - , m_channel(0), m_connected(false) + , m_last_data_report(Report((u8 *)NULL, 0)) + , m_channel(0), m_run_thread(false) { #if defined(__linux__) && HAVE_BLUEZ bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; #endif - - DisableDataReporting(); } Wiimote::~Wiimote() { - RealDisconnect(); + StopThread(); + if (IsConnected()) + Disconnect(); + ClearReadQueue(); // clear write queue @@ -70,26 +80,28 @@ Wiimote::~Wiimote() delete[] rpt.first; } -// Silly, copying data n stuff, o well, don't use this too often -void Wiimote::SendPacket(const u8 rpt_id, const void* const data, const unsigned int size) +// to be called from CPU thread +void Wiimote::QueueReport(u8 rpt_id, const void* _data, unsigned int size) { + auto const data = static_cast(_data); + Report rpt; rpt.second = size + 2; rpt.first = new u8[rpt.second]; - rpt.first[0] = 0xA1; + rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT; rpt.first[1] = rpt_id; - memcpy(rpt.first + 2, data, size); + std::copy(data, data + size, rpt.first + 2); m_write_reports.Push(rpt); } void Wiimote::DisableDataReporting() { - wm_report_mode rpt; + wm_report_mode rpt = {}; rpt.mode = WM_REPORT_CORE; rpt.all_the_time = 0; rpt.continuous = 0; rpt.rumble = 0; - SendPacket(WM_REPORT_MODE, &rpt, sizeof(rpt)); + QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt)); } void Wiimote::ClearReadQueue() @@ -110,7 +122,7 @@ void Wiimote::ControlChannel(const u16 channel, const void* const data, const u3 { // Check for custom communication if (99 == channel) - Disconnect(); + EmuStop(); else { InterruptChannel(channel, data, size); @@ -123,24 +135,24 @@ void Wiimote::ControlChannel(const u16 channel, const void* const data, const u3 } } -void Wiimote::InterruptChannel(const u16 channel, const void* const data, const u32 size) +void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const u32 size) { - if (0 == m_channel) // first interrupt/control channel sent + // first interrupt/control channel sent + if (channel != m_channel) { + m_channel = channel; + ClearReadQueue(); - // request status - wm_request_status rpt; - rpt.rumble = 0; - SendPacket(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); + EmuStart(); } - - m_channel = channel; // this right? + + auto const data = static_cast(_data); Report rpt; rpt.first = new u8[size]; rpt.second = (u8)size; - memcpy(rpt.first, (u8*)data, size); + std::copy(data, data + size, rpt.first); // Convert output DATA packets to SET_REPORT packets. // Nintendo Wiimotes work without this translation, but 3rd @@ -149,13 +161,27 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const { rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT; } - - if (rpt.first[0] == (WM_SET_REPORT | WM_BT_OUTPUT) && - rpt.first[1] == 0x18 && rpt.second == 23) + + // Disallow games from turning off all of the LEDs. + // It makes wiimote connection status confusing. + if (rpt.first[1] == WM_LEDS) { - m_audio_reports.Push(rpt); - return; - } + auto& leds_rpt = *reinterpret_cast(&rpt.first[2]); + if (0 == leds_rpt.leds) + { + // Turn on ALL of the LEDs. + leds_rpt.leds = 0xf; + } + } + else if (rpt.first[1] == WM_WRITE_SPEAKER_DATA + && !SConfig::GetInstance().m_WiimoteEnableSpeaker) + { + // Translate speaker data reports into rumble reports. + rpt.first[1] = WM_CMD_RUMBLE; + // Keep only the rumble bit. + rpt.first[2] &= 0x1; + rpt.second = 3; + } m_write_reports.Push(rpt); } @@ -167,36 +193,45 @@ bool Wiimote::Read() rpt.first = new unsigned char[MAX_PAYLOAD]; rpt.second = IORead(rpt.first); - if (rpt.second > 0 && m_channel > 0) { + if (0 == rpt.second) + { + WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting wiimote %d.", index + 1); + Disconnect(); + } + + if (rpt.second > 0 && m_channel > 0) + { // Add it to queue m_read_reports.Push(rpt); return true; } - delete rpt.first; + delete[] rpt.first; return false; } bool Wiimote::Write() { - Report rpt; - bool audio_written = false; - - if (m_audio_reports.Pop(rpt)) + if (!m_write_reports.Empty()) { - IOWrite(rpt.first, rpt.second); - delete[] rpt.first; - audio_written = true; + Report const& rpt = m_write_reports.Front(); + + bool const is_speaker_data = rpt.first[1] == WM_WRITE_SPEAKER_DATA; + + if (!is_speaker_data || m_last_audio_report.GetTimeDifference() > 5) + { + IOWrite(rpt.first, rpt.second); + + if (is_speaker_data) + m_last_audio_report.Update(); + + delete[] rpt.first; + m_write_reports.Pop(); + return true; + } } - - if (m_write_reports.Pop(rpt)) - { - IOWrite(rpt.first, rpt.second); - delete[] rpt.first; - return true; - } - - return audio_written; + + return false; } // Returns the next report that should be sent @@ -220,6 +255,12 @@ Report Wiimote::ProcessReadQueue() void Wiimote::Update() { + if (!IsConnected()) + { + HandleWiimoteDisconnect(index); + return; + } + // Pop through the queued reports Report const rpt = ProcessReadQueue(); @@ -233,128 +274,151 @@ void Wiimote::Update() delete[] rpt.first; } -void Wiimote::Disconnect() +bool Wiimote::Prepare(int _index) +{ + index = _index; + + // core buttons, no continuous reporting + u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_REPORT_TYPE, 0, 0x30}; + + // Set the active LEDs and turn on rumble. + u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index | 0x1)}; + + // Turn off rumble + u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 0}; + + // Request status report + u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0}; + // TODO: check for sane response? + + return (IOWrite(mode_report, sizeof(mode_report)) + && IOWrite(led_report, sizeof(led_report)) + && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report))) + && IOWrite(req_status_report, sizeof(req_status_report))); +} + +void Wiimote::EmuStart() +{ + DisableDataReporting(); +} + +void Wiimote::EmuStop() { m_channel = 0; DisableDataReporting(); + + NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting"); } -bool Wiimote::IsConnected() +unsigned int CalculateWantedWiimotes() { - return m_connected; + // Figure out how many real wiimotes are required + unsigned int wanted_wiimotes = 0; + for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i]) + ++wanted_wiimotes; + + return wanted_wiimotes; } -// Rumble briefly -void Wiimote::Rumble() +void WiimoteScanner::WantWiimotes(bool do_want) { - if (!IsConnected()) - return; - - unsigned char buffer = 0x01; - DEBUG_LOG(WIIMOTE, "Starting rumble..."); - SendRequest(WM_CMD_RUMBLE, &buffer, 1); - - SLEEP(200); - - DEBUG_LOG(WIIMOTE, "Stopping rumble..."); - buffer = 0x00; - SendRequest(WM_CMD_RUMBLE, &buffer, 1); + m_want_wiimotes = do_want; } -// Set the active LEDs. -// leds is a bitwise or of WIIMOTE_LED_1 through WIIMOTE_LED_4. -void Wiimote::SetLEDs(int new_leds) +void WiimoteScanner::StartScanning() { - unsigned char buffer; - - if (!IsConnected()) - return; - - // Remove the lower 4 bits because they control rumble - buffer = leds = (new_leds & 0xF0); - - SendRequest(WM_CMD_LED, &buffer, 1); + if (!m_run_thread && IsReady()) + { + m_run_thread = true; + m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); + } } -// Send a handshake -bool Wiimote::Handshake() +void WiimoteScanner::StopScanning() { - // Set buffer[0] to 0x04 for continuous reporting - unsigned char buffer[2] = {0x04, 0x30}; - - if (!IsConnected()) - return 0; - - DEBUG_LOG(WIIMOTE, "Sending handshake to wiimote"); - - return SendRequest(WM_CMD_REPORT_TYPE, buffer, 2); + m_run_thread = false; + if (m_scan_thread.joinable()) + { + m_scan_thread.join(); + } } -// Send a packet to the wiimote. -// report_type should be one of WIIMOTE_CMD_LED, WIIMOTE_CMD_RUMBLE, etc. -bool Wiimote::SendRequest(unsigned char report_type, unsigned char* data, int length) +void CheckForDisconnectedWiimotes() { - unsigned char buffer[32] = {WM_SET_REPORT | WM_BT_OUTPUT, report_type}; + std::lock_guard lk(g_refresh_lock); - memcpy(buffer + 2, data, length); + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + if (g_wiimotes[i] && !g_wiimotes[i]->IsConnected()) + HandleWiimoteDisconnect(i); +} - return (IOWrite(buffer, length + 2) != 0); +void WiimoteScanner::ThreadFunc() +{ + Common::SetCurrentThreadName("Wiimote Scanning Thread"); + + NOTICE_LOG(WIIMOTE, "Wiimote scanning has started"); + + while (m_run_thread) + { + std::vector found_wiimotes; + + //NOTICE_LOG(WIIMOTE, "in loop"); + + if (m_want_wiimotes) + found_wiimotes = FindWiimotes(); + else + { + // Does stuff needed to detect disconnects on Windows + Update(); + } + + //NOTICE_LOG(WIIMOTE, "after update"); + + // TODO: this is a fairly lame place for this + CheckForDisconnectedWiimotes(); + + HandleFoundWiimotes(found_wiimotes); + + //std::this_thread::yield(); + Common::SleepCurrentThread(500); + } + + NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped"); +} + +void Wiimote::StartThread() +{ + m_run_thread = true; + m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); +} + +void Wiimote::StopThread() +{ + m_run_thread = false; + if (m_wiimote_thread.joinable()) + m_wiimote_thread.join(); } void Wiimote::ThreadFunc() { - char thname[] = "Wiimote # Thread"; - thname[8] = (char)('1' + index); - Common::SetCurrentThreadName(thname); - - // rumble briefly - Rumble(); + Common::SetCurrentThreadName("Wiimote Device Thread"); // main loop - while (IsConnected()) + while (m_run_thread && IsConnected()) { #ifdef __APPLE__ - while (Write()) {} - Common::SleepCurrentThread(1); + // Reading happens elsewhere on OSX + bool const did_something = Write(); #else - bool read = false; - while (Write() || (read = true, Read())) - { - if (m_audio_reports.Size() && !read) - Read(); - Common::SleepCurrentThread(m_audio_reports.Size() ? 5 : 2); - read = false; - } + bool const did_something = Write() || Read(); #endif + if (!did_something) + Common::SleepCurrentThread(1); } } -#ifndef _WIN32 -// Connect all discovered wiimotes -// Return the number of wiimotes that successfully connected. -static int ConnectWiimotes(Wiimote** wm) -{ - int connected = 0; - - for (int i = 0; i < MAX_WIIMOTES; ++i) - { - if (!wm[i] || wm[i]->IsConnected()) - continue; - - if (wm[i]->Connect()) - ++connected; - else - { - delete wm[i]; - wm[i] = NULL; - } - } - - return connected; -} -#endif - void LoadSettings() { std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + WIIMOTE_INI_NAME ".ini"; @@ -372,116 +436,181 @@ void LoadSettings() } } -unsigned int Initialize() +// config dialog calls this when some settings change +void Initialize() { - // Return if already initialized + if (SConfig::GetInstance().m_WiimoteContinuousScanning) + g_wiimote_scanner.StartScanning(); + else + g_wiimote_scanner.StopScanning(); + + std::lock_guard lk(g_refresh_lock); + + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + if (g_real_wiimotes_initialized) - return g_wiimotes_found; + return; - memset(g_wiimotes, 0, sizeof(g_wiimotes)); + NOTICE_LOG(WIIMOTE, "WiimoteReal::Initialize"); - // Only call FindWiimotes with the number of slots configured for real wiimotes - unsigned int wanted_wiimotes = 0; - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]) - ++wanted_wiimotes; - - // Don't bother initializing if we don't want any real wiimotes - if (0 == wanted_wiimotes) - { - g_wiimotes_found = 0; - return 0; - } - - // Initialized g_real_wiimotes_initialized = true; - - g_wiimotes_found = FindWiimotes(g_wiimotes, wanted_wiimotes); - - DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted", - g_wiimotes_found, wanted_wiimotes); - -#ifndef _WIN32 - atexit(WiimoteReal::Shutdown); - g_wiimotes_found = ConnectWiimotes(g_wiimotes); -#endif - - DEBUG_LOG(WIIMOTE, "Connected to %i Real Wiimotes", g_wiimotes_found); - - return g_wiimotes_found; } void Shutdown(void) -{ - if (false == g_real_wiimotes_initialized) +{ + g_wiimote_scanner.StopScanning(); + + std::lock_guard lk(g_refresh_lock); + + if (!g_real_wiimotes_initialized) return; - // Uninitialized + NOTICE_LOG(WIIMOTE, "WiimoteReal::Shutdown"); + g_real_wiimotes_initialized = false; - // Delete wiimotes for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (g_wiimotes[i]) + HandleWiimoteDisconnect(i); +} + +void ChangeWiimoteSource(unsigned int index, int source) +{ + { + std::lock_guard lk(g_refresh_lock); + + g_wiimote_sources[index] = source; + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + + // kill real connection (or swap to different slot) + DoneWithWiimote(index); + } + + // reconnect to emu + Host_ConnectWiimote(index, false); + if (WIIMOTE_SRC_EMU & source) + Host_ConnectWiimote(index, true); +} + +void TryToConnectWiimote(Wiimote* wm) +{ + std::unique_lock lk(g_refresh_lock); + + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + { + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] + && !g_wiimotes[i]) { - delete g_wiimotes[i]; - g_wiimotes[i] = NULL; + if (wm->Connect() && wm->Prepare(i)) + { + NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1); + + std::swap(g_wiimotes[i], wm); + g_wiimotes[i]->StartThread(); + + Host_ConnectWiimote(i, true); + } + break; } + } + + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + + lk.unlock(); + + delete wm; +} + +void DoneWithWiimote(int index) +{ + std::lock_guard lk(g_refresh_lock); + + if (g_wiimotes[index]) + { + g_wiimotes[index]->StopThread(); + + // First see if we can use this real wiimote in another slot. + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + { + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] + && !g_wiimotes[i]) + { + if (g_wiimotes[index]->Prepare(i)) + { + std::swap(g_wiimotes[i], g_wiimotes[index]); + g_wiimotes[i]->StartThread(); + + Host_ConnectWiimote(i, true); + } + break; + } + } + } + + // else, just disconnect the wiimote + HandleWiimoteDisconnect(index); +} + +void HandleWiimoteDisconnect(int index) +{ + Wiimote* wm = NULL; + + { + std::lock_guard lk(g_refresh_lock); + std::swap(wm, g_wiimotes[index]); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + } + + if (wm) + { + delete wm; + NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); + } +} + +void HandleFoundWiimotes(const std::vector& wiimotes) +{ + std::for_each(wiimotes.begin(), wiimotes.end(), TryToConnectWiimote); } // This is called from the GUI thread void Refresh() { - std::lock_guard lk(g_refresh_lock); - -#ifdef _WIN32 - Shutdown(); - Initialize(); -#else - // Make sure real wiimotes have been initialized - if (!g_real_wiimotes_initialized) + g_wiimote_scanner.StopScanning(); + { - Initialize(); - return; + std::unique_lock lk(g_refresh_lock); + std::vector found_wiimotes; + + if (0 != CalculateWantedWiimotes()) + { + // Don't hang dolphin when searching + lk.unlock(); + found_wiimotes = g_wiimote_scanner.FindWiimotes(); + lk.lock(); } - // Find the number of slots configured for real wiimotes - unsigned int wanted_wiimotes = 0; - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]) - ++wanted_wiimotes; + CheckForDisconnectedWiimotes(); - // Remove wiimotes that are paired with slots no longer configured for a - // real wiimote or that are disconnected - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (g_wiimotes[i] && (!(WIIMOTE_SRC_REAL & g_wiimote_sources[i]) || - !g_wiimotes[i]->IsConnected())) + // Brief rumble for already connected wiimotes. + for (int i = 0; i != MAX_WIIMOTES; ++i) + { + if (g_wiimotes[i]) { - delete g_wiimotes[i]; - g_wiimotes[i] = NULL; - --g_wiimotes_found; + g_wiimotes[i]->StopThread(); + g_wiimotes[i]->Prepare(i); + g_wiimotes[i]->StartThread(); } - - // Scan for wiimotes if we want more - if (wanted_wiimotes > g_wiimotes_found) - { - // Scan for wiimotes - unsigned int num_wiimotes = FindWiimotes(g_wiimotes, wanted_wiimotes); - - DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted", num_wiimotes, wanted_wiimotes); - - // Connect newly found wiimotes. - int num_new_wiimotes = ConnectWiimotes(g_wiimotes); - - DEBUG_LOG(WIIMOTE, "Connected to %i additional Real Wiimotes", num_new_wiimotes); - - g_wiimotes_found = num_wiimotes; } -#endif + + HandleFoundWiimotes(found_wiimotes); + } + + Initialize(); } void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->InterruptChannel(_channelID, _pData, _Size); @@ -489,7 +618,7 @@ void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u3 void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->ControlChannel(_channelID, _pData, _Size); @@ -499,32 +628,30 @@ void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 // Read the Wiimote once void Update(int _WiimoteNumber) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->Update(); + + // Wiimote::Update() may remove the wiimote if it was disconnected. + if (!g_wiimotes[_WiimoteNumber]) + { + Host_ConnectWiimote(_WiimoteNumber, false); + } } void StateChange(EMUSTATE_CHANGE newState) { - //std::lock_guard lk(g_refresh_lock); + //std::lock_guard lk(g_refresh_lock); // TODO: disable/enable auto reporting, maybe } -#define ARRAYSIZE(_arr) (sizeof(_arr)/(sizeof(_arr[0]))) - -bool IsValidBluetoothName(const char* name) { - static const char* kValidWiiRemoteBluetoothNames[] = { - "Nintendo RVL-CNT-01", - "Nintendo RVL-CNT-01-TR", - "Nintendo RVL-WBC-01", - }; - for (size_t i = 0; i < ARRAYSIZE(kValidWiiRemoteBluetoothNames); i++) - if (strcmp(name, kValidWiiRemoteBluetoothNames[i]) == 0) - return true; - return false; +bool IsValidBluetoothName(const std::string& name) +{ + std::string const prefix("Nintendo RVL-"); + return name.size() > prefix.size() && + std::equal(prefix.begin(), prefix.end(), name.begin()); } - }; // end of namespace diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index cd1080903f..793a13ceb0 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -20,11 +20,13 @@ #define WIIMOTE_REAL_H #include +#include #include "WiimoteRealBase.h" #include "ChunkFile.h" #include "Thread.h" #include "FifoQueue.h" +#include "Timer.h" #include "../Wiimote.h" #include "../WiimoteEmu/WiimoteEmu.h" @@ -41,7 +43,7 @@ class Wiimote : NonCopyable { friend class WiimoteEmu::Wiimote; public: - Wiimote(const unsigned int _index); + Wiimote(); ~Wiimote(); void ControlChannel(const u16 channel, const void* const data, const u32 size); @@ -52,15 +54,29 @@ public: bool Read(); bool Write(); - bool Connect(); - bool IsConnected(); - void Disconnect(); - void DisableDataReporting(); - void Rumble(); - void SendPacket(const u8 rpt_id, const void* const data, const unsigned int size); - void RealDisconnect(); - const unsigned int index; + void StartThread(); + void StopThread(); + + // "handshake" / stop packets + void EmuStart(); + void EmuStop(); + + // connecting and disconnecting from physical devices + // (using address inserted by FindWiimotes) + bool Connect(); + void Disconnect(); + + // TODO: change to something like IsRelevant + bool IsConnected() const; + + bool Prepare(int index); + + void DisableDataReporting(); + + void QueueReport(u8 rpt_id, const void* data, unsigned int size); + + int index; #if defined(__APPLE__) IOBluetoothDevice *btd; @@ -68,18 +84,19 @@ public: IOBluetoothL2CAPChannel *cchan; char input[MAX_PAYLOAD]; int inputlen; + bool m_connected; #elif defined(__linux__) && HAVE_BLUEZ bdaddr_t bdaddr; // Bluetooth address - int out_sock; // Output socket - int in_sock; // Input socket + int cmd_sock; // Command socket + int int_sock; // Interrupt socket + #elif defined(_WIN32) - char devicepath[255]; // Unique wiimote reference + std::string devicepath; // Unique wiimote reference //ULONGLONG btaddr; // Bluetooth address HANDLE dev_handle; // HID handle - OVERLAPPED hid_overlap; // Overlap handle + OVERLAPPED hid_overlap_read, hid_overlap_write; // Overlap handle enum win_bt_stack_t stack; // Type of bluetooth stack to use #endif - unsigned char leds; // Currently lit leds protected: Report m_last_data_report; @@ -87,21 +104,58 @@ protected: private: void ClearReadQueue(); - bool SendRequest(unsigned char report_type, unsigned char* data, int length); - bool Handshake(); - void SetLEDs(int leds); - int IORead(unsigned char* buf); - int IOWrite(unsigned char* buf, int len); + + int IORead(u8* buf); + int IOWrite(u8 const* buf, int len); + void ThreadFunc(); - bool m_connected; + bool m_run_thread; std::thread m_wiimote_thread; + Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; - Common::FifoQueue m_audio_reports; + + Common::Timer m_last_audio_report; }; -extern std::mutex g_refresh_lock; +class WiimoteScanner +{ +public: + WiimoteScanner(); + ~WiimoteScanner(); + + bool IsReady() const; + + void WantWiimotes(bool do_want); + + void StartScanning(); + void StopScanning(); + + std::vector FindWiimotes(); + + // function called when not looking for more wiimotes + void Update(); + +private: + void ThreadFunc(); + + std::thread m_scan_thread; + + volatile bool m_run_thread; + volatile bool m_want_wiimotes; + +#if defined(_WIN32) + + +#elif defined(__linux__) && HAVE_BLUEZ + int device_id; + int device_sock; +#endif +}; + +extern std::recursive_mutex g_refresh_lock; +extern WiimoteScanner g_wiimote_scanner; extern Wiimote *g_wiimotes[4]; void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size); @@ -112,8 +166,9 @@ void DoState(PointerWrap &p); void StateChange(EMUSTATE_CHANGE newState); int FindWiimotes(Wiimote** wm, int max_wiimotes); +void ChangeWiimoteSource(unsigned int index, int source); -bool IsValidBluetoothName(const char* name); +bool IsValidBluetoothName(const std::string& name); }; // WiimoteReal diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h index 4b66eb4930..1a1f6676cf 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h @@ -34,13 +34,14 @@ // The 4 most significant bits of the first byte of an outgoing command must be // 0x50 if sending on the command channel and 0xA0 if sending on the interrupt -// channel. On Mac we use interrupt channel; on Windows/Linux, command. -#ifndef __APPLE__ +// channel. On Mac and Linux we use interrupt channel; on Windows, command. +#ifdef _WIN32 #define WM_SET_REPORT 0x50 #else #define WM_SET_REPORT 0xA0 #endif +// TODO: duplicated in WiimoteHid.h // Commands #define WM_CMD_RUMBLE 0x10 #define WM_CMD_LED 0x11 @@ -66,8 +67,9 @@ // End Wiimote internal codes -#define MAX_PAYLOAD 32 -#define WIIMOTE_DEFAULT_TIMEOUT 30 +// It's 23. NOT 32! +#define MAX_PAYLOAD 23 +#define WIIMOTE_DEFAULT_TIMEOUT 1000 #ifdef _WIN32 // Available bluetooth stacks for Windows. diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index afa2b2ceb0..2d5c86f800 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -58,6 +58,8 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC #include "../HW/WII_IPC.h" #include "../Debugger/Debugger_SymbolMap.h" #include "../PowerPC/PowerPC.h" +#include "../HW/SystemTimers.h" +#include "CoreTiming.h" namespace WII_IPC_HLE_Interface @@ -80,8 +82,19 @@ typedef std::deque ipc_msg_queue; static ipc_msg_queue request_queue; // ppc -> arm static ipc_msg_queue reply_queue; // arm -> ppc +static int enque_reply; + +static u64 last_reply_time; + +void EnqueReplyCallback(u64 userdata, int) +{ + reply_queue.push_back(userdata); +} + void Init() { + enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback); + _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); CWII_IPC_HLE_Device_es::m_ContentFile = ""; u32 i; @@ -152,6 +165,7 @@ void Reset(bool _bHard) } request_queue.clear(); reply_queue.clear(); + last_reply_time = 0; } void Shutdown() @@ -235,6 +249,7 @@ void DoState(PointerWrap &p) { p.Do(request_queue); p.Do(reply_queue); + p.Do(last_reply_time); TDeviceMap::const_iterator itr; @@ -253,15 +268,15 @@ void DoState(PointerWrap &p) u32 i; for (i=0; i(Memory::Read_U32(_Address)); - volatile int DeviceID = Memory::Read_U32(_Address + 8); + volatile s32 DeviceID = Memory::Read_U32(_Address + 8); IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL; @@ -338,7 +353,7 @@ void ExecuteCommand(u32 _Address) Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); - WARN_LOG(WII_IPC_HLE, "Tried to open %s as %d", DeviceName.c_str(), DeviceID); + WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID); if (DeviceID >= 0) { if (DeviceName.find("/dev/es") == 0) @@ -382,18 +397,19 @@ void ExecuteCommand(u32 _Address) } else { - IWII_IPC_HLE_Device* pDevice = CreateFileIO(DeviceID, DeviceName); + pDevice = CreateFileIO(DeviceID, DeviceName); CmdSuccess = pDevice->Open(_Address, Mode); INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", pDevice->GetDeviceName().c_str(), DeviceID, Mode); - if (Memory::Read_U32(_Address + 4) == DeviceID) + if (Memory::Read_U32(_Address + 4) == (u32)DeviceID) { g_FdMap[DeviceID] = pDevice; } else { delete pDevice; + pDevice = NULL; } } @@ -424,7 +440,10 @@ void ExecuteCommand(u32 _Address) // Don't delete hardware if (!pDevice->IsHardware()) + { delete pDevice; + pDevice = NULL; + } } else { @@ -503,8 +522,19 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { + // Ensure replies happen in order, fairly ugly + // Without this, tons of games fail now that DI commads have different reply delays + int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; + + const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks(); + + if (ticks_til_last_reply > 0) + reply_delay = ticks_til_last_reply; + + last_reply_time = CoreTiming::GetTicks() + reply_delay; + // Generate a reply to the IPC command - EnqReply(_Address); + EnqReply(_Address, reply_delay); } else { @@ -526,9 +556,9 @@ void EnqRequest(u32 _Address) } // Called when IOS module has some reply -void EnqReply(u32 _Address) +void EnqReply(u32 _Address, int cycles_in_future) { - reply_queue.push_back(_Address); + CoreTiming::ScheduleEvent(cycles_in_future, enque_reply, _Address); } // This is called every IPC_HLE_PERIOD from SystemTimers.cpp diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h index 2e056b5bec..65244836cc 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h @@ -62,7 +62,7 @@ void UpdateDevices(); void ExecuteCommand(u32 _Address); void EnqRequest(u32 _Address); -void EnqReply(u32 _Address); +void EnqReply(u32 _Address, int cycles_in_future = 0); enum ECommandType { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index c124bb4448..d52bd4f1e3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -21,8 +21,7 @@ #include #include "../HW/Memmap.h" -class PointerWrap; - +#include "ChunkFile.h" #define FS_SUCCESS (u32)0 // Success #define FS_EACCES (u32)-1 // Permission denied @@ -62,7 +61,11 @@ public: virtual ~IWII_IPC_HLE_Device() { } - virtual void DoState(PointerWrap& p) { DoStateShared(p); } + virtual void DoState(PointerWrap& p) + { + DoStateShared(p); + p.Do(m_Active); + } void DoStateShared(PointerWrap& p); @@ -92,6 +95,8 @@ public: virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) } #undef UNIMPLEMENTED_CMD + virtual int GetCmdDelay(u32) { return 0; } + virtual u32 Update() { return 0; } virtual bool IsHardware() { return m_Hardware; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 05b365ef01..5d49f34488 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -28,6 +28,7 @@ #include "VolumeCreator.h" #include "Filesystem.h" #include "LogManager.h" +#include "../HW/SystemTimers.h" #include "../../DiscIO/Src/FileMonitor.h" @@ -460,3 +461,45 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // i dunno but prolly 1 is okay all the time :) return 1; } + +int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) +{ + u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); + u32 Command = Memory::Read_U32(BufferIn) >> 24; + + // Hacks below + + switch (Command) + { + case DVDLowRead: + case DVDLowUnencryptedRead: + { + u32 const Size = Memory::Read_U32(BufferIn + 0x04); + // Delay depends on size of read, that makes sense, right? + // More than ~1150K "bytes / sec" hangs NSMBWii on boot. + // Less than ~800K "bytes / sec" hangs DKCR randomly (ok, probably not true) + return SystemTimers::GetTicksPerSecond() / 975000 * Size; + break; + } + + case DVDLowClearCoverInterrupt: + // Less than ~1/155th of a second hangs Oregon Trail at "loading wheel". + // More than ~1/140th of a second hangs Resident Evil Archives: Resident Evil Zero. + return SystemTimers::GetTicksPerSecond() / 146; + break; + +// case DVDLowAudioBufferConfig: +// case DVDLowInquiry: +// case DVDLowReadDiskID: +// case DVDLowWaitForCoverClose: +// case DVDLowGetCoverReg: +// case DVDLowGetCoverStatus: +// case DVDLowReset: +// case DVDLowClosePartition: + default: + // ranom numbers here! + // More than ~1/2000th of a second hangs DKCR with DSP HLE, maybe. + return SystemTimers::GetTicksPerSecond() / 15000; + break; + } +} diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h index 36e9f89067..0b62daefa3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -38,6 +38,8 @@ public: bool IOCtl(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress); + + int GetCmdDelay(u32); private: diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index dfe63ee1ef..711d360874 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -28,17 +28,16 @@ static Common::replace_v replacements; -// This is used by several of the FileIO and /dev/fs functions -std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size) +// This is used by several of the FileIO and /dev/fs functions +std::string HLE_IPC_BuildFilename(std::string path_wii, int _size) { std::string path_full = File::GetUserPath(D_WIIROOT_IDX); - std::string path_wii(_pFilename); if ((path_wii.length() > 0) && (path_wii[1] == '0')) path_full += std::string("/title"); // this looks and feel like a hack... // Replaces chars that FAT32 can't support with strings defined in /sys/replace - for (Common::replace_v::const_iterator i = replacements.begin(); i != replacements.end(); ++i) + for (auto i = replacements.begin(); i != replacements.end(); ++i) { for (size_t j = 0; (j = path_wii.find(i->first, j)) != path_wii.npos; ++j) path_wii.replace(j, 1, i->second); @@ -82,9 +81,8 @@ void HLE_IPC_CreateVirtualFATFilesystem() } } -CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) +CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware - , m_pFileHandle(NULL) , m_Mode(0) , m_SeekPos(0) { @@ -108,12 +106,9 @@ bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) } bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) -{ +{ m_Mode = _Mode; u32 ReturnValue = 0; - - // close the file handle if we get a reopen - //m_pFileHandle.Close(); static const char* const Modes[] = { @@ -122,20 +117,19 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) "Write only", "Read and Write" }; - - m_Filename = std::string(HLE_IPC_BuildFilename(m_Name.c_str(), 64)); + m_filepath = HLE_IPC_BuildFilename(m_Name, 64); // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here - if (File::Exists(m_Filename)) + if (File::Exists(m_filepath)) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); ReturnValue = m_DeviceID; } else { - WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], m_Filename.c_str()); + WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], m_filepath.c_str()); ReturnValue = FS_FILE_NOT_EXIST; } @@ -145,58 +139,46 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) return true; } - - -bool CWII_IPC_HLE_Device_FileIO::OpenFile() +File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() { + const char* open_mode = ""; + switch (m_Mode) { case ISFS_OPEN_READ: - { - m_pFileHandle.Open(m_Filename, "rb"); + open_mode = "rb"; break; - } + case ISFS_OPEN_WRITE: - { - m_pFileHandle.Open(m_Filename, "r+b"); - break; - } case ISFS_OPEN_RW: - { - m_pFileHandle.Open(m_Filename, "r+b"); + open_mode = "r+b"; break; - } + default: - { PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); break; } - } - return m_pFileHandle.IsOpen(); + + return File::IOFile(m_filepath, open_mode); } -void CWII_IPC_HLE_Device_FileIO::CloseFile() -{ - m_pFileHandle.Close(); -} - -bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) +bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { u32 ReturnValue = FS_RESULT_FATAL; - const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); - const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); + const u32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); + const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - - if (OpenFile()) + if (auto file = OpenFile()) { ReturnValue = FS_RESULT_FATAL; - const u64 fileSize = m_pFileHandle.GetSize(); + const u64 fileSize = file.GetSize(); INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - switch (Mode){ + switch (Mode) + { case 0: { - if (SeekPosition >=0 && SeekPosition <= fileSize) + if (SeekPosition <= fileSize) { m_SeekPos = SeekPosition; ReturnValue = m_SeekPos; @@ -205,8 +187,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) } case 1: { - s32 wantedPos = SeekPosition+m_SeekPos; - if (wantedPos >=0 && wantedPos <= fileSize) + u32 wantedPos = SeekPosition+m_SeekPos; + if (wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -215,8 +197,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) } case 2: { - s32 wantedPos = fileSize+m_SeekPos; - if (wantedPos >=0 && wantedPos <= fileSize) + u64 wantedPos = fileSize+m_SeekPos; + if (wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -230,7 +212,6 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) break; } } - CloseFile(); } else { @@ -248,18 +229,18 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (OpenFile()) + if (auto file = OpenFile()) { - if (m_Mode == ISFS_OPEN_WRITE) + if (m_Mode == ISFS_OPEN_WRITE) { WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to read 0x%x bytes to 0x%08x on write-only file %s", Size, Address, m_Name.c_str()); } - else + else { INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str()); - m_pFileHandle.Seek(m_SeekPos, SEEK_SET); - ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, m_pFileHandle.GetHandle()); - if (ReturnValue != Size && ferror(m_pFileHandle.GetHandle())) + file.Seek(m_SeekPos, SEEK_SET); + ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, file.GetHandle()); + if (ReturnValue != Size && ferror(file.GetHandle())) { ReturnValue = FS_EACCESS; } @@ -269,7 +250,6 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) } } - CloseFile(); } else { @@ -288,23 +268,22 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (OpenFile()) + if (auto file = OpenFile()) { - if (m_Mode == ISFS_OPEN_READ) + if (m_Mode == ISFS_OPEN_READ) { WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to write 0x%x bytes from 0x%08x to read-only file %s", Size, Address, m_Name.c_str()); } else { INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); - m_pFileHandle.Seek(m_SeekPos, SEEK_SET); - if (m_pFileHandle.WriteBytes(Memory::GetPointer(Address), Size)) + file.Seek(m_SeekPos, SEEK_SET); + if (file.WriteBytes(Memory::GetPointer(Address), Size)) { ReturnValue = Size; m_SeekPos += Size; } } - CloseFile(); } else { @@ -329,9 +308,9 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) { case ISFS_IOCTL_GETFILESTATS: { - if (OpenFile()) + if (auto file = OpenFile()) { - u32 m_FileLength = (u32)m_pFileHandle.GetSize(); + u32 m_FileLength = (u32)file.GetSize(); const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); @@ -339,7 +318,6 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) Memory::Write_U32(m_FileLength, BufferOut); Memory::Write_U32(m_SeekPos, BufferOut+4); - CloseFile(); } else { @@ -365,28 +343,8 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) { DoStateShared(p); - bool have_file_handle = (m_pFileHandle != 0); - s32 seek = (have_file_handle) ? (s32)m_pFileHandle.Tell() : 0; - - p.Do(have_file_handle); p.Do(m_Mode); - p.Do(seek); - - if (p.GetMode() == PointerWrap::MODE_READ) - { - int mode = m_Mode; - bool active = m_Active; - if (have_file_handle) - { - Open(0, m_Mode); - _dbg_assert_msg_(WII_IPC_HLE, m_pFileHandle, "bad filehandle"); - } - else - Close(0, true); - m_Mode = mode; - m_Active = active; - } - - if (have_file_handle) - m_pFileHandle.Seek(seek, SEEK_SET); + p.Do(m_SeekPos); + + m_filepath = HLE_IPC_BuildFilename(m_Name, 64); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index ff34a43a20..3698d05c9f 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -21,7 +21,7 @@ #include "WII_IPC_HLE_Device.h" #include "FileUtil.h" -std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size); +std::string HLE_IPC_BuildFilename(std::string _pFilename, int _size); void HLE_IPC_CreateVirtualFATFilesystem(); class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device @@ -39,8 +39,7 @@ public: bool IOCtl(u32 _CommandAddress); void DoState(PointerWrap &p); - bool OpenFile(); - void CloseFile(); + File::IOFile OpenFile(); private: enum @@ -76,12 +75,10 @@ private: ISFS_IOCTL_SHUTDOWN }; - File::IOFile m_pFileHandle; u32 m_Mode; - u32 m_SeekPos; - - std::string m_Filename; + + std::string m_filepath; }; #endif diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ae389d7b69..3eb0096929 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -57,7 +57,11 @@ #include "NandPaths.h" #include "CommonPaths.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "../Movie.h" +#ifdef _WIN32 +#include +#endif std::string CWII_IPC_HLE_Device_es::m_ContentFile; @@ -776,21 +780,26 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // someone with an affected game should test IOSv = TitleID & 0xffff; } - if (!bSuccess) + if (!bSuccess && IOSv >= 30 && IOSv != 0xffff) { PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n Dolphin will likely hang now", TitleID); } else { + CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + size_t size = s_Usb->m_WiiMotes.size(); + bool* wiiMoteConnected = new bool[size]; + for (unsigned int i = 0; i < size; i++) + wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true); WII_IPC_HLE_Interface::Init(); - - static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + s_Usb = GetUsbPointer(); for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) { - if (s_Usb->m_WiiMotes[i].IsConnected()) + if (wiiMoteConnected[i]) { s_Usb->m_WiiMotes[i].Activate(false); s_Usb->m_WiiMotes[i].Activate(true); @@ -801,6 +810,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } } + delete[] wiiMoteConnected; WII_IPC_HLE_Interface::SetDefaultContentFile(tContentFile); } // Pass the "#002 check" @@ -891,6 +901,52 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) File::CreateFullPath(tmdPath); File::CreateFullPath(Common::GetTitleDataPath(tmdTitleID)); + + Movie::g_titleID = tmdTitleID; + std::string savePath = Common::GetTitleDataPath(tmdTitleID); + if (Movie::IsRecordingInput()) + { + // TODO: Check for the actual save data + if (File::Exists((savePath + "banner.bin").c_str())) + Movie::g_bClearSave = false; + else + Movie::g_bClearSave = true; + } + + // TODO: Force the game to save to another location, instead of moving the user's save. + if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) + { + if (File::Exists((savePath + "banner.bin").c_str())) + { + if (File::Exists((savePath + "../backup/").c_str())) + { + // The last run of this game must have been to play back a movie, so their save is already backed up. + File::DeleteDirRecursively(savePath.c_str()); + } + else + { + #ifdef _WIN32 + MoveFile(savePath.c_str(), (savePath + "../backup/").c_str()); + #else + File::CopyDir(savePath.c_str(),(savePath + "../backup/").c_str()); + File::DeleteDirRecursively(savePath.c_str()); + #endif + } + } + } + else if (File::Exists((savePath + "../backup/").c_str())) + { + // Delete the save made by a previous movie, and copy back the user's save. + if (File::Exists((savePath + "banner.bin").c_str())) + File::DeleteDirRecursively(savePath); + #ifdef _WIN32 + MoveFile((savePath + "../backup/").c_str(), savePath.c_str()); + #else + File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str()); + File::DeleteDirRecursively((savePath + "../backup/").c_str()); + #endif + } + if(!File::Exists(tmdPath)) { File::IOFile _pTMDFile(tmdPath, "wb"); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index cc123ddf52..38100e5d7a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -26,6 +26,7 @@ #include "FileUtil.h" #include "NandPaths.h" #include "ChunkFile.h" +#include "../HW/SystemTimers.h" #include "../VolumeHandler.h" @@ -427,7 +428,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B File::CreateFullPath(FilenameRename); // if there is already a file, delete it - if (File::Exists(FilenameRename)) + if (File::Exists(Filename) && File::Exists(FilenameRename)) { File::Delete(FilenameRename); } @@ -499,6 +500,13 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B return FS_RESULT_FATAL; } +int CWII_IPC_HLE_Device_fs::GetCmdDelay(u32) +{ + // ~1/1000th of a second is too short and causes hangs in Wii Party + // Play it safe at 1/500th + return SystemTimers::GetTicksPerSecond() / 500; +} + void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p) { DoStateShared(p); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h index 1afb01cf8d..17a574da64 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -31,7 +31,7 @@ struct NANDStat }; enum { - FS_RESULT_OK = 0, + FS_RESULT_OK = 0, FS_INVALID = -4, FS_DIRFILE_NOT_FOUND = -6, FS_RESULT_FATAL = -101, @@ -55,6 +55,8 @@ public: virtual bool IOCtl(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress); + + virtual int GetCmdDelay(u32); private: diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 75db39b994..0ac752e867 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -46,6 +46,7 @@ it failed) #endif #include "WII_IPC_HLE_Device_net.h" +#include "../ConfigManager.h" #include "FileUtil.h" #include #include @@ -276,11 +277,36 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress) // No idea why the fifth and sixth bytes are left untouched. { // hardcoded address as a fallback - // TODO: Make this configurable? Different MAC addresses MIGHT be needed for requesting a user id or encrypting content with NWC24 const u8 default_address[] = { 0x00, 0x19, 0x1e, 0xfd, 0x71, 0x84 }; INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS"); + if (!SConfig::GetInstance().m_WirelessMac.empty()) + { + int x = 0; + int tmpaddress[6]; + for (unsigned int i = 0; i < SConfig::GetInstance().m_WirelessMac.length() && x < 6; i++) + { + if (SConfig::GetInstance().m_WirelessMac[i] == ':' || SConfig::GetInstance().m_WirelessMac[i] == '-') + continue; + + std::stringstream ss; + ss << std::hex << SConfig::GetInstance().m_WirelessMac[i]; + if (SConfig::GetInstance().m_WirelessMac[i+1] != ':' && SConfig::GetInstance().m_WirelessMac[i+1] != '-') + { + ss << std::hex << SConfig::GetInstance().m_WirelessMac[i+1]; + i++; + } + ss >> tmpaddress[x]; + x++; + } + u8 address[6]; + for (int i = 0; i < 6;i++) + address[i] = tmpaddress[i]; + Memory::WriteBigEData(address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); + break; + } + #if defined(__linux__) const char *check_devices[3] = { "wlan0", "ath0", "eth0" }; int fd, ret; @@ -324,7 +350,6 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress) if (SUCCEEDED(ret)) Memory::WriteBigEData(adapter_info->Address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); else Memory::WriteBigEData(default_address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); - delete[] adapter_info; #else Memory::WriteBigEData(default_address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index d53d1ebd2a..e3c0247b46 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -38,7 +38,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De // Activate only first Wiimote by default _conf_pads BT_DINF; - + SetUsbPointer(this); if (!SConfig::GetInstance().m_SYSCONF->GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads))) { PanicAlertT("Trying to read from invalid SYSCONF\nWiimote bt ids are not available"); @@ -100,18 +100,13 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De CWII_IPC_HLE_Device_usb_oh1_57e_305::~CWII_IPC_HLE_Device_usb_oh1_57e_305() { m_WiiMotes.clear(); + SetUsbPointer(NULL); } void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) { -/* - //things that do not get saved: (why not?) - - std::vector m_WiiMotes; - - std::deque m_EventQueue; - */ - + p.Do(m_Active); + p.Do(m_ControllerBD); p.Do(m_CtrlSetup); p.Do(m_ACLSetup); p.Do(m_HCIEndpoint); @@ -119,75 +114,30 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) p.Do(m_last_ticks); p.DoArray(m_PacketCount,4); p.Do(m_ScanEnable); + p.Do(m_EventQueue); m_acl_pool.DoState(p); - bool storeFullData = (Movie::IsRecordingInput() || Movie::IsPlayingInput()); - p.Do(storeFullData); - p.DoMarker("storeFullData in CWII_IPC_HLE_Device_usb_oh1_57e_305"); + for (unsigned int i = 0; i < 4; i++) + m_WiiMotes[i].DoState(p); - if (!storeFullData) + // Reset the connection of real and hybrid wiimotes + if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) { - if (p.GetMode() == PointerWrap::MODE_READ) - { + for (unsigned int i = 0; i < 4; i++) + { + if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i]) + continue; + // TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad. m_EventQueue.clear(); - - if (SConfig::GetInstance().m_WiimoteReconnectOnLoad) - { - // Reset the connection of all connected wiimotes - for (unsigned int i = 0; i < 4; i++) - { - if (!m_WiiMotes[i].IsInactive()) - { - m_WiiMotes[i].Activate(false); - m_WiiMotes[i].Activate(true); - } - else - { - m_WiiMotes[i].Activate(false); - } - } - } - } - } - else - { - // I'm not sure why these things aren't normally saved, but I think they can affect the emulation state, - // so if sync matters (e.g. if a movie is active), we really should save them. - // also, it's definitely not safe to do the above auto-reconnect hack either. - // (unless we can do it without changing anything that affects emulation state, which is not currently the case) - - p.Do(m_EventQueue); - p.DoMarker("m_EventQueue"); - - // m_WiiMotes is kind of annoying to save. maybe this could be done in a more general way. - u32 vec_size = (u32)m_WiiMotes.size(); - p.Do(vec_size); - for (u32 i = 0; i < vec_size; ++i) - { - if (i < m_WiiMotes.size()) - { - CWII_IPC_HLE_WiiMote& wiimote = m_WiiMotes[i]; - wiimote.DoState(p); - } + if (!m_WiiMotes[i].IsInactive()) + { + m_WiiMotes[i].Activate(false); + m_WiiMotes[i].Activate(true); + } else - { - bdaddr_t tmpBD = BDADDR_ANY; - CWII_IPC_HLE_WiiMote wiimote = CWII_IPC_HLE_WiiMote(this, i, tmpBD, false); - wiimote.DoState(p); - if (p.GetMode() == PointerWrap::MODE_READ) - { - m_WiiMotes.push_back(wiimote); - _dbg_assert_(WII_IPC_WIIMOTE, m_WiiMotes.size() == i); - } - } - } - if (p.GetMode() == PointerWrap::MODE_READ) - while ((u32)m_WiiMotes.size() > vec_size) - m_WiiMotes.pop_back(); - p.DoMarker("m_WiiMotes"); + m_WiiMotes[i].Activate(false); + } } - - DoStateShared(p); } bool CWII_IPC_HLE_Device_usb_oh1_57e_305::RemoteDisconnect(u16 _connectionHandle) @@ -386,23 +336,23 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendToDevice(u16 _ConnectionHandle, u8 pWiiMote->ExecuteL2capCmd(_pData, _Size); } -// Here we send ACL packets to CPU. They will consist of header + data. -// The header is for example 07 00 41 00 which means size 0x0007 and channel 0x0041. -// --------------------------------------------------- -// AyuanX: Basically, our WII_IPC_HLE is efficient enough to send the packet immediately -// rather than enqueue it to some other memory -// But...the only exception comes from the Wiimote_Plugin void CWII_IPC_HLE_Device_usb_oh1_57e_305::IncDataPacket(u16 _ConnectionHandle) { m_PacketCount[_ConnectionHandle & 0xff]++; + // I don't think this makes sense or should be necessary + // m_PacketCount refers to "completed" packets and is not related to some buffer size, yes? +#if 0 if (m_PacketCount[_ConnectionHandle & 0xff] > (unsigned int)m_acl_pkts_num) { DEBUG_LOG(WII_IPC_WIIMOTE, "ACL buffer overflow"); m_PacketCount[_ConnectionHandle & 0xff] = m_acl_pkts_num; } +#endif } +// Here we send ACL packets to CPU. They will consist of header + data. +// The header is for example 07 00 41 00 which means size 0x0007 and channel 0x0041. void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size) { DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet from %x ready to send to stack...", _ConnectionHandle); @@ -424,8 +374,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u } else { - DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, " - "queueing(%d)...", m_acl_pool.GetWritePos()); + DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, queueing..."); m_acl_pool.Store(_pData, _Size, _ConnectionHandle); } } @@ -536,18 +485,8 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() } } - // The Real Wiimote sends report every ~6.66ms (150 Hz). - // However, we don't actually reach here at dependable intervals, so we - // instead just timeslice in such a way that makes the stack think we have - // perfect "radio quality" (WPADGetRadioSensitivity) and yet still have some - // idle time. - // Somehow, Dolphin's Wiimote Speaker support requires using an update interval - // of 5ms (200 Hz) for its output to work. This increased frequency tends to - // fill the ACL queue (even) quicker than it can be processed by Dolphin, - // especially during simultaneous requests involving many (emulated) Wiimotes... - // Thus, we only use that interval when the option is enabled. See issue 4608. - const u64 interval = SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance(). - m_LocalCoreStartupParameter.bDisableWiimoteSpeaker ? 150 : 200); + // The Real Wiimote sends report every ~5ms (200 Hz). + const u64 interval = SystemTimers::GetTicksPerSecond() / 200; const u64 each_wiimote_interval = interval / m_WiiMotes.size(); const u64 now = CoreTiming::GetTicks(); @@ -568,25 +507,47 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() return packet_transferred; } +void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle) +{ + if (m_queue.size() >= 100) + { + // Many simultaneous exchanges of ACL packets tend to cause the queue to fill up. + ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be dropped!"); + return; + } + + _dbg_assert_msg_(WII_IPC_WIIMOTE, + size < m_acl_pkt_size, "acl packet too large for pool"); + + m_queue.push_back(Packet()); + auto& packet = m_queue.back(); + + std::copy(data, data + size, packet.data); + packet.size = size; + packet.conn_handle = conn_handle; +} + void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& endpoint) { - const u8 *data = m_pool + m_acl_pkt_size * m_read_ptr; - const u16 size = m_info[m_read_ptr].size; - const u16 conn_handle = m_info[m_read_ptr].conn_handle; + auto& packet = m_queue.front(); + + const u8* const data = packet.data; + const u16 size = packet.size; + const u16 conn_handle = packet.conn_handle; DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet being written from " - "queue(%d) to %08x", GetReadPos(), endpoint.m_address); + "queue to %08x", endpoint.m_address); hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.m_buffer); pHeader->con_handle = HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT); pHeader->length = size; // Write the packet to the buffer - memcpy((u8*)pHeader + sizeof(hci_acldata_hdr_t), data, pHeader->length); + std::copy(data, data + size, (u8*)pHeader + sizeof(hci_acldata_hdr_t)); endpoint.SetRetVal(sizeof(hci_acldata_hdr_t) + size); - m_read_ptr = (m_read_ptr + 1) % m_acl_pkts_num; + m_queue.pop_front(); WII_IPC_HLE_Interface::EnqReply(endpoint.m_address); endpoint.Invalidate(); @@ -1518,9 +1479,9 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandWriteLinkPolicy(u8* _Input) DEBUG_LOG(WII_IPC_WIIMOTE, " ConnectionHandle: 0x%04x", pLinkPolicy->con_handle); DEBUG_LOG(WII_IPC_WIIMOTE, " Policy: 0x%04x", pLinkPolicy->settings); - hci_write_link_policy_settings_rp Reply; - Reply.status = 0x00; - Reply.con_handle = pLinkPolicy->con_handle; + //hci_write_link_policy_settings_rp Reply; + //Reply.status = 0x00; + //Reply.con_handle = pLinkPolicy->con_handle; SendEventCommandStatus(HCI_CMD_WRITE_LINK_POLICY_SETTINGS); @@ -1929,4 +1890,4 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::LOG_LinkKey(const u8* _pLinkKey) , _pLinkKey[0], _pLinkKey[1], _pLinkKey[2], _pLinkKey[3], _pLinkKey[4], _pLinkKey[5], _pLinkKey[6], _pLinkKey[7] , _pLinkKey[8], _pLinkKey[9], _pLinkKey[10], _pLinkKey[11], _pLinkKey[12], _pLinkKey[13], _pLinkKey[14], _pLinkKey[15]); -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h index 61c439a7ec..eb091b1ff9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -17,9 +17,11 @@ #pragma once -#include "hci.h" +#include #include #include + +#include "hci.h" #include "WII_IPC_HLE.h" #include "WII_IPC_HLE_Device.h" #include "WII_IPC_HLE_WiiMote.h" @@ -168,70 +170,33 @@ private: class ACLPool { - u8 m_pool[m_acl_pkt_size * m_acl_pkts_num]; - int m_read_ptr; - int m_write_ptr; - - struct + struct Packet { + u8 data[m_acl_pkt_size]; u16 size; u16 conn_handle; - } m_info[m_acl_pkts_num]; + }; + + std::deque m_queue; public: ACLPool() - : m_read_ptr(0) - , m_write_ptr(0) + : m_queue() {} - void Store(const u8* data, const u16 size, const u16 conn_handle) - { - _dbg_assert_msg_(WII_IPC_WIIMOTE, - size < m_acl_pkt_size, "acl packet too large for pool"); - - const int next_write_ptr = (m_write_ptr + 1) % m_acl_pkts_num; - if (next_write_ptr == m_read_ptr) - { - // Many simultaneous exchanges of ACL packets tend to cause the - // 10-packet limit to be exceeded. Typically, this occurs when - // many emulated Wiimotes are requesting connections at once. - // See issue 4608 for more info. - ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue is full - current packet will be " - "dropped! (m_write_ptr(%d) was about to overlap m_read_ptr(%d))", - m_write_ptr, m_read_ptr); - return; - } - - memcpy(m_pool + m_acl_pkt_size * m_write_ptr, data, size); - m_info[m_write_ptr].size = size; - m_info[m_write_ptr].conn_handle = conn_handle; - m_write_ptr = next_write_ptr; - } + void Store(const u8* data, const u16 size, const u16 conn_handle); void WriteToEndpoint(CtrlBuffer& endpoint); bool IsEmpty() const { - return m_write_ptr == m_read_ptr; - } - - int GetWritePos() const - { - return m_write_ptr; - } - - int GetReadPos() const - { - return m_read_ptr; + return m_queue.empty(); } // For SaveStates void DoState(PointerWrap &p) { - p.Do(m_write_ptr); - p.Do(m_read_ptr); - p.DoArray((u8 *)m_pool, sizeof(m_pool)); - p.DoArray((u8 *)m_info, sizeof(m_info)); + p.Do(m_queue); } } m_acl_pool; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 8445eeffdc..b3449ec059 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -27,13 +27,19 @@ #include "l2cap.h" // Local #include "WiiMote_HID_Attr.h" -static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb; +static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer() { return s_Usb; } +void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr) +{ + s_Usb = ptr; +} + + CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number, bdaddr_t _BD, bool ready) : m_HIDControlChannel_Connected(false) , m_HIDControlChannel_ConnectedWait(false) @@ -49,8 +55,6 @@ CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* { DEBUG_LOG(WII_IPC_WIIMOTE, "Wiimote: #%i Constructed", _Number); - s_Usb = _pHost; - m_ConnectionState = (ready) ? CONN_READY : CONN_INACTIVE; m_ConnectionHandle = 0x100 + _Number; memset(m_LinkKey, 0xA0 + _Number, HCI_KEY_SIZE); @@ -102,6 +106,7 @@ void CWII_IPC_HLE_WiiMote::DoState(PointerWrap &p) p.Do(uclass); p.Do(features); p.Do(lmp_version); + p.Do(lmp_subversion); p.Do(m_LinkKey); p.Do(m_Name); @@ -206,8 +211,7 @@ void CWII_IPC_HLE_WiiMote::EventConnectionAccepted() void CWII_IPC_HLE_WiiMote::EventDisconnect() { // Send disconnect message to plugin - u8 Message = WIIMOTE_DISCONNECT; - Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, &Message, 0); + Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, NULL, 0); m_ConnectionState = CONN_INACTIVE; // Clear channel flags diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h index f3180c7dc9..5373f68c0a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -25,6 +25,7 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer(); +void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr); class CBigEndianBuffer { diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index ba489dfcf6..6c646f6870 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -27,12 +27,19 @@ #include "HW/WiimoteEmu/WiimoteEmu.h" #include "HW/WiimoteEmu/WiimoteHid.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "VideoBackendBase.h" #include "State.h" #include "Timer.h" +#include "VideoConfig.h" +#include "HW/EXI.h" +#include "HW/EXI_Device.h" +#include "HW/EXI_Channel.h" +#include "HW/DVDInterface.h" +#include "../../Common/Src/NandPaths.h" +#include "Crypto/md5.h" +#include "scmrev.h" -// large enough for just over 24 hours of single-player recording -#define MAX_DTM_LENGTH (40 * 1024 * 1024) +// The chunk to allocate movie data in multiples of. +#define DTM_BASE_LENGTH (1024) std::mutex cs_frameSkip; @@ -50,11 +57,23 @@ u8 g_numPads = 0; ControllerState g_padState; DTMHeader tmpHeader; u8* tmpInput = NULL; +size_t tmpInputAllocated = 0; u64 g_currentByte = 0, g_totalBytes = 0; u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started +bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false; +bool bMemcard, g_bClearSave = false; +std::string videoBackend = "unknown"; +int iCPUCore = 1; +bool g_bDiscChange = false; +std::string g_discChange = ""; +std::string author = ""; +u64 g_titleID = 0; +unsigned char MD5[16]; +u8 bongos; +u8 revision[20]; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -66,9 +85,39 @@ std::string g_InputDisplay[8]; ManipFunction mfunc = NULL; +void EnsureTmpInputSize(size_t bound) +{ + if (tmpInputAllocated >= bound) + return; + // The buffer expands in powers of two of DTM_BASE_LENGTH + // (standard exponential buffer growth). + size_t newAlloc = DTM_BASE_LENGTH; + while (newAlloc < bound) + newAlloc *= 2; + u8* newTmpInput = new u8[newAlloc]; + tmpInputAllocated = newAlloc; + if (tmpInput != NULL) + { + if (g_totalBytes > 0) + memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes); + delete[] tmpInput; + } + tmpInput = newTmpInput; +} std::string GetInputDisplay() { + if (!IsPlayingInput() && !IsRecordingInput()) + { + g_numPads = 0; + for (int i = 0; i < 4; i++) + { + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) + g_numPads |= (1 << i); + if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) + g_numPads |= (1 << (i + 4)); + } + } std::string inputDisplay = ""; for (int i = 0; i < 8; ++i) if ((g_numPads & (1 << i)) != 0) @@ -87,6 +136,10 @@ void FrameUpdate() g_totalFrames = g_currentFrame; g_totalLagCount = g_currentLagCount; } + if (IsPlayingInput() && IsConfigSaved()) + { + SetGraphicsConfig(); + } if (g_bFrameStep) { @@ -112,8 +165,29 @@ void Init() g_bPolled = false; g_bFrameStep = false; g_bFrameStop = false; + bSaveConfig = false; + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + if (IsPlayingInput()) + { + ReadHeader(); + std::thread md5thread(CheckMD5); + if ((strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6))) + { + PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); + EndPlayInput(false); + } + } + if (IsRecordingInput()) + { + GetSettings(); + std::thread md5thread(GetMD5); + } + g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); + if (!tmpHeader.bFromSaveState || !IsPlayingInput()) + Core::SetStateFileName(""); + for (int i = 0; i < 8; ++i) g_InputDisplay[i].clear(); @@ -121,15 +195,10 @@ void Init() { 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; } } @@ -138,6 +207,9 @@ void InputUpdate() g_currentInputCount++; if (IsRecordingInput()) g_totalInputCount = g_currentInputCount; + + if (IsPlayingInput() && g_currentInputCount == (g_totalInputCount -1) && SConfig::GetInstance().m_PauseMovie) + Core::SetState(Core::CORE_PAUSE); } void SetFrameSkipping(unsigned int framesToSkip) @@ -197,7 +269,7 @@ void FrameSkipping() g_frameSkipCounter++; if (g_frameSkipCounter > g_framesToSkip || Core::ShouldSkipFrame(g_frameSkipCounter) == false) g_frameSkipCounter = 0; - + g_video_backend->Video_SetRendering(!g_frameSkipCounter); } } @@ -217,6 +289,11 @@ bool IsJustStartingRecordingInputFromSaveState() return IsRecordingInputFromSaveState() && g_currentFrame == 0; } +bool IsJustStartingPlayingInputFromSaveState() +{ + return IsRecordingInputFromSaveState() && g_currentFrame == 1 && IsPlayingInput(); +} + bool IsPlayingInput() { return (g_playMode == MODE_PLAYING); @@ -237,11 +314,60 @@ bool IsUsingPad(int controller) return ((g_numPads & (1 << controller)) != 0); } +bool IsUsingBongo(int controller) +{ + return ((bongos & (1 << controller)) != 0); +} + bool IsUsingWiimote(int wiimote) { return ((g_numPads & (1 << (wiimote + 4))) != 0); } +bool IsConfigSaved() +{ + return bSaveConfig; +} +bool IsDualCore() +{ + return bDualCore; +} + +bool IsProgressive() +{ + return bProgressive; +} + +bool IsSkipIdle() +{ + return bSkipIdle; +} + +bool IsDSPHLE() +{ + return bDSPHLE; +} + +bool IsFastDiscSpeed() +{ + return bFastDiscSpeed; +} + +int GetCPUMode() +{ + return iCPUCore; +} + +bool IsStartingFromClearSave() +{ + return g_bClearSave; +} + +bool IsUsingMemcard() +{ + return bMemcard; +} + void ChangePads(bool instantly) { if (Core::GetState() == Core::CORE_UNINITIALIZED) @@ -250,7 +376,7 @@ void ChangePads(bool instantly) int controllers = 0; for (int i = 0; i < 4; i++) - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) controllers |= (1 << i); if (instantly && (g_numPads & 0x0F) == controllers) @@ -258,9 +384,9 @@ void ChangePads(bool instantly) for (int i = 0; i < 4; i++) if (instantly) // Changes from savestates need to be instantaneous - SerialInterface::AddDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + SerialInterface::AddDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); else - SerialInterface::ChangeDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + SerialInterface::ChangeDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); } void ChangeWiiPads(bool instantly) @@ -287,6 +413,17 @@ bool BeginRecordingInput(int controllers) if(g_playMode != MODE_NONE || controllers == 0) return false; + g_numPads = controllers; + g_currentFrame = g_totalFrames = 0; + g_currentLagCount = g_totalLagCount = 0; + g_currentInputCount = g_totalInputCount = 0; + g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); + g_rerecords = 0; + + for (int i = 0; i < 4; i++) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) + bongos |= (1 << i); + if (Core::IsRunning()) { if(File::Exists(tmpStateFilename)) @@ -294,20 +431,25 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; - } - - g_numPads = controllers; - g_currentFrame = g_totalFrames = 0; - g_currentLagCount = g_totalLagCount = 0; - g_currentInputCount = g_totalInputCount = 0; - g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); - g_rerecords = 0; - g_playMode = MODE_RECORDING; - delete [] tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; + // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. + // TODO: find a way to GetTitleDataPath() from Movie::Init() + if (Core::g_CoreStartupParameter.bWii) + { + if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str())) + Movie::g_bClearSave = false; + else + Movie::g_bClearSave = true; + } + std::thread md5thread(GetMD5); + } + g_playMode = MODE_RECORDING; + GetSettings(); + author = SConfig::GetInstance().m_strMovieAuthor; + EnsureTmpInputSize(1); + g_currentByte = g_totalBytes = 0; - + Core::DisplayMessage("Starting movie recording", 2000); return true; } @@ -390,15 +532,6 @@ void SetInputDisplayString(ControllerState padState, int controllerID) if(g_padState.DPadRight) g_InputDisplay[controllerID].append(" RIGHT"); - //if(g_padState.L) - //{ - // g_InputDisplay[controllerID].append(" L"); - //} - //if(g_padState.R) - //{ - // g_InputDisplay[controllerID].append(" R"); - //} - Analog1DToString(g_padState.TriggerL, " L", inp); g_InputDisplay[controllerID].append(inp); @@ -465,60 +598,122 @@ void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelD g_InputDisplay[controllerID].append("\n"); } - - -void RecordInput(SPADStatus *PadStatus, int controllerID) +void CheckPadStatus(SPADStatus *PadStatus, int controllerID) { - if(!IsRecordingInput() || !IsUsingPad(controllerID)) - return; - g_padState.A = ((PadStatus->button & PAD_BUTTON_A) != 0); g_padState.B = ((PadStatus->button & PAD_BUTTON_B) != 0); g_padState.X = ((PadStatus->button & PAD_BUTTON_X) != 0); g_padState.Y = ((PadStatus->button & PAD_BUTTON_Y) != 0); g_padState.Z = ((PadStatus->button & PAD_TRIGGER_Z) != 0); g_padState.Start = ((PadStatus->button & PAD_BUTTON_START) != 0); - + g_padState.DPadUp = ((PadStatus->button & PAD_BUTTON_UP) != 0); g_padState.DPadDown = ((PadStatus->button & PAD_BUTTON_DOWN) != 0); g_padState.DPadLeft = ((PadStatus->button & PAD_BUTTON_LEFT) != 0); g_padState.DPadRight = ((PadStatus->button & PAD_BUTTON_RIGHT) != 0); - + g_padState.L = ((PadStatus->button & PAD_TRIGGER_L) != 0); g_padState.R = ((PadStatus->button & PAD_TRIGGER_R) != 0); g_padState.TriggerL = PadStatus->triggerLeft; g_padState.TriggerR = PadStatus->triggerRight; - + g_padState.AnalogStickX = PadStatus->stickX; g_padState.AnalogStickY = PadStatus->stickY; - + g_padState.CStickX = PadStatus->substickX; g_padState.CStickY = PadStatus->substickY; - - memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); - g_currentByte += 8; - g_totalBytes = g_currentByte; - SetInputDisplayString(g_padState, controllerID); } -void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) +void RecordInput(SPADStatus *PadStatus, int controllerID) { - if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) + if (!IsRecordingInput() || !IsUsingPad(controllerID)) return; + CheckPadStatus(PadStatus, controllerID); + + if (g_bDiscChange) + { + g_padState.disc = g_bDiscChange; + g_bDiscChange = false; + } + + EnsureTmpInputSize((size_t)(g_currentByte + 8)); + memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); + g_currentByte += 8; + g_totalBytes = g_currentByte; +} + +void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) +{ u8* const coreData = rptf.core?(data+rptf.core):NULL; u8* const accelData = rptf.accel?(data+rptf.accel):NULL; u8* const irData = rptf.ir?(data+rptf.ir):NULL; u8 size = rptf.size; + SetWiiInputDisplayString(wiimote, coreData, accelData, irData); + + if (IsRecordingInput()) + RecordWiimote(wiimote, data, size); +} + +void RecordWiimote(int wiimote, u8 *data, u8 size) +{ + if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) + return; InputUpdate(); + EnsureTmpInputSize((size_t)(g_currentByte + size + 1)); tmpInput[g_currentByte++] = size; memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size; g_totalBytes = g_currentByte; - SetWiiInputDisplayString(wiimote, coreData, accelData, irData); +} + +void ReadHeader() +{ + g_numPads = tmpHeader.numControllers; + g_recordingStartTime = tmpHeader.recordingStartTime; + if (g_rerecords < tmpHeader.numRerecords) + g_rerecords = tmpHeader.numRerecords; + + if (tmpHeader.bSaveConfig) + { + bSaveConfig = true; + bSkipIdle = tmpHeader.bSkipIdle; + bDualCore = tmpHeader.bDualCore; + bProgressive = tmpHeader.bProgressive; + bDSPHLE = tmpHeader.bDSPHLE; + bFastDiscSpeed = tmpHeader.bFastDiscSpeed; + iCPUCore = tmpHeader.CPUCore; + g_bClearSave = tmpHeader.bClearSave; + bMemcard = tmpHeader.bMemcard; + bongos = tmpHeader.bongos; + memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision)); + } + else + { + GetSettings(); + } + + videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) + { + videoBackend[i] = tmpHeader.videoBackend[i]; + } + + g_discChange.resize(ARRAYSIZE(tmpHeader.discChange)); + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++) + { + g_discChange[i] = tmpHeader.discChange[i]; + } + + author.resize(ARRAYSIZE(tmpHeader.author)); + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.author);i++) + { + author[i] = tmpHeader.author[i]; + } + memcpy(MD5, tmpHeader.md5, 16); } bool PlayInput(const char *filename) @@ -528,49 +723,23 @@ bool PlayInput(const char *filename) if(!File::Exists(filename)) return false; - + File::IOFile g_recordfd; - + if (!g_recordfd.Open(filename, "rb")) return false; - + g_recordfd.ReadArray(&tmpHeader, 1); if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) { PanicAlertT("Invalid recording file"); goto cleanup; } - - // Load savestate (and skip to frame data) - if(tmpHeader.bFromSaveState) - { - const std::string stateFilename = std::string(filename) + ".sav"; - if(File::Exists(stateFilename)) - Core::SetStateFileName(stateFilename); - g_bRecordingFromSaveState = true; - } - - /* TODO: Put this verification somewhere we have the gameID of the played game - // TODO: Replace with Unique ID - if(tmpHeader.uniqueID != 0) { - PanicAlert("Recording Unique ID Verification Failed"); - goto cleanup; - } - - if(strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)) { - PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", header.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); - goto cleanup; - } - */ - - g_numPads = tmpHeader.numControllers; - g_rerecords = tmpHeader.numRerecords; + ReadHeader(); g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; - g_recordingStartTime = tmpHeader.recordingStartTime; - g_currentFrame = 0; g_currentLagCount = 0; g_currentInputCount = 0; @@ -578,14 +747,23 @@ bool PlayInput(const char *filename) g_playMode = MODE_PLAYING; g_totalBytes = g_recordfd.GetSize() - 256; - delete tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; + EnsureTmpInputSize((size_t)g_totalBytes); g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes); g_currentByte = 0; g_recordfd.Close(); - + + // Load savestate (and skip to frame data) + if(tmpHeader.bFromSaveState) + { + const std::string stateFilename = std::string(filename) + ".sav"; + if(File::Exists(stateFilename)) + Core::SetStateFileName(stateFilename); + g_bRecordingFromSaveState = true; + Movie::LoadInput(filename); + } + return true; - + cleanup: g_recordfd.Close(); return false; @@ -608,29 +786,31 @@ void DoState(PointerWrap &p) void LoadInput(const char *filename) { - File::IOFile t_record(filename, "r+b"); - + File::IOFile t_record; + if (!t_record.Open(filename, "r+b")) + { + PanicAlertT("Failed to read %s", filename); + EndPlayInput(false); + return; + } + t_record.ReadArray(&tmpHeader, 1); - + if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) { PanicAlertT("Savestate movie %s is corrupted, movie recording stopping...", filename); EndPlayInput(false); return; } - + ReadHeader(); if (!g_bReadOnly) { - if (g_rerecords > tmpHeader.numRerecords) - { - tmpHeader.numRerecords = g_rerecords; - } - tmpHeader.numRerecords++; + g_rerecords++; + tmpHeader.numRerecords = g_rerecords; t_record.Seek(0, SEEK_SET); t_record.WriteArray(&tmpHeader, 1); } - - g_numPads = tmpHeader.numControllers; + ChangePads(true); if (Core::g_CoreStartupParameter.bWii) ChangeWiiPads(true); @@ -650,9 +830,8 @@ void LoadInput(const char *filename) g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; + EnsureTmpInputSize((size_t)totalSavedBytes); g_totalBytes = totalSavedBytes; - delete [] tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; t_record.ReadArray(tmpInput, (size_t)g_totalBytes); } else if (g_currentByte > 0) @@ -676,7 +855,7 @@ void LoadInput(const char *filename) { // this is a "you did something wrong" alert for the user's benefit. // we'll try to say what's going on in excruciating detail, otherwise the user might not believe us. - if(Core::g_CoreStartupParameter.bWii) + if(IsUsingWiimote(0)) { // TODO: more detail PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256); @@ -710,7 +889,7 @@ void LoadInput(const char *filename) } t_record.Close(); - g_rerecords = tmpHeader.numRerecords; + bSaveConfig = tmpHeader.bSaveConfig; if (!afterEnd) { @@ -759,8 +938,7 @@ void PlayController(SPADStatus *PadStatus, int controllerID) return; } - // dtm files don't save the mic button or error bit. not sure if they're actually - // used, but better safe than sorry + // dtm files don't save the mic button or error bit. not sure if they're actually used, but better safe than sorry signed char e = PadStatus->err; memset(PadStatus, 0, sizeof(SPADStatus)); PadStatus->err = e; @@ -812,9 +990,35 @@ void PlayController(SPADStatus *PadStatus, int controllerID) PadStatus->button |= PAD_TRIGGER_L; if(g_padState.R) PadStatus->button |= PAD_TRIGGER_R; + if (g_padState.disc) + { + // This implementation assumes the disc change will only happen once. Trying to change more than that will cause + // it to load the last disc every time. As far as i know though, there are no 3+ disc games, so this should be fine. + Core::SetState(Core::CORE_PAUSE); + int numPaths = (int)SConfig::GetInstance().m_ISOFolder.size(); + bool found = false; + std::string path; + for (int i = 0; i < numPaths; i++) + { + path = SConfig::GetInstance().m_ISOFolder[i]; + if (File::Exists((path + '/' + g_discChange.c_str()).c_str())) + { + found = true; + break; + } + } + if (found) + { + DVDInterface::ChangeDisc((path + '/' + g_discChange.c_str()).c_str()); + Core::SetState(Core::CORE_RUN); + } + else + { + PanicAlert("Change the disc to %s", g_discChange.c_str()); + } + } SetInputDisplayString(g_padState, controllerID); - CheckInputEnd(); } @@ -873,10 +1077,11 @@ void EndPlayInput(bool cont) } else if(g_playMode != MODE_NONE) { - g_numPads = g_rerecords = 0; + g_rerecords = 0; g_currentByte = 0; g_playMode = MODE_NONE; Core::DisplayMessage("Movie End.", 2000); + g_bRecordingFromSaveState = 0; // we don't clear these things because otherwise we can't resume playback if we load a movie state later //g_totalFrames = g_totalBytes = 0; //delete tmpInput; @@ -887,7 +1092,6 @@ void EndPlayInput(bool cont) void SaveRecording(const char *filename) { File::IOFile save_record(filename, "wb"); - // Create the real header now and write it DTMHeader header; memset(&header, 0, sizeof(DTMHeader)); @@ -903,13 +1107,34 @@ void SaveRecording(const char *filename) header.inputCount = g_totalInputCount; header.numRerecords = g_rerecords; header.recordingStartTime = g_recordingStartTime; - + + header.bSaveConfig = true; + header.bSkipIdle = bSkipIdle; + header.bDualCore = bDualCore; + header.bProgressive = bProgressive; + header.bDSPHLE = bDSPHLE; + header.bFastDiscSpeed = bFastDiscSpeed; + strncpy((char *)header.videoBackend, videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); + header.CPUCore = iCPUCore; + header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; + header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; + header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture; + header.bEFBCopyCacheEnable = g_ActiveConfig.bEFBCopyCacheEnable; + header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges; + header.bUseXFB = g_ActiveConfig.bUseXFB; + header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; + header.bMemcard = bMemcard; + header.bClearSave = g_bClearSave; + strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); + strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); + memcpy(header.md5,MD5,16); + header.bongos = bongos; + memcpy(header.revision, revision, ARRAYSIZE(header.revision)); + // TODO header.uniqueID = 0; - // header.author; - // header.videoBackend; // header.audioEmulator; - + save_record.WriteArray(&header, 1); bool success = save_record.WriteArray(tmpInput, (size_t)g_totalBytes); @@ -937,4 +1162,80 @@ void CallInputManip(SPADStatus *PadStatus, int controllerID) if (mfunc) (*mfunc)(PadStatus, controllerID); } + +void SetGraphicsConfig() +{ + g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable; + g_Config.bEFBCopyEnable = tmpHeader.bEFBCopyEnable; + g_Config.bCopyEFBToTexture = tmpHeader.bCopyEFBToTexture; + g_Config.bEFBCopyCacheEnable = tmpHeader.bEFBCopyCacheEnable; + g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges; + g_Config.bUseXFB = tmpHeader.bUseXFB; + g_Config.bUseRealXFB = tmpHeader.bUseRealXFB; +} + +void GetSettings() +{ + bSaveConfig = true; + bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + if (!Core::g_CoreStartupParameter.bWii) + g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + + int temp; + + for(int i = 0; i < 4; ++i ) + { + sscanf(SCM_REV_STR + 2 * i, "%2x", &temp ); + revision[i] = temp; + } +} + +void CheckMD5() +{ + for (int i=0, n=0; i<16; i++) + { + if (tmpHeader.md5[i] != 0) + continue; + n++; + if (n == 16) + return; + } + Core::DisplayMessage("Verifying checksum...", 2000); + + unsigned char gameMD5[16]; + char game[255]; + memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size()); + md5_file(game, gameMD5); + + if (memcmp(gameMD5,MD5,16) == 0) + Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000); + else + PanicAlert("Checksum of current game does not match the recorded game!"); +} + +void GetMD5() +{ + Core::DisplayMessage("Calculating checksum of game file...", 2000); + for (int i = 0; i < 16; i++) + MD5[i] = 0; + char game[255]; + memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(),SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size()); + md5_file(game, MD5); + Core::DisplayMessage("Finished calculating checksum.", 2000); +} + +void Shutdown() +{ + g_currentInputCount = g_totalInputCount = g_totalFrames = g_totalBytes = 0; + delete [] tmpInput; + tmpInput = NULL; + tmpInputAllocated = 0; +} }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 09a0f5d84a..79b5e72f29 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -19,7 +19,6 @@ #define __MOVIE_H #include "Common.h" -#include "FileUtil.h" #include "../../InputCommon/Src/GCPadStatus.h" #include @@ -48,19 +47,22 @@ struct ControllerState { bool Start:1, A:1, B:1, X:1, Y:1, Z:1; // Binary buttons, 6 bits bool DPadUp:1, DPadDown:1, // Binary D-Pad buttons, 4 bits DPadLeft:1, DPadRight:1; - bool L:1, R:1; // Binary triggers, 2 bits - bool reserved:4; // Reserved bits used for padding, 4 bits + bool L:1, R:1; // Binary triggers, 2 bits + bool disc:1; // Checks for disc being changed + bool reserved:3; // Reserved bits used for padding, 4 bits - u8 TriggerL, TriggerR; // Triggers, 16 bits + u8 TriggerL, TriggerR; // Triggers, 16 bits u8 AnalogStickX, AnalogStickY; // Main Stick, 16 bits u8 CStickX, CStickY; // Sub-Stick, 16 bits }; // Total: 60 + 4 = 64 bits per frame +static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes"); #pragma pack(pop) // Global declarations -extern bool g_bFrameStep, g_bPolled, g_bReadOnly; +extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange, g_bClearSave; extern PlayMode g_playMode; +extern u64 g_titleID; extern u32 g_framesToSkip, g_frameSkipCounter; @@ -73,6 +75,7 @@ extern u64 g_currentByte, g_totalBytes; extern u64 g_currentFrame, g_totalFrames; extern u64 g_currentLagCount, g_totalLagCount; extern u64 g_currentInputCount, g_totalInputCount; +extern std::string g_discChange; extern u32 g_rerecords; @@ -92,15 +95,37 @@ struct DTMHeader { u64 uniqueID; // (not implemented) A Unique ID comprised of: md5(time + Game ID) u32 numRerecords; // Number of rerecords/'cuts' of this TAS u8 author[32]; // Author's name (encoded in UTF-8) - + u8 videoBackend[16]; // UTF-8 representation of the video backend u8 audioEmulator[16]; // UTF-8 representation of the audio emulator - u8 padBackend[16]; // UTF-8 representation of the input backend + unsigned char md5[16]; // MD5 of game iso u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) - u8 reserved[119]; // Make heading 256 bytes, just because we can + bool bSaveConfig; // Loads the settings below on startup if true + bool bSkipIdle; + bool bDualCore; + bool bProgressive; + bool bDSPHLE; + bool bFastDiscSpeed; + u8 CPUCore; // 0 = interpreter, 1 = JIT, 2 = JITIL + bool bEFBAccessEnable; + bool bEFBCopyEnable; + bool bCopyEFBToTexture; + bool bEFBCopyCacheEnable; + bool bEFBEmulateFormatChanges; + bool bUseXFB; + bool bUseRealXFB; + bool bMemcard; + bool bClearSave; // Create a new memory card when playing back a movie if true + u8 bongos; + u8 reserved[15]; // Padding for any new config options + u8 discChange[40]; // Name of iso file to switch to, for two disc games. + u8 revision[20]; // Git hash + u8 reserved2[27]; // Make heading 256 bytes, just because we can }; +static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes"); + #pragma pack(pop) void FrameUpdate(); @@ -109,16 +134,29 @@ void Init(); void SetPolledDevice(); -bool IsAutoFiring(); bool IsRecordingInput(); bool IsRecordingInputFromSaveState(); bool IsJustStartingRecordingInputFromSaveState(); +bool IsJustStartingPlayingInputFromSaveState(); bool IsPlayingInput(); bool IsReadOnly(); u64 GetRecordingStartTime(); +bool IsConfigSaved(); +bool IsDualCore(); +bool IsProgressive(); +bool IsSkipIdle(); +bool IsDSPHLE(); +bool IsFastDiscSpeed(); +int GetCPUMode(); +bool IsStartingFromClearSave(); +bool IsUsingMemcard(); +void SetGraphicsConfig(); +void GetSettings(); + bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); +bool IsUsingBongo(int controller); void ChangePads(bool instantly = false); void ChangeWiiPads(bool instantly = false); @@ -131,15 +169,21 @@ void FrameSkipping(); bool BeginRecordingInput(int controllers); void RecordInput(SPADStatus *PadStatus, int controllerID); -void RecordWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); +void RecordWiimote(int wiimote, u8 *data, u8 size); bool PlayInput(const char *filename); void LoadInput(const char *filename); +void ReadHeader(); void PlayController(SPADStatus *PadStatus, int controllerID); bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); void EndPlayInput(bool cont); void SaveRecording(const char *filename); void DoState(PointerWrap &p); +void CheckMD5(); +void GetMD5(); +void Shutdown(); +void CheckPadStatus(SPADStatus *PadStatus, int controllerID); +void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); std::string GetInputDisplay(); @@ -150,4 +194,4 @@ void SetInputManip(ManipFunction); void CallInputManip(SPADStatus *PadStatus, int controllerID); }; -#endif // __FRAME_H +#endif // __MOVIE_H diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp index 1c19f763ec..05331bc6cc 100644 --- a/Source/Core/Core/Src/NetPlay.cpp +++ b/Source/Core/Core/Src/NetPlay.cpp @@ -22,6 +22,7 @@ #include "IPC_HLE/WII_IPC_HLE_WiiMote.h" // for gcpad #include "HW/SI_DeviceGCController.h" +#include "HW/SI_DeviceGCSteeringWheel.h" // for gctime #include "HW/EXI_DeviceIPL.h" // for wiimote/ OSD messages @@ -296,6 +297,11 @@ bool CSIDevice_GCController::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u return false; } +bool CSIDevice_GCSteeringWheel::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus) +{ + return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus); +} + // called from ---CPU--- thread // so all players' games get the same time u32 CEXIIPL::NetPlay_GetGCTime() @@ -320,6 +326,11 @@ u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) return numPAD; } +u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD) +{ + return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); +} + // called from ---CPU--- thread // wiimote update / used for frame counting //void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp index a8277d868a..be68d357a3 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp @@ -26,6 +26,7 @@ #include "PowerPCDisasm.h" #include "../../IPC_HLE/WII_IPC_HLE.h" #include "Atomic.h" +#include "HLE/HLE.h" namespace { @@ -79,57 +80,63 @@ int startTrace = 0; void Trace( UGeckoInstruction &instCode ) { - char regs[500]=""; + char reg[25]=""; + std::string regs = ""; for (int i=0; i<32; i++) { - sprintf(regs, "%sr%02d: %08x ", regs, i, PowerPC::ppcState.gpr[i]); + sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]); + regs.append(reg); } - char fregs[500]=""; + char freg[25]=""; + std::string fregs = ""; for (int i=0; i<32; i++) { - sprintf(fregs, "%sf%02d: %08llx %08llx ", fregs, i, - PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]); + sprintf(freg, "f%02d: %08llx %08llx ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]); + fregs.append(freg); } char ppcInst[256]; DisassembleGekko(instCode.hex, PC, ppcInst, 256); - DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s %08x %s", PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs, instCode.hex, ppcInst); + DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s %08x %s", PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str(), instCode.hex, ppcInst); } int Interpreter::SingleStepInner(void) { static UGeckoInstruction instCode; - NPC = PC + sizeof(UGeckoInstruction); - instCode.hex = Memory::Read_Opcode(PC); - - // Uncomment to trace the interpreter - //if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624) - // startTrace = 1; - //else - // startTrace = 0; - - if (startTrace) + u32 function = m_EndBlock ? HLE::GetFunctionIndex(PC) : 0; // Check for HLE functions after branches + if (function != 0) { - Trace(instCode); - } - - if (instCode.hex != 0) - { - UReg_MSR& msr = (UReg_MSR&)MSR; - if (msr.FP) //If FPU is enabled, just execute + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) { - m_opTable[instCode.OPCD](instCode); - if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) { - PowerPC::CheckExceptions(); - m_EndBlock = true; + HLEFunction(function); } } - else + } + else + { + NPC = PC + sizeof(UGeckoInstruction); + instCode.hex = Memory::Read_Opcode(PC); + + // Uncomment to trace the interpreter + //if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624) + // startTrace = 1; + //else + // startTrace = 0; + + if (startTrace) { - // check if we have to generate a FPU unavailable exception - if (!PPCTables::UsesFPU(instCode)) + Trace(instCode); + } + + if (instCode.hex != 0) + { + UReg_MSR& msr = (UReg_MSR&)MSR; + if (msr.FP) //If FPU is enabled, just execute { m_opTable[instCode.OPCD](instCode); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) @@ -140,17 +147,30 @@ int Interpreter::SingleStepInner(void) } else { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE); - PowerPC::CheckExceptions(); - m_EndBlock = true; + // check if we have to generate a FPU unavailable exception + if (!PPCTables::UsesFPU(instCode)) + { + m_opTable[instCode.OPCD](instCode); + if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) + { + PowerPC::CheckExceptions(); + m_EndBlock = true; + } + } + else + { + Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE); + PowerPC::CheckExceptions(); + m_EndBlock = true; + } } } - } - else - { - // Memory exception on instruction fetch - PowerPC::CheckExceptions(); - m_EndBlock = true; + else + { + // Memory exception on instruction fetch + PowerPC::CheckExceptions(); + m_EndBlock = true; + } } last_pc = PC; PC = NPC; diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 1d6ea2e70d..ffaea0e868 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -28,8 +28,6 @@ #undef _interlockedbittestandreset #undef _interlockedbittestandset64 #undef _interlockedbittestandreset64 -#else -#include #endif #include "../../Core.h" @@ -514,4 +512,4 @@ void Interpreter::fsqrtx(UGeckoInstruction _inst) rPS0(_inst.FD) = sqrt(b); UpdateFPRF(rPS0(_inst.FD)); if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index bc5cfc10e6..8e406dbfab 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -24,8 +24,7 @@ #include "Interpreter.h" #include "../../Core.h" -#include "../JitCommon/JitBase.h" -#include "../JitCommon/JitCache.h" +#include "../JitInterface.h" #include "Interpreter_FPUtils.h" @@ -363,34 +362,24 @@ void Interpreter::dcbf(UGeckoInstruction _inst) { NPC = PC + 12; }*/ - // Invalidate the jit block cache on dcbf - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbi(UGeckoInstruction _inst) { // Removes a block from data cache. Since we don't emulate the data cache, we don't need to do anything to the data cache // However, we invalidate the jit block cache on dcbi - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbst(UGeckoInstruction _inst) { // Cache line flush. Since we don't emulate the data cache, we don't need to do anything. // Invalidate the jit block cache on dcbst in case new code has been loaded via the data cache - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbt(UGeckoInstruction _inst) @@ -407,9 +396,9 @@ void Interpreter::dcbtst(UGeckoInstruction _inst) void Interpreter::dcbz(UGeckoInstruction _inst) { // HACK but works... we think - if (HID2.WPE || !HID0.DCFA) + if (!Core::g_CoreStartupParameter.bDCBZOFF) Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); - if (!jit) + if (!JitInterface::GetCore()) PowerPC::CheckExceptions(); } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 19fe74b3f2..ff65f52471 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -26,13 +26,6 @@ #undef _interlockedbittestandreset #undef _interlockedbittestandset64 #undef _interlockedbittestandreset64 -#else -static const unsigned short FPU_ROUND_NEAR = 0 << 10; -static const unsigned short FPU_ROUND_DOWN = 1 << 10; -static const unsigned short FPU_ROUND_UP = 2 << 10; -static const unsigned short FPU_ROUND_CHOP = 3 << 10; -static const unsigned short FPU_ROUND_MASK = 3 << 10; -#include #endif #include "CPUDetect.h" @@ -43,6 +36,7 @@ static const unsigned short FPU_ROUND_MASK = 3 << 10; #include "../../HW/SystemTimers.h" #include "../../Core.h" #include "Interpreter.h" +#include "FPURoundMode.h" #include "Interpreter_FPUtils.h" @@ -61,38 +55,11 @@ mffsx: 80036650 (huh?) // That is, set rounding mode etc when entering jit code or the interpreter loop // Restore rounding mode when calling anything external -const u32 MASKS = 0x1F80; // mask away the interrupts. -const u32 DAZ = 0x40; -const u32 FTZ = 0x8000; - static void FPSCRtoFPUSettings(UReg_FPSCR fp) { - // Set FPU rounding mode to mimic the PowerPC's -#ifdef _M_IX86 - // This shouldn't really be needed anymore since we use SSE -#ifdef _WIN32 - const int table[4] = - { - _RC_NEAR, - _RC_CHOP, - _RC_UP, - _RC_DOWN - }; - _set_controlfp(_MCW_RC, table[fp.RN]); -#else - const unsigned short table[4] = - { - FPU_ROUND_NEAR, - FPU_ROUND_CHOP, - FPU_ROUND_UP, - FPU_ROUND_DOWN - }; - unsigned short mode; - asm ("fstcw %0" : "=m" (mode) : ); - mode = (mode & ~FPU_ROUND_MASK) | table[fp.RN]; - asm ("fldcw %0" : : "m" (mode)); -#endif -#endif + + FPURoundMode::SetRoundMode(fp.RN); + if (fp.VE || fp.OE || fp.UE || fp.ZE || fp.XE) { //PanicAlert("FPSCR - exceptions enabled. Please report. VE=%i OE=%i UE=%i ZE=%i XE=%i", @@ -101,14 +68,6 @@ static void FPSCRtoFPUSettings(UReg_FPSCR fp) } // Also corresponding SSE rounding mode setting - static const u32 ssetable[4] = - { - (0 << 13) | MASKS, - (3 << 13) | MASKS, - (2 << 13) | MASKS, - (1 << 13) | MASKS, - }; - u32 csr = ssetable[FPSCR.RN]; if (FPSCR.NI) { // Either one of these two breaks Beyond Good & Evil. @@ -116,7 +75,7 @@ static void FPSCRtoFPUSettings(UReg_FPSCR fp) // csr |= DAZ; // csr |= FTZ; } - _mm_setcsr(csr); + FPURoundMode::SetSIMDMode(FPSCR.RN); } void Interpreter::mtfsb0x(UGeckoInstruction _inst) @@ -234,7 +193,6 @@ void Interpreter::mtmsr(UGeckoInstruction _inst) { // Privileged? MSR = m_GPR[_inst.RS]; - PowerPC::CheckExceptions(); m_EndBlock = true; } @@ -294,7 +252,8 @@ void Interpreter::mfspr(UGeckoInstruction _inst) case SPR_WPAR: { - // If wpar_empty ever is false, Paper Mario hangs. Strange. + // TODO: If wpar_empty ever is false, Paper Mario hangs. Strange. + // Maybe WPAR is automatically flushed after a certain amount of time? bool wpar_empty = true; //GPFifo::IsEmpty(); if (!wpar_empty) rSPR(iIndex) |= 1; // BNE = buffer not empty diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp index 33540bfb64..fee8ed70d8 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -267,7 +267,7 @@ static GekkoOPTemplate table31[] = {19, Interpreter::mfcr, {"mfcr", OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}}, {83, Interpreter::mfmsr, {"mfmsr", OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}}, {144, Interpreter::mtcrf, {"mtcrf", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, - {146, Interpreter::mtmsr, {"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}}, + {146, Interpreter::mtmsr, {"mtmsr", OPTYPE_SYSTEM, FL_IN_S | FL_ENDBLOCK, 0, 0, 0, 0}}, {210, Interpreter::mtsr, {"mtsr", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, {242, Interpreter::mtsrin, {"mtsrin", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, {339, Interpreter::mfspr, {"mfspr", OPTYPE_SPR, FL_OUT_D, 0, 0, 0, 0}}, @@ -295,7 +295,9 @@ static GekkoOPTemplate table31_2[] = {266, Interpreter::addx, {"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {778, Interpreter::addx, {"addox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {10, Interpreter::addcx, {"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {522, Interpreter::addcx, {"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {138, Interpreter::addex, {"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {650, Interpreter::addex, {"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {234, Interpreter::addmex, {"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {202, Interpreter::addzex, {"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {491, Interpreter::divwx, {"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, @@ -310,6 +312,7 @@ static GekkoOPTemplate table31_2[] = {40, Interpreter::subfx, {"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {552, Interpreter::subfx, {"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {8, Interpreter::subfcx, {"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {520, Interpreter::subfcx, {"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {136, Interpreter::subfex, {"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {232, Interpreter::subfmex, {"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {200, Interpreter::subfzex, {"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 04015afca6..710984571e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -24,7 +24,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HLE/HLE.h" #include "../../Core.h" @@ -252,8 +252,6 @@ void Jit64::HLEFunction(UGeckoInstruction _inst) gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex); - MOV(32, R(EAX), M(&NPC)); - WriteExitDestInEAX(); } void Jit64::DoNothing(UGeckoInstruction _inst) @@ -303,8 +301,7 @@ void Jit64::Cleanup() void Jit64::WriteExit(u32 destination, int exit_num) { Cleanup(); - - SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); + SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); //If nobody has taken care of this yet (this can be removed when all branches are done) JitBlock *b = js.curBlock; @@ -341,7 +338,7 @@ void Jit64::WriteRfiExitDestInEAX() Cleanup(); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExceptions)); SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); - JMP(asm_routines.dispatcher, true); + JMP(asm_routines.outerLoop, true); } void Jit64::WriteExceptionExit() @@ -360,7 +357,7 @@ void Jit64::WriteExternalExceptionExit() MOV(32, R(EAX), M(&PC)); MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExternalExceptions)); - SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); + SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); JMP(asm_routines.dispatcher, true); } @@ -567,6 +564,27 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc ABI_CallFunction(thunks.ProtectFunction((void *)&GPFifo::CheckGatherPipe, 0)); } + u32 function = HLE::GetFunctionIndex(ops[i].address); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + if (type == HLE::HLE_HOOK_REPLACE) + { + MOV(32, R(EAX), M(&NPC)); + js.downcountAmount += js.st.numCycles; + WriteExitDestInEAX(); + break; + } + } + } + } + if (!ops[i].skip) { if ((opinfo->flags & FL_USE_FPU) && !js.firstFPInstructionFound) @@ -669,6 +687,20 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc break; } + u32 function = HLE::GetFunctionIndex(js.blockStart); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_END) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + } + } + } + if (memory_exception) { // Address of instruction could not be translated diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 1ebd476134..1d856d6291 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -62,7 +62,7 @@ if (js.memcheck) \ SetJumpTarget(memException); -class Jit64 : public JitBase +class Jit64 : public Jitx86Base { private: GPRRegCache gpr; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 8d593a6742..cee1f4d048 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -308,7 +308,9 @@ static GekkoOPTemplate table31_2[] = {266, &Jit64::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {778, &Jit64::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {10, &Jit64::addcx}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {522, &Jit64::addcx}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &Jit64::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {650, &Jit64::addex}, //"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &Jit64::addmex}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &Jit64::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {491, &Jit64::divwx}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, @@ -323,6 +325,7 @@ static GekkoOPTemplate table31_2[] = {40, &Jit64::subfx}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {552, &Jit64::subfx}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {8, &Jit64::subfcx}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {520, &Jit64::subfcx}, //"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {136, &Jit64::subfex}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {232, &Jit64::subfmex}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {200, &Jit64::subfzex}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index f7082cd1cc..df27a3a641 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "x64Emitter.h" #include "../../HW/Memmap.h" @@ -24,7 +24,7 @@ #include "../../CoreTiming.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "../JitCommon/JitCache.h" @@ -204,7 +204,7 @@ void Jit64AsmRoutineManager::Generate() MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExternalExceptions)); SetJumpTarget(noExtException); - + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); J_CC(CC_Z, outerLoop, true); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h index e8df0877f7..19e1f41ba8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h @@ -18,7 +18,6 @@ #ifndef _JIT64ASM_H #define _JIT64ASM_H -#include "x64Emitter.h" #include "../JitCommon/JitAsmCommon.h" // In Dolphin, we don't use inline assembly. Instead, we generate all machine-near diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 5aaf4b99f1..3d88d687e0 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1097,7 +1097,7 @@ void Jit64::mulli(UGeckoInstruction inst) gpr.BindToRegister(d, (d == a), true); if (imm == 0) XOR(32, gpr.R(d), gpr.R(d)); - else if(imm == -1) + else if(imm == (u32)-1) { if (d != a) MOV(32, gpr.R(d), gpr.R(a)); @@ -1147,7 +1147,7 @@ void Jit64::mullwx(UGeckoInstruction inst) int src = gpr.R(a).IsImm() ? b : a; if (imm == 0) XOR(32, gpr.R(d), gpr.R(d)); - else if(imm == -1) + else if(imm == (u32)-1) { if (d != src) MOV(32, gpr.R(d), gpr.R(src)); @@ -1263,7 +1263,7 @@ void Jit64::divwux(UGeckoInstruction inst) while(!(divisor & (1 << shift))) shift--; - if (divisor == (1 << shift)) + if (divisor == (u32)(1 << shift)) { gpr.Lock(a, b, d); gpr.BindToRegister(d, d == a, true); @@ -1387,7 +1387,7 @@ void Jit64::divwx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; - if( j == 0 || i == 0x80000000 && j == -1) + if( j == 0 || (i == (s32)0x80000000 && j == -1)) { gpr.SetImmediate32(d, (i >> 31) ^ j); if (inst.OE) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index 1dae2ec17e..7c1d60ad09 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -28,7 +28,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" @@ -139,14 +139,13 @@ void Jit64::lXXx(UGeckoInstruction inst) MOV(32, gpr.R(d), R(EAX)); gpr.UnlockAll(); - gpr.Flush(FLUSH_ALL); + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); // if it's still 0, we can wait until the next event TEST(32, R(EAX), R(EAX)); FixupBranch noIdle = J_CC(CC_NZ); - - gpr.Flush(FLUSH_ALL); - fpr.Flush(FLUSH_ALL); + ABI_CallFunctionC((void *)&PowerPC::OnIdle, PowerPC::ppcState.gpr[a] + (s32)(s16)inst.SIMM_16); // ! we must continue executing of the loop after exception handling, maybe there is still 0 in r0 diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 9f61e097b8..5766eb3177 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -27,7 +27,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 3b14179cd4..924758ab3a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -28,7 +28,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp index b977e82b28..0b6c0462d9 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -23,7 +23,7 @@ #include "../PowerPC.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "Jit.h" @@ -122,25 +122,7 @@ void Jit64::mtmsr(UGeckoInstruction inst) gpr.UnlockAll(); gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); - - // If some exceptions are pending and EE are now enabled, force checking - // external exceptions when going out of mtmsr in order to execute delayed - // interrupts as soon as possible. - MOV(32, R(EAX), M(&MSR)); - TEST(32, R(EAX), Imm32(0x8000)); - FixupBranch eeDisabled = J_CC(CC_Z); - - MOV(32, R(EAX), M((void*)&PowerPC::ppcState.Exceptions)); - TEST(32, R(EAX), R(EAX)); - FixupBranch noExceptionsPending = J_CC(CC_Z); - - MOV(32, M(&PC), Imm32(js.compilerPC + 4)); - WriteExternalExceptionExit(); - - SetJumpTarget(eeDisabled); - SetJumpTarget(noExceptionsPending); WriteExit(js.compilerPC + 4, 0); - js.firstFPInstructionFound = false; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index 7fabd946f9..77f7d6977b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -276,8 +276,8 @@ public: InstLoc EmitLoadMSR() { return FoldZeroOp(LoadMSR, 0); } - InstLoc EmitStoreMSR(InstLoc val, InstLoc pc) { - return FoldBiOp(StoreMSR, val, pc); + InstLoc EmitStoreMSR(InstLoc val) { + return FoldUOp(StoreMSR, val); } InstLoc EmitStoreFPRF(InstLoc value) { return FoldUOp(StoreFPRF, value); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index d9aa46f6b5..3638ba8da6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -472,10 +472,10 @@ static OpArg regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, #else // 64-bit if (Profiled) { - RI.Jit->LEA(32, EAX, M((void*)addr)); + RI.Jit->LEA(32, EAX, M((void*)(u64)addr)); return MComplex(RBX, EAX, SCALE_1, 0); } - return M((void*)addr); + return M((void*)(u64)addr); #endif } } @@ -994,26 +994,8 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak break; } case StoreMSR: { - unsigned InstLoc = ibuild->GetImmValue(getOp2(I)); regStoreInstToConstLoc(RI, 32, getOp1(I), &MSR); regNormalRegClear(RI, I); - - // If some exceptions are pending and EE are now enabled, force checking - // external exceptions when going out of mtmsr in order to execute delayed - // interrupts as soon as possible. - Jit->MOV(32, R(EAX), M(&MSR)); - Jit->TEST(32, R(EAX), Imm32(0x8000)); - FixupBranch eeDisabled = Jit->J_CC(CC_Z); - - Jit->MOV(32, R(EAX), M((void*)&PowerPC::ppcState.Exceptions)); - Jit->TEST(32, R(EAX), R(EAX)); - FixupBranch noExceptionsPending = Jit->J_CC(CC_Z); - - Jit->MOV(32, M(&PC), Imm32(InstLoc + 4)); - Jit->WriteExceptionExit(); // TODO: Implement WriteExternalExceptionExit for JitIL - - Jit->SetJumpTarget(eeDisabled); - Jit->SetJumpTarget(noExceptionsPending); break; } case StoreGQR: { @@ -2009,8 +1991,10 @@ void JitIL::WriteCode() { } void ProfiledReJit() { - jit->SetCodePtr(jit->js.rewriteStart); - DoWriteCode(&((JitIL *)jit)->ibuild, (JitIL *)jit, true, false); - jit->js.curBlock->codeSize = (int)(jit->GetCodePtr() - jit->js.rewriteStart); - jit->GetBlockCache()->FinalizeBlock(jit->js.curBlock->blockNum, jit->jo.enableBlocklink, jit->js.curBlock->normalEntry); + JitIL *jitil = (JitIL *)jit; + jitil->SetCodePtr(jitil->js.rewriteStart); + DoWriteCode(&jitil->ibuild, jitil, true, false); + jitil->js.curBlock->codeSize = (int)(jitil->GetCodePtr() - jitil->js.rewriteStart); + jitil->GetBlockCache()->FinalizeBlock(jitil->js.curBlock->blockNum, jitil->jo.enableBlocklink, + jitil->js.curBlock->normalEntry); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index c9d4e44e71..dc21228858 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HLE/HLE.h" #include "../../Core.h" @@ -199,7 +199,7 @@ namespace JitILProfiler static u64 beginTime; static Block& Add(u64 codeHash) { - const u32 _blockIndex = blocks.size(); + const u32 _blockIndex = (u32)blocks.size(); blocks.push_back(Block()); Block& block = blocks.back(); block.index = _blockIndex; @@ -649,6 +649,27 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc js.next_compilerPC = ops[i + 1].address; } + u32 function = HLE::GetFunctionIndex(ops[i].address); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + if (type == HLE::HLE_HOOK_REPLACE) + { + MOV(32, R(EAX), M(&NPC)); + jit->js.downcountAmount += jit->js.st.numCycles; + WriteExitDestInOpArg(R(EAX)); + break; + } + } + } + } + if (!ops[i].skip) { if (js.memcheck && (opinfo->flags & FL_USE_FPU)) @@ -665,7 +686,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); } - + JitILTables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) @@ -681,6 +702,20 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc } } + u32 function = HLE::GetFunctionIndex(jit->js.blockStart); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_END) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + } + } + } + if (memory_exception) { ibuild.EmitISIException(ibuild.EmitIntConst(em_address)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h index fdda098e44..8c579fa4bd 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h @@ -57,7 +57,7 @@ #define DISABLE64 #endif -class JitIL : public JitBase +class JitIL : public Jitx86Base { private: diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index d04c58b143..aaa155072e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "x64Emitter.h" #include "../../HW/Memmap.h" @@ -25,7 +25,7 @@ #include "MemoryUtil.h" #include "CPUDetect.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HW/GPFifo.h" @@ -71,7 +71,7 @@ void JitILAsmRoutineManager::Generate() #endif // INT3(); - const u8 *outerLoop = GetCodePtr(); + const u8 *outer_loop = GetCodePtr(); ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time @@ -211,16 +211,16 @@ void JitILAsmRoutineManager::Generate() doTiming = GetCodePtr(); ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); - + testExceptions = GetCodePtr(); MOV(32, R(EAX), M(&PC)); MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExceptions)); MOV(32, R(EAX), M(&NPC)); MOV(32, M(&PC), R(EAX)); - + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); - J_CC(CC_Z, outerLoop, true); + J_CC(CC_Z, outer_loop, true); //Landing pad for drec space ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp index 45ceda694a..96902434a6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp @@ -27,7 +27,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp index e06d289cc4..c74abfd8e9 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp @@ -27,7 +27,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp index 2f0a0762fd..6e86804bec 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp @@ -25,7 +25,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp index ac914bec94..70a6ea4843 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp @@ -23,7 +23,7 @@ #include "../PowerPC.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "JitIL.h" @@ -106,7 +106,7 @@ void JitIL::mfspr(UGeckoInstruction inst) // -------------- void JitIL::mtmsr(UGeckoInstruction inst) { - ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS), ibuild.EmitIntConst(js.compilerPC)); + ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS)); ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4)); } // ============== diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp index 9e8e36f9c3..fd920c4a48 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -309,7 +309,9 @@ static GekkoOPTemplate table31_2[] = {266, &JitIL::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {778, &JitIL::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {10, &JitIL::Default}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {522, &JitIL::Default}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &JitIL::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {650, &JitIL::addex}, //"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &JitIL::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &JitIL::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {491, &JitIL::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, @@ -324,6 +326,7 @@ static GekkoOPTemplate table31_2[] = {40, &JitIL::subfx}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {552, &JitIL::subfx}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {8, &JitIL::subfcx}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {520, &JitIL::subfcx}, //"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {136, &JitIL::subfex}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {232, &JitIL::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {200, &JitIL::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp new file mode 100644 index 0000000000..e4b0ffd714 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -0,0 +1,498 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#include "Common.h" +#include "../../HLE/HLE.h" +#include "../../Core.h" +#include "../../PatchEngine.h" +#include "../../CoreTiming.h" +#include "../../ConfigManager.h" +#include "../PowerPC.h" +#include "../Profiler.h" +#include "../PPCTables.h" +#include "../PPCAnalyst.h" +#include "../../HW/Memmap.h" +#include "../../HW/GPFifo.h" +#include "Jit.h" +#include "JitArm_Tables.h" +#include "ArmEmitter.h" +#include "../JitInterface.h" + +using namespace ArmGen; +using namespace PowerPC; + +static int CODE_SIZE = 1024*1024*32; +namespace CPUCompare +{ + extern u32 m_BlockStart; +} + +void JitArm::Init() +{ + AllocCodeSpace(CODE_SIZE); + blocks.Init(); + asm_routines.Init(); + // TODO: Investigate why the register cache crashes when only doing Init with + // the pointer to this. Seems for some reason it doesn't set the emitter pointer + // In the class for some reason? + gpr.Init(this); + gpr.SetEmitter(this); + fpr.Init(this); + fpr.SetEmitter(this); + jo.enableBlocklink = true; + jo.optimizeGatherPipe = false; +} + +void JitArm::ClearCache() +{ + ClearCodeSpace(); + blocks.Clear(); +} + +void JitArm::Shutdown() +{ + FreeCodeSpace(); + blocks.Shutdown(); + asm_routines.Shutdown(); +} + +// This is only called by Default() in this file. It will execute an instruction with the interpreter functions. +void JitArm::WriteCallInterpreter(UGeckoInstruction inst) +{ + gpr.Flush(); + fpr.Flush(); + Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst); + MOVI2R(R0, inst.hex); + MOVI2R(R12, (u32)instr); + BL(R12); +} +void JitArm::unknown_instruction(UGeckoInstruction inst) +{ + PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); +} + +void JitArm::Default(UGeckoInstruction _inst) +{ + WriteCallInterpreter(_inst.hex); +} + +void JitArm::HLEFunction(UGeckoInstruction _inst) +{ + gpr.Flush(); + fpr.Flush(); + MOVI2R(R0, js.compilerPC); + MOVI2R(R1, _inst.hex); + QuickCallFunction(R14, (void*)&HLE::Execute); + ARMReg rA = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + WriteExitDestInR(rA); +} + +void JitArm::DoNothing(UGeckoInstruction _inst) +{ + // Yup, just don't do anything. +} + +static const bool ImHereDebug = false; +static const bool ImHereLog = false; +static std::map been_here; + +static void ImHere() +{ + static File::IOFile f; + if (ImHereLog) + { + if (!f) + { + f.Open("log32.txt", "w"); + } + fprintf(f.GetHandle(), "%08x\n", PC); + } + if (been_here.find(PC) != been_here.end()) + { + been_here.find(PC)->second++; + if ((been_here.find(PC)->second) & 1023) + return; + } + DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR); + been_here[PC] = 1; +} + +void JitArm::Cleanup() +{ + if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0) + QuickCallFunction(R14, (void*)&GPFifo::CheckGatherPipe); +} +void JitArm::DoDownCount() +{ + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&CoreTiming::downcount); + LDR(rB, rA); + if(js.downcountAmount < 255) // We can enlarge this if we used rotations + { + SUBS(rB, rB, js.downcountAmount); + STR(rA, rB); + } + else + { + ARMReg rC = gpr.GetReg(false); + MOVI2R(rC, js.downcountAmount); + SUBS(rB, rB, rC); + STR(rA, rB); + } + gpr.Unlock(rA, rB); +} +void JitArm::WriteExitDestInR(ARMReg Reg) +{ + STR(R9, Reg, STRUCT_OFF(PowerPC::ppcState, pc)); + Cleanup(); + DoDownCount(); + MOVI2R(Reg, (u32)asm_routines.dispatcher); + B(Reg); + gpr.Unlock(Reg); +} +void JitArm::WriteRfiExitDestInR(ARMReg Reg) +{ + STR(R9, Reg, STRUCT_OFF(PowerPC::ppcState, pc)); + Cleanup(); + DoDownCount(); + + MOVI2R(Reg, (u32)asm_routines.testExceptions); + B(Reg); + gpr.Unlock(Reg); // This was locked in the instruction beforehand +} +void JitArm::WriteExceptionExit() +{ + ARMReg A = gpr.GetReg(false); + Cleanup(); + DoDownCount(); + + MOVI2R(A, (u32)asm_routines.testExceptions); + B(A); +} +void JitArm::WriteExit(u32 destination, int exit_num) +{ + Cleanup(); + + DoDownCount(); + //If nobody has taken care of this yet (this can be removed when all branches are done) + JitBlock *b = js.curBlock; + b->exitAddress[exit_num] = destination; + b->exitPtrs[exit_num] = GetWritableCodePtr(); + + // Link opportunity! + int block = blocks.GetBlockNumberFromStartAddress(destination); + if (block >= 0 && jo.enableBlocklink) + { + // It exists! Joy of joy! + B(blocks.GetBlock(block)->checkedEntry); + b->linkStatus[exit_num] = true; + } + else + { + ARMReg A = gpr.GetReg(false); + MOVI2R(A, destination); + STR(R9, A, STRUCT_OFF(PowerPC::ppcState, pc)); + MOVI2R(A, (u32)asm_routines.dispatcher); + B(A); + } +} + +void STACKALIGN JitArm::Run() +{ + CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; + pExecAddr(); +} + +void JitArm::SingleStep() +{ + CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; + pExecAddr(); +} + +void JitArm::Trace() +{ + char regs[500] = ""; + char fregs[750] = ""; + +#ifdef JIT_LOG_GPR + for (int i = 0; i < 32; i++) + { + char reg[50]; + sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]); + strncat(regs, reg, 500); + } +#endif + +#ifdef JIT_LOG_FPR + for (int i = 0; i < 32; i++) + { + char reg[50]; + sprintf(reg, "f%02d: %016x ", i, riPS0(i)); + strncat(fregs, reg, 750); + } +#endif + + DEBUG_LOG(DYNA_REC, "JITARM PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", + PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], + PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, + PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs); +} + +void JitArm::PrintDebug(UGeckoInstruction inst, u32 level) +{ + if (level > 0) + printf("Start: %08x OP '%s' Info\n", (u32)GetCodePtr(), PPCTables::GetInstructionName(inst)); + if (level > 1) + { + GekkoOPInfo* Info = GetOpInfo(inst.hex); + printf("\tOuts\n"); + if (Info->flags & FL_OUT_A) + printf("\t-OUT_A: %x\n", inst.RA); + if(Info->flags & FL_OUT_D) + printf("\t-OUT_D: %x\n", inst.RD); + printf("\tIns\n"); + // A, AO, B, C, S + if(Info->flags & FL_IN_A) + printf("\t-IN_A: %x\n", inst.RA); + if(Info->flags & FL_IN_A0) + printf("\t-IN_A0: %x\n", inst.RA); + if(Info->flags & FL_IN_B) + printf("\t-IN_B: %x\n", inst.RB); + if(Info->flags & FL_IN_C) + printf("\t-IN_C: %x\n", inst.RC); + if(Info->flags & FL_IN_S) + printf("\t-IN_S: %x\n", inst.RS); + } +} + +void STACKALIGN JitArm::Jit(u32 em_address) +{ + if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || Core::g_CoreStartupParameter.bJITNoBlockCache) + { + ClearCache(); + } + + int block_num = blocks.AllocateBlock(em_address); + JitBlock *b = blocks.GetBlock(block_num); + const u8* BlockPtr = DoJit(em_address, &code_buffer, b); + blocks.FinalizeBlock(block_num, jo.enableBlocklink, BlockPtr); +} +void JitArm::Break(UGeckoInstruction inst) +{ + BKPT(0x4444); +} + +const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b) +{ + int blockSize = code_buf->GetSize(); + + // Memory exception on instruction fetch + bool memory_exception = false; + + // A broken block is a block that does not end in a branch + bool broken_block = false; + + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + // Comment out the following to disable breakpoints (speed-up) + blockSize = 1; + broken_block = true; + Trace(); + } + + if (em_address == 0) + { + Core::SetState(Core::CORE_PAUSE); + PanicAlert("ERROR: Compiling at 0. LR=%08x CTR=%08x", LR, CTR); + } + + if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT)) + { + if (!Memory::TranslateAddress(em_address, Memory::FLAG_OPCODE)) + { + // Memory exception occurred during instruction fetch + memory_exception = true; + } + } + + + int size = 0; + js.isLastInstruction = false; + js.blockStart = em_address; + js.fifoBytesThisBlock = 0; + js.curBlock = b; + js.block_flags = 0; + js.cancel = false; + + // Analyze the block, collect all instructions it is made of (including inlining, + // if that is enabled), reorder instructions for optimal performance, and join joinable instructions. + u32 nextPC = em_address; + u32 merged_addresses[32]; + const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]); + int size_of_merged_addresses = 0; + if (!memory_exception) + { + // If there is a memory exception inside a block (broken_block==true), compile up to that instruction. + nextPC = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses); + } + PPCAnalyst::CodeOp *ops = code_buf->codebuffer; + + const u8 *start = GetCodePtr(); + b->checkedEntry = start; + b->runCount = 0; + + // Downcount flag check, Only valid for linked blocks + { + FixupBranch skip = B_CC(CC_PL); + ARMABI_MOVI2M((u32)&PC, js.blockStart); + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)asm_routines.doTiming); + B(rA); + SetJumpTarget(skip); + } + + const u8 *normalEntry = GetCodePtr(); + b->normalEntry = normalEntry; + + if(ImHereDebug) + QuickCallFunction(R14, (void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful + + if (js.fpa.any) + { + // This block uses FPU - needs to add FP exception bailout + ARMReg A = gpr.GetReg(); + ARMReg C = gpr.GetReg(); + Operand2 Shift(2, 10); // 1 << 13 + MOVI2R(C, js.blockStart); // R3 + LDR(A, R9, STRUCT_OFF(PowerPC::ppcState, msr)); + TST(A, Shift); + FixupBranch b1 = B_CC(CC_NEQ); + STR(R9, C, STRUCT_OFF(PowerPC::ppcState, pc)); + MOVI2R(A, (u32)asm_routines.fpException); + B(A); + SetJumpTarget(b1); + gpr.Unlock(A, C); + } + // Conditionally add profiling code. + if (Profiler::g_ProfileBlocks) { + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&b->runCount); // Load in to register + LDR(rB, rA); // Load the actual value in to R11. + ADD(rB, rB, 1); // Add one to the value + STR(rA, rB); // Now store it back in the memory location + // get start tic + PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart); + gpr.Unlock(rA, rB); + } + gpr.Start(js.gpa); + fpr.Start(js.fpa); + js.downcountAmount = 0; + if (!Core::g_CoreStartupParameter.bEnableDebugging) + { + for (int i = 0; i < size_of_merged_addresses; ++i) + { + const u32 address = merged_addresses[i]; + js.downcountAmount += PatchEngine::GetSpeedhackCycles(address); + } + } + + js.skipnext = false; + js.blockSize = size; + js.compilerPC = nextPC; + // Translate instructions + for (int i = 0; i < (int)size; i++) + { + js.compilerPC = ops[i].address; + js.op = &ops[i]; + js.instructionNumber = i; + const GekkoOPInfo *opinfo = ops[i].opinfo; + js.downcountAmount += (opinfo->numCyclesMinusOne + 1); + + if (i == (int)size - 1) + { + // WARNING - cmp->branch merging will screw this up. + js.isLastInstruction = true; + js.next_inst = 0; + if (Profiler::g_ProfileBlocks) { + // CAUTION!!! push on stack regs you use, do your stuff, then pop + PROFILER_VPUSH; + // get end tic + PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop); + // tic counter += (end tic - start tic) + PROFILER_ADD_DIFF_LARGE_INTEGER(&b->ticCounter, &b->ticStop, &b->ticStart); + PROFILER_VPOP; + } + } + else + { + // help peephole optimizations + js.next_inst = ops[i + 1].inst; + js.next_compilerPC = ops[i + 1].address; + } + if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32) + { + js.fifoBytesThisBlock -= 32; + // TODO: This needs thunkmanager for ARM + //ARMABI_CallFunction(thunks.ProtectFunction((void *)&GPFifo::CheckGatherPipe, 0)); + } + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + // Add run count + ARMReg RA = gpr.GetReg(); + ARMReg RB = gpr.GetReg(); + MOVI2R(RA, (u32)&opinfo->runCount); + LDR(RB, RA); + ADD(RB, RB, 1); + STR(RA, RB); + gpr.Unlock(RA, RB); + } + if (!ops[i].skip) + { + PrintDebug(ops[i].inst, 0); + if (js.memcheck && (opinfo->flags & FL_USE_FPU)) + { + // Don't do this yet + BKPT(0x7777); + } + JitArmTables::CompileInstruction(ops[i]); + if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) + { + // Don't do this yet + BKPT(0x666); + } + } + } + if (memory_exception) + BKPT(0x500); + if (broken_block) + { + printf("Broken Block going to 0x%08x\n", nextPC); + WriteExit(nextPC, 0); + } + + b->flags = js.block_flags; + b->codeSize = (u32)(GetCodePtr() - normalEntry); + b->originalSize = size; + FlushIcache(); + return start; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h new file mode 100644 index 0000000000..c736ae77a1 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -0,0 +1,186 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// ======================== +// See comments in Jit.cpp. +// ======================== + +// Mystery: Capcom vs SNK 800aa278 + +// CR flags approach: +// * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3". +// * All flag altering instructions flush this +// * A flush simply does a conditional write to the appropriate CRx. +// * If flag available, branch code can become absolutely trivial. + +// Settings +// ---------- +#ifndef _JITARM_H +#define _JITARM_H +#include "../CPUCoreBase.h" +#include "../PPCAnalyst.h" +#include "JitArmCache.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" +#include "../JitCommon/JitBase.h" + +// Use these to control the instruction selection +// #define INSTRUCTION_START Default(inst); return; +// #define INSTRUCTION_START PPCTables::CountInstruction(inst); +#define INSTRUCTION_START +#define JITDISABLE(type) \ + if (Core::g_CoreStartupParameter.bJITOff || \ + Core::g_CoreStartupParameter.bJIT##type##Off) \ + {Default(inst); return;} + +class JitArm : public JitBase, public ArmGen::ARMXCodeBlock +{ +private: + JitArmBlockCache blocks; + + JitArmAsmRoutineManager asm_routines; + + // TODO: Make arm specific versions of these, shouldn't be too hard to + // make it so we allocate some space at the start(?) of code generation + // and keep the registers in a cache. Will burn this bridge when we get to + // it. + ArmRegCache gpr; + ArmFPRCache fpr; + + PPCAnalyst::CodeBuffer code_buffer; + void DoDownCount(); + + void PrintDebug(UGeckoInstruction inst, u32 level); + + void Helper_UpdateCR1(ARMReg value); +public: + JitArm() : code_buffer(32000) {} + ~JitArm() {} + + void Init(); + void Shutdown(); + + // Jit! + + void Jit(u32 em_address); + const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b); + + JitBaseBlockCache *GetBlockCache() { return &blocks; } + + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + + bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } + + void Trace(); + + void ClearCache(); + + const u8 *GetDispatcher() { + return asm_routines.dispatcher; + } + CommonAsmRoutinesBase *GetAsmRoutines() { + return &asm_routines; + } + + const char *GetName() { + return "JITARM"; + } + // Run! + + void Run(); + void SingleStep(); + + // Utilities for use by opcodes + + void WriteExit(u32 destination, int exit_num); + void WriteExitDestInR(ARMReg Reg); + void WriteRfiExitDestInR(ARMReg Reg); + void WriteExceptionExit(); + void WriteCallInterpreter(UGeckoInstruction _inst); + void Cleanup(); + + void GenerateRC(int cr = 0); + void ComputeRC(int cr = 0); + + // TODO: This shouldn't be here + void StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); + void LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); + + // OPCODES + void unknown_instruction(UGeckoInstruction _inst); + void Default(UGeckoInstruction _inst); + void DoNothing(UGeckoInstruction _inst); + void HLEFunction(UGeckoInstruction _inst); + + void DynaRunTable4(UGeckoInstruction _inst); + void DynaRunTable19(UGeckoInstruction _inst); + void DynaRunTable31(UGeckoInstruction _inst); + void DynaRunTable59(UGeckoInstruction _inst); + void DynaRunTable63(UGeckoInstruction _inst); + + // Breakin shit + void Break(UGeckoInstruction _inst); + // Branch + void bx(UGeckoInstruction _inst); + void bcx(UGeckoInstruction _inst); + void bclrx(UGeckoInstruction _inst); + void sc(UGeckoInstruction _inst); + void rfi(UGeckoInstruction _inst); + void bcctrx(UGeckoInstruction _inst); + + // Integer + void addi(UGeckoInstruction _inst); + void addis(UGeckoInstruction _inst); + void addx(UGeckoInstruction _inst); + void cmp (UGeckoInstruction _inst); + void cmpi(UGeckoInstruction _inst); + void cmpli(UGeckoInstruction _inst); + void negx(UGeckoInstruction _inst); + void mulli(UGeckoInstruction _inst); + void ori(UGeckoInstruction _inst); + void oris(UGeckoInstruction _inst); + void orx(UGeckoInstruction _inst); + void rlwimix(UGeckoInstruction _inst); + void rlwinmx(UGeckoInstruction _inst); + void extshx(UGeckoInstruction inst); + void extsbx(UGeckoInstruction inst); + + // System Registers + void mtmsr(UGeckoInstruction _inst); + void mtspr(UGeckoInstruction _inst); + void mfspr(UGeckoInstruction _inst); + + // LoadStore + void icbi(UGeckoInstruction _inst); + void lbz(UGeckoInstruction _inst); + void lhz(UGeckoInstruction _inst); + void lwz(UGeckoInstruction _inst); + void lwzx(UGeckoInstruction _inst); + void stw(UGeckoInstruction _inst); + void stwu(UGeckoInstruction _inst); + + // Floating point + void fabsx(UGeckoInstruction _inst); + void faddx(UGeckoInstruction _inst); + void fmrx(UGeckoInstruction _inst); + + // Floating point loadStore + void lfs(UGeckoInstruction _inst); +}; + +#endif // _JIT64_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp new file mode 100644 index 0000000000..296ca736a9 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp @@ -0,0 +1,46 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// Enable define below to enable oprofile integration. For this to work, +// it requires at least oprofile version 0.9.4, and changing the build +// system to link the Dolphin executable against libopagent. Since the +// dependency is a little inconvenient and this is possibly a slight +// performance hit, it's not enabled by default, but it's useful for +// locating performance issues. + +#include "../JitInterface.h" +#include "JitArmCache.h" + + +using namespace ArmGen; + + void JitArmBlockCache::WriteLinkBlock(u8* location, const u8* address) + { + ARMXEmitter emit(location); + emit.B(address); + } + void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address) + { + ARMXEmitter emit((u8 *)location); + emit.MOVI2R(R10, (u32)&PC); + emit.MOVI2R(R11, address); + emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher); + emit.STR(R10, R11); + emit.B(R12); + } + + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h new file mode 100644 index 0000000000..103947d5ad --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h @@ -0,0 +1,33 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMCACHE_H +#define _JITARMCACHE_H + +#include "../JitCommon/JitCache.h" + + +typedef void (*CompiledCode)(); + +class JitArmBlockCache : public JitBaseBlockCache +{ +private: + void WriteLinkBlock(u8* location, const u8* address); + void WriteDestroyBlock(const u8* location, u32 address); +}; + +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp new file mode 100644 index 0000000000..677dc238a8 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -0,0 +1,164 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#include "Common.h" + +#include "../../HW/Memmap.h" +#include "Jit.h" +#include "../JitCommon/JitBackpatch.h" +#include "StringUtil.h" + +#ifdef _M_X64 +static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) { + u64 code_addr = (u64)codePtr; + disassembler disasm; + char disbuf[256]; + memset(disbuf, 0, 256); +#ifdef _M_IX86 + disasm.disasm32(0, code_addr, codePtr, disbuf); +#else + disasm.disasm64(0, code_addr, codePtr, disbuf); +#endif + PanicAlert("%s\n\n" + "Error encountered accessing emulated address %08x.\n" + "Culprit instruction: \n%s\nat %#llx", + text.c_str(), emAddress, disbuf, code_addr); + return; +} +#endif + +// This generates some fairly heavy trampolines, but: +// 1) It's really necessary. We don't know anything about the context. +// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be +// that many of them in a typical program/game. +bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store) +{ + u8 op = (inst >> 20) & 0xFF; + printf("op: 0x%08x\n", op); + switch (op) + { + case 0x58: // STR + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = true; + accessSize = 32; + } + break; + case 0x59: // LDR + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 32; + } + break; + case 0x05: // LDRH + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 16; + } + break; + case 0x45 + 0x18: // LDRB + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 8; + } + break; + case 0x44 + 0x18: // STRB + default: + return false; + } + return true; +} +const u8 *JitArm::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +{ + // TODO: This ctx needs to be filled with our information + CONTEXT *ctx = (CONTEXT *)ctx_void; + + // We need to get the destination register before we start + u32 Value = *(u32*)codePtr; + ARMReg rD; + u8 accessSize; + bool Store; + + if (!DisamLoadStore(Value, rD, accessSize, Store)) + { + printf("Invalid backpatch at location 0x%08x(0x%08x)\n", ctx->reg_pc, Value); + exit(0); + } + + if (Store) + { + const u32 ARMREGOFFSET = 4 * 7; + ARMXEmitter emitter(codePtr - ARMREGOFFSET); + switch (accessSize) + { + case 8: // 8bit + //emitter.MOVI2R(R14, (u32)&Memory::Write_U8, false); // 1-2 + return 0; + break; + case 16: // 16bit + //emitter.MOVI2R(R14, (u32)&Memory::Write_U16, false); // 1-2 + return 0; + break; + case 32: // 32bit + emitter.MOVI2R(R14, (u32)&Memory::Write_U32, false); // 1-2 + break; + } + emitter.PUSH(4, R0, R1, R2, R3); // 3 + emitter.MOV(R0, rD); // Value - 4 + emitter.MOV(R1, R10); // Addr- 5 + emitter.BL(R14); // 6 + emitter.POP(4, R0, R1, R2, R3); // 7 + emitter.NOP(1); // 8 + u32 newPC = ctx->reg_pc - (ARMREGOFFSET + 4 * 4); + ctx->reg_pc = newPC; + emitter.FlushIcache(); + return codePtr; + } + else + { + const u32 ARMREGOFFSET = 4 * 6; + ARMXEmitter emitter(codePtr - ARMREGOFFSET); + switch (accessSize) + { + case 8: // 8bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U8, false); // 2 + break; + case 16: // 16bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U16, false); // 2 + break; + case 32: // 32bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U32, false); // 2 + break; + } + emitter.PUSH(4, R0, R1, R2, R3); // 3 + emitter.MOV(R0, R10); // 4 + emitter.BL(R14); // 5 + emitter.MOV(R14, R0); // 6 + emitter.POP(4, R0, R1, R2, R3); // 7 + emitter.MOV(rD, R14); // 8 + ctx->reg_pc -= ARMREGOFFSET + (4 * 4); + emitter.FlushIcache(); + return codePtr; + } + return 0; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp new file mode 100644 index 0000000000..27d5c23141 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp @@ -0,0 +1,347 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +// The branches are known good, or at least reasonably good. +// No need for a disable-mechanism. + +// If defined, clears CR0 at blr and bl-s. If the assumption that +// flags never carry over between functions holds, then the task for +// an optimizer becomes much easier. + +// #define ACID_TEST + +// Zelda and many more games seem to pass the Acid Test. + + +using namespace ArmGen; +void JitArm::sc(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + ARMABI_MOVI2M((u32)&PC, js.compilerPC + 4); // Destroys R12 and R14 + ARMReg rA = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + ORR(rA, rA, EXCEPTION_SYSCALL); + STR(R9, rA, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + gpr.Unlock(rA); + + WriteExceptionExit(); +} + +void JitArm::rfi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + // See Interpreter rfi for details + const u32 mask = 0x87C0FFFF; + const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13] + // MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13; + // R0 = MSR location + // R1 = MSR contents + // R2 = Mask + // R3 = Mask + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg rC = gpr.GetReg(); + ARMReg rD = gpr.GetReg(); + MOVI2R(rA, (u32)&MSR); + MOVI2R(rB, (~mask) & clearMSR13); + MOVI2R(rC, mask & clearMSR13); + + LDR(rD, rA); + + AND(rD, rD, rB); // rD = Masked MSR + STR(rA, rD); + + MOVI2R(rB, (u32)&SRR1); + LDR(rB, rB); // rB contains SRR1 here + + AND(rB, rB, rC); // rB contains masked SRR1 here + ORR(rB, rD, rB); // rB = Masked MSR OR masked SRR1 + + STR(rA, rB); // STR rB in to rA + + MOVI2R(rA, (u32)&SRR0); + LDR(rA, rA); + + gpr.Unlock(rB, rC, rD); + WriteRfiExitDestInR(rA); // rA gets unlocked here + //AND(32, M(&MSR), Imm32((~mask) & clearMSR13)); + //MOV(32, R(EAX), M(&SRR1)); + //AND(32, R(EAX), Imm32(mask & clearMSR13)); + //OR(32, M(&MSR), R(EAX)); + // NPC = SRR0; + //MOV(32, R(EAX), M(&SRR0)); + //WriteRfiExitDestInEAX(); +} + +void JitArm::bx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + // We must always process the following sentence + // even if the blocks are merged by PPCAnalyst::Flatten(). + if (inst.LK) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + + // If this is not the last instruction of a block, + // we will skip the rest process. + // Because PPCAnalyst::Flatten() merged the blocks. + if (!js.isLastInstruction) { + return; + } + + gpr.Flush(); + fpr.Flush(); + + u32 destination; + if (inst.AA) + destination = SignExt26(inst.LI << 2); + else + destination = js.compilerPC + SignExt26(inst.LI << 2); + #ifdef ACID_TEST + // TODO: Not implemented yet. + //if (inst.LK) + //AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000))); + #endif + if (destination == js.compilerPC) + { + //PanicAlert("Idle loop detected at %08x", destination); + // CALL(ProtectFunction(&CoreTiming::Idle, 0)); + // JMP(Asm::testExceptions, true); + // make idle loops go faster + js.downcountAmount += 8; + } + WriteExit(destination, 0); +} + +void JitArm::bcx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + // USES_CR + _assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block"); + + gpr.Flush(); + fpr.Flush(); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + FixupBranch pCTRDontBranch; + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR + { + MOVI2R(rA, (u32)&CTR); + LDR(rB, rA); + SUBS(rB, rB, 1); + STR(rA, rB); + + //SUB(32, M(&CTR), Imm8(1)); + if (inst.BO & BO_BRANCH_IF_CTR_0) + pCTRDontBranch = B_CC(CC_NEQ); + else + pCTRDontBranch = B_CC(CC_EQ); + } + + FixupBranch pConditionDontBranch; + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) // Test a CR bit + { + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + + //TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3))); + if (inst.BO & BO_BRANCH_IF_TRUE) // Conditional branch + pConditionDontBranch = B_CC(CC_EQ); // Zero + else + pConditionDontBranch = B_CC(CC_NEQ); // Not Zero + } + gpr.Unlock(rA, rB); + if (inst.LK) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); // Careful, destroys R14, R12 + + u32 destination; + if(inst.AA) + destination = SignExt16(inst.BD << 2); + else + destination = js.compilerPC + SignExt16(inst.BD << 2); + WriteExit(destination, 0); + + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) + SetJumpTarget( pConditionDontBranch ); + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) + SetJumpTarget( pCTRDontBranch ); + + WriteExit(js.compilerPC + 4, 1); +} +void JitArm::bcctrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + // bcctrx doesn't decrement and/or test CTR + _dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!"); + + if (inst.BO_2 & BO_DONT_CHECK_CONDITION) + { + // BO_2 == 1z1zz -> b always + + //NPC = CTR & 0xfffffffc; + if(inst.LK_3) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&CTR); + MVN(rB, 0x3); // 0xFFFFFFFC + LDR(rA, rA); + AND(rA, rA, rB); + gpr.Unlock(rB); + WriteExitDestInR(rA); + } + else + { + // Rare condition seen in (just some versions of?) Nintendo's NES Emulator + + // BO_2 == 001zy -> b if false + // BO_2 == 011zy -> b if true + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + CCFlags branch; + if (inst.BO_2 & BO_BRANCH_IF_TRUE) + branch = CC_EQ; + else + branch = CC_NEQ; + FixupBranch b = B_CC(branch); + + MOVI2R(rA, (u32)&CTR); + LDR(rA, rA); + MVN(rB, 0x3); // 0xFFFFFFFC + AND(rA, rA, rB); + + if (inst.LK_3){ + ARMReg rC = gpr.GetReg(false); + u32 Jumpto = js.compilerPC + 4; + MOVI2R(rB, (u32)&LR); + MOVI2R(rC, Jumpto); + STR(rB, rC); + //ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR + WriteExitDestInR(rA); + + SetJumpTarget(b); + WriteExit(js.compilerPC + 4, 1); + } +} +void JitArm::bclrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + if (!js.isLastInstruction && + (inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) { + if (inst.LK) + { + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + return; + } + gpr.Flush(); + fpr.Flush(); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + FixupBranch pCTRDontBranch; + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR + { + MOVI2R(rA, (u32)&CTR); + LDR(rB, rA); + SUBS(rB, rB, 1); + STR(rA, rB); + + //SUB(32, M(&CTR), Imm8(1)); + if (inst.BO & BO_BRANCH_IF_CTR_0) + pCTRDontBranch = B_CC(CC_NEQ); + else + pCTRDontBranch = B_CC(CC_EQ); + } + + FixupBranch pConditionDontBranch; + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) // Test a CR bit + { + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + //TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3))); + if (inst.BO & BO_BRANCH_IF_TRUE) // Conditional branch + pConditionDontBranch = B_CC(CC_EQ); // Zero + else + pConditionDontBranch = B_CC(CC_NEQ); // Not Zero + } + + // This below line can be used to prove that blr "eats flags" in practice. + // This observation will let us do a lot of fun observations. + #ifdef ACID_TEST + // TODO: Not yet implemented + // AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000))); + #endif + + //MOV(32, R(EAX), M(&LR)); + //AND(32, R(EAX), Imm32(0xFFFFFFFC)); + MOVI2R(rA, (u32)&LR); + MVN(rB, 0x3); // 0xFFFFFFFC + LDR(rA, rA); + AND(rA, rA, rB); + if (inst.LK){ + ARMReg rC = gpr.GetReg(false); + u32 Jumpto = js.compilerPC + 4; + MOVI2R(rB, (u32)&LR); + MOVI2R(rC, Jumpto); + STR(rB, rC); + //ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR + WriteExitDestInR(rA); + + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) + SetJumpTarget( pConditionDontBranch ); + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) + SetJumpTarget( pCTRDontBranch ); + WriteExit(js.compilerPC + 4, 1); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp new file mode 100644 index 0000000000..fe4c0e3f22 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -0,0 +1,80 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" + +void JitArm::Helper_UpdateCR1(ARMReg value) +{ + // Should just update exception flags, not do any compares. + PanicAlert("CR1"); +} + +void JitArm::fabsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vB = fpr.R0(inst.FB); + + VABS(vD, vB); + + if (inst.Rc) Helper_UpdateCR1(vD); +} + +void JitArm::faddx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vA = fpr.R0(inst.FA); + ARMReg vB = fpr.R0(inst.FB); + + VADD(vD, vA, vB); + if (inst.Rc) Helper_UpdateCR1(vD); +} + +void JitArm::fmrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + Default(inst); return; + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vB = fpr.R0(inst.FB); + + VMOV(vD, vB); + + if (inst.Rc) Helper_UpdateCR1(vD); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp new file mode 100644 index 0000000000..753568c9d3 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -0,0 +1,311 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" +extern u32 Helper_Mask(u8 mb, u8 me); +// ADDI and RLWINMX broken for now + +// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. +// Jit64 ComputerRC is signed +// JIT64 GenerateRC is unsigned +void JitArm::GenerateRC(int cr) { + ARMReg rB = gpr.GetReg(); + + MOV(rB, 0x4); // Result > 0 + SetCC(CC_EQ); MOV(rB, 0x2); // Result == 0 + SetCC(CC_MI); MOV(rB, 0x8); // Result < 0 + SetCC(); + + STRB(R9, rB, STRUCT_OFF(PowerPC::ppcState, cr_fast) + cr); + gpr.Unlock(rB); +} +void JitArm::ComputeRC(int cr) { + ARMReg rB = gpr.GetReg(); + + MOV(rB, 0x2); // Result == 0 + SetCC(CC_LT); MOV(rB, 0x8); // Result < 0 + SetCC(CC_GT); MOV(rB, 0x4); // Result > 0 + SetCC(); + + STRB(R9, rB, STRUCT_OFF(PowerPC::ppcState, cr_fast) + cr); + gpr.Unlock(rB); +} + +void JitArm::addi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RD = gpr.R(inst.RD); + + if (inst.RA) + { + ARMReg rA = gpr.GetReg(false); + ARMReg RA = gpr.R(inst.RA); + MOVI2R(rA, (u32)inst.SIMM_16); + ADD(RD, RA, rA); + } + else + MOVI2R(RD, inst.SIMM_16); +} +void JitArm::addis(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RD = gpr.R(inst.RD); + if (inst.RA) + { + ARMReg rA = gpr.GetReg(false); + ARMReg RA = gpr.R(inst.RA); + MOVI2R(rA, inst.SIMM_16 << 16); + ADD(RD, RA, rA); + } + else + MOVI2R(RD, inst.SIMM_16 << 16); +} +void JitArm::addx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RB = gpr.R(inst.RB); + ARMReg RD = gpr.R(inst.RD); + ADDS(RD, RA, RB); + if (inst.Rc) ComputeRC(); +} +// Wrong - 28/10/2012 +void JitArm::mulli(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + Default(inst); return; + ARMReg RA = gpr.R(inst.RA); + ARMReg RD = gpr.R(inst.RD); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + MUL(RD, RA, rA); + gpr.Unlock(rA); +} +void JitArm::ori(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.UIMM); + ORR(RA, RS, rA); + gpr.Unlock(rA); +} +void JitArm::oris(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.UIMM << 16); + ORR(RA, RS, rA); + gpr.Unlock(rA); +} +void JitArm::orx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg rA = gpr.R(inst.RA); + ARMReg rS = gpr.R(inst.RS); + ARMReg rB = gpr.R(inst.RB); + ORRS(rA, rS, rB); + if (inst.Rc) + ComputeRC(); +} + +void JitArm::extshx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + ARMReg RA, RS; + RA = gpr.R(inst.RA); + RS = gpr.R(inst.RS); + SXTH(RA, RS); + if (inst.Rc){ + CMP(RA, 0); + ComputeRC(); + } +} +void JitArm::extsbx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + ARMReg RA, RS; + RA = gpr.R(inst.RA); + RS = gpr.R(inst.RS); + SXTB(RA, RS); + if (inst.Rc){ + CMP(RA, 0); + ComputeRC(); + } +} +void JitArm::cmp (UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RB = gpr.R(inst.RB); + int crf = inst.CRFD; + CMP(RA, RB); + ComputeRC(crf); +} +void JitArm::cmpi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + int crf = inst.CRFD; + if (inst.SIMM_16 >= 0 && inst.SIMM_16 < 256) + { + CMP(RA, inst.SIMM_16); + } + else + { + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + CMP(RA, rA); + gpr.Unlock(rA); + } + ComputeRC(crf); +} +void JitArm::cmpli(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg rA = gpr.GetReg(); + int crf = inst.CRFD; + u32 uimm = (u32)inst.UIMM; + if (uimm < 256) + { + CMP(RA, uimm); + } + else + { + MOVI2R(rA, (u32)inst.UIMM); + CMP(RA, rA); + } + // Unsigned GenerateRC() + + MOV(rA, 0x2); // Result == 0 + SetCC(CC_LO); MOV(rA, 0x8); // Result < 0 + SetCC(CC_HI); MOV(rA, 0x4); // Result > 0 + SetCC(); + + STRB(R9, rA, STRUCT_OFF(PowerPC::ppcState, cr_fast) + crf); + gpr.Unlock(rA); + +} +// Wrong - 27/10/2012 +void JitArm::negx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + Default(inst);return; + ARMReg RA = gpr.R(inst.RA); + ARMReg RD = gpr.R(inst.RD); + + RSBS(RD, RA, 0); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + BKPT(0x333); + //GenerateOverflow(); + } +} +void JitArm::rlwimix(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + u32 mask = Helper_Mask(inst.MB,inst.ME); + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, mask); + + Operand2 Shift(32 - inst.SH, ST_ROR, RS); // This rotates left, while ARM has only rotate right, so swap it. + if (inst.Rc) + { + BIC (rB, RA, rA); // RA & ~mask + AND (rA, rA, Shift); + ORRS(RA, rB, rA); + GenerateRC(); + } + else + { + BIC (rB, RA, rA); // RA & ~mask + AND (rA, rA, Shift); + ORR(RA, rB, rA); + } + gpr.Unlock(rA, rB); +} +void JitArm::rlwinmx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + u32 mask = Helper_Mask(inst.MB,inst.ME); + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, mask); + + Operand2 Shift(32 - inst.SH, ST_ROR, RS); // This rotates left, while ARM has only rotate right, so swap it. + if (inst.Rc) + { + ANDS(RA, rA, Shift); + GenerateRC(); + } + else + AND (RA, rA, Shift); + gpr.Unlock(rA); + + //m_GPR[inst.RA] = _rotl(m_GPR[inst.RS],inst.SH) & mask; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp new file mode 100644 index 0000000000..80c8a96cbb --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -0,0 +1,414 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +#ifdef ANDROID +#define FASTMEM 0 +#else +#define FASTMEM 0 +#endif +void JitArm::stw(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg RS = gpr.R(inst.RS); +#if FASTMEM + // R10 contains the dest address + ARMReg Value = R11; + ARMReg RA; + if (inst.RA) + RA = gpr.R(inst.RA); + MOV(Value, RS); + if (inst.RA) + { + MOVI2R(R10, inst.SIMM_16, false); + ADD(R10, R10, RA); + } + else + { + MOVI2R(R10, (u32)inst.SIMM_16, false); + NOP(1); + } + StoreFromReg(R10, Value, 32, 0); +#else + ARMReg ValueReg = gpr.GetReg(); + ARMReg Addr = gpr.GetReg(); + ARMReg Function = gpr.GetReg(); + + MOV(ValueReg, RS); + if (inst.RA) + { + MOVI2R(Addr, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(Addr, Addr, RA); + } + else + MOVI2R(Addr, (u32)inst.SIMM_16); + + MOVI2R(Function, (u32)&Memory::Write_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, ValueReg); + MOV(R1, Addr); + BL(Function); + POP(4, R0, R1, R2, R3); + gpr.Unlock(ValueReg, Addr, Function); +#endif +} +void JitArm::stwu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg ValueReg = gpr.GetReg(); + ARMReg Addr = gpr.GetReg(); + ARMReg Function = gpr.GetReg(); + + MOVI2R(Addr, inst.SIMM_16); + ADD(Addr, Addr, RA); + + // Check and set the update before writing since calling a function can + // mess with the "special registers R11+ which may cause some issues. + LDR(Function, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(Function, EXCEPTION_DSI); + FixupBranch DoNotWrite = B_CC(CC_EQ); + MOV(RA, Addr); + SetJumpTarget(DoNotWrite); + + MOV(ValueReg, RS); + + MOVI2R(Function, (u32)&Memory::Write_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, ValueReg); + MOV(R1, Addr); + BL(Function); + POP(4, R0, R1, R2, R3); + + gpr.Unlock(ValueReg, Addr, Function); +} +void JitArm::StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) +{ + ARMReg rA = gpr.GetReg(); + + // All this gets replaced on backpatch + MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 1-2 + AND(dest, dest, rA); // 3 + MOVI2R(rA, (u32)Memory::base, false); // 4-5 + ADD(dest, dest, rA); // 6 + switch (accessSize) + { + case 32: + REV(value, value); // 7 + break; + case 16: + REV16(value, value); + break; + case 8: + NOP(1); + break; + } + switch (accessSize) + { + case 32: + STR(dest, value); // 8 + break; + case 16: + // Not implemented + break; + case 8: + // Not implemented + break; + } + gpr.Unlock(rA); +} +void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) +{ + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, offset, false); // -3 + ADD(addr, addr, rA); // - 1 + + // All this gets replaced on backpatch + MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 2 + AND(addr, addr, rA); // 3 + MOVI2R(rA, (u32)Memory::base, false); // 5 + ADD(addr, addr, rA); // 6 + switch (accessSize) + { + case 32: + LDR(dest, addr); // 7 + break; + case 16: + LDRH(dest, addr); + break; + case 8: + LDRB(dest, addr); + break; + } + switch (accessSize) + { + case 32: + REV(dest, dest); // 9 + break; + case 16: + REV16(dest, dest); + break; + case 8: + NOP(1); + break; + + } + gpr.Unlock(rA); +} +void JitArm::lbz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + MOV(R10, RA); // - 4 + } + else + MOV(R10, 0); // - 4 + LoadToReg(RD, R10, 8, inst.SIMM_16); +#else + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U8); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); +} + +void JitArm::lhz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if 0 // FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + printf("lhz jump to here: 0x%08x\n", (u32)GetCodePtr()); + MOV(R10, RA); // - 4 + } + else + { + printf("lhz jump to here: 0x%08x\n", (u32)GetCodePtr()); + MOV(R10, 0); // - 4 + } + LoadToReg(RD, R10, 16, (u32)inst.SIMM_16); +#else + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U16); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); +} +void JitArm::lwz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + MOV(R10, RA); // - 4 + } + else + MOV(R10, 0); // - 4 + LoadToReg(RD, R10, 32, (u32)inst.SIMM_16); +#else + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && + (inst.hex & 0xFFFF0000) == 0x800D0000 && + (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && + Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + { + gpr.Flush(); + fpr.Flush(); + + // if it's still 0, we can wait until the next event + TST(RD, RD); + FixupBranch noIdle = B_CC(CC_NEQ); + rA = gpr.GetReg(); + + MOVI2R(rA, (u32)&PowerPC::OnIdle); + MOVI2R(R0, PowerPC::ppcState.gpr[inst.RA] + (s32)(s16)inst.SIMM_16); + BL(rA); + + gpr.Unlock(rA); + WriteExceptionExit(); + + SetJumpTarget(noIdle); + + //js.compilerPC += 8; + return; + } +} +void JitArm::lwzx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + ARMReg RB = gpr.R(inst.RB); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + ADD(R10, RA, RB); // - 4 + } + else + MOV(R10, RB); // -4 + LoadToReg(RD, R10, 32, 0); +#else + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + ADD(rB, RA, RB); + } + else + MOV(rB, RB); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); + //// u32 temp = Memory::Read_U32(_inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB]); +} +void JitArm::icbi(UGeckoInstruction inst) +{ + Default(inst); + WriteExit(js.compilerPC + 4, 0); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp new file mode 100644 index 0000000000..d9e320ab22 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -0,0 +1,72 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" + +void JitArm::lfs(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStoreFloating) + Default(inst); return; + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + + ARMReg v0 = fpr.R0(inst.FD, false); + ARMReg v1 = fpr.R1(inst.FD, false); + + VMOV(v0, rA, false); + VMOV(v1, rA, false); + + gpr.Unlock(rA, rB); + SetJumpTarget(DoNotLoad); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp new file mode 100644 index 0000000000..a99114df67 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -0,0 +1,111 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +void JitArm::mtspr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(SystemRegisters) + + u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); + ARMReg RD = gpr.R(inst.RD); + + switch (iIndex) + { + case SPR_LR: + case SPR_CTR: + case SPR_XER: + // These are safe to do the easy way, see the bottom of this function. + break; + + case SPR_GQR0: + case SPR_GQR0 + 1: + case SPR_GQR0 + 2: + case SPR_GQR0 + 3: + case SPR_GQR0 + 4: + case SPR_GQR0 + 5: + case SPR_GQR0 + 6: + case SPR_GQR0 + 7: + // Prevent recompiler from compiling in old quantizer values. + // If the value changed, destroy all blocks using this quantizer + // This will create a little bit of block churn, but hopefully not too bad. + { + /* + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[iIndex])); // Load old value + CMP(32, R(EAX), gpr.R(inst.RD)); + FixupBranch skip_destroy = J_CC(CC_E, false); + int gqr = iIndex - SPR_GQR0; + ABI_CallFunctionC(ProtectFunction(&Jit64::DestroyBlocksWithFlag, 1), (u32)BLOCK_USE_GQR0 << gqr); + SetJumpTarget(skip_destroy);*/ + } + // TODO - break block if quantizers are written to. + default: + Default(inst); + return; + } + + // OK, this is easy. + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)&PowerPC::ppcState.spr); + STR(rA, RD, iIndex * 4); +} + +void JitArm::mfspr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(SystemRegisters) + + u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); + ARMReg RD = gpr.R(inst.RD); + switch (iIndex) + { + case SPR_WPAR: + case SPR_DEC: + case SPR_TL: + case SPR_TU: + Default(inst); + return; + default: + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)&PowerPC::ppcState.spr); + LDR(RD, rA, iIndex * 4); + break; + } +} +void JitArm::mtmsr(UGeckoInstruction inst) +{ + INSTRUCTION_START + // Don't interpret this, if we do we get thrown out + //JITDISABLE(SystemRegisters) + + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, (u32)&MSR); + STR(rA, gpr.R(inst.RS)); + gpr.Unlock(rA); + WriteExit(js.compilerPC + 4, 0); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp new file mode 100644 index 0000000000..1929705df2 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -0,0 +1,502 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Jit.h" +#include "../JitInterface.h" +#include "JitArm_Tables.h" + +// Should be moved in to the Jit class +typedef void (JitArm::*_Instruction) (UGeckoInstruction instCode); + +static _Instruction dynaOpTable[64]; +static _Instruction dynaOpTable4[1024]; +static _Instruction dynaOpTable19[1024]; +static _Instruction dynaOpTable31[1024]; +static _Instruction dynaOpTable59[32]; +static _Instruction dynaOpTable63[1024]; + +void JitArm::DynaRunTable4(UGeckoInstruction _inst) {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);} +void JitArm::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);} + +struct GekkoOPTemplate +{ + int opcode; + _Instruction Inst; + //GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out +}; + +static GekkoOPTemplate primarytable[] = +{ + {4, &JitArm::DynaRunTable4}, //"RunTable4", OPTYPE_SUBTABLE | (4<<24), 0}}, + {19, &JitArm::DynaRunTable19}, //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}}, + {31, &JitArm::DynaRunTable31}, //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}}, + {59, &JitArm::DynaRunTable59}, //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}}, + {63, &JitArm::DynaRunTable63}, //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}}, + + {16, &JitArm::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {18, &JitArm::bx}, //"bx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + + {1, &JitArm::HLEFunction}, //"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {2, &JitArm::Default}, //"DynaBlock", OPTYPE_SYSTEM, 0}}, + {3, &JitArm::Break}, //"twi", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {17, &JitArm::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, + + {7, &JitArm::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, + {8, &JitArm::Default}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {10, &JitArm::cmpli}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, + {11, &JitArm::cmpi}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, + {12, &JitArm::Default}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {13, &JitArm::Default}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}}, + {14, &JitArm::addi}, //"addi", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + {15, &JitArm::addis}, //"addis", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + + {20, &JitArm::rlwimix}, //"rlwimix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}}, + {21, &JitArm::rlwinmx}, //"rlwinmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {23, &JitArm::Default}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}}, + + {24, &JitArm::ori}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {25, &JitArm::oris}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {26, &JitArm::Default}, //"xori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {27, &JitArm::Default}, //"xoris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {28, &JitArm::Default}, //"andi_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + {29, &JitArm::Default}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + + {32, &JitArm::lwz}, //"lwz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {33, &JitArm::Default}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {34, &JitArm::lbz}, //"lbz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {35, &JitArm::Default}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {40, &JitArm::lhz}, //"lhz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {41, &JitArm::Default}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {42, &JitArm::Default}, //"lha", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {43, &JitArm::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + + {44, &JitArm::Default}, //"sth", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {45, &JitArm::Default}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {36, &JitArm::stw}, //"stw", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {37, &JitArm::stwu}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {38, &JitArm::Default}, //"stb", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {39, &JitArm::Default}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + + {46, &JitArm::Default}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + + {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, + {49, &JitArm::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + {50, &JitArm::Default}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, + {51, &JitArm::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + + {52, &JitArm::Default}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, + {53, &JitArm::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {54, &JitArm::Default}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, + {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + + {56, &JitArm::Default}, //"psq_l", OPTYPE_PS, FL_IN_A}}, + {57, &JitArm::Default}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + {60, &JitArm::Default}, //"psq_st", OPTYPE_PS, FL_IN_A}}, + {61, &JitArm::Default}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + + //missing: 0, 5, 6, 9, 22, 30, 62, 58 + {0, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {5, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {6, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {9, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {22, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {30, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {62, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {58, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, +}; + +static GekkoOPTemplate table4[] = +{ //SUBOP10 + {0, &JitArm::Default}, //"ps_cmpu0", OPTYPE_PS, FL_SET_CRn}}, + {32, &JitArm::Default}, //"ps_cmpo0", OPTYPE_PS, FL_SET_CRn}}, + {40, &JitArm::Default}, //"ps_neg", OPTYPE_PS, FL_RC_BIT}}, + {136, &JitArm::Default}, //"ps_nabs", OPTYPE_PS, FL_RC_BIT}}, + {264, &JitArm::Default}, //"ps_abs", OPTYPE_PS, FL_RC_BIT}}, + {64, &JitArm::Default}, //"ps_cmpu1", OPTYPE_PS, FL_RC_BIT}}, + {72, &JitArm::Default}, //"ps_mr", OPTYPE_PS, FL_RC_BIT}}, + {96, &JitArm::Default}, //"ps_cmpo1", OPTYPE_PS, FL_RC_BIT}}, + {528, &JitArm::Default}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}}, + {560, &JitArm::Default}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}}, + {592, &JitArm::Default}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}}, + {624, &JitArm::Default}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}}, + + {1014, &JitArm::Default}, //"dcbz_l", OPTYPE_SYSTEM, 0}}, +}; + +static GekkoOPTemplate table4_2[] = +{ + {10, &JitArm::Default}, //"ps_sum0", OPTYPE_PS, 0}}, + {11, &JitArm::Default}, //"ps_sum1", OPTYPE_PS, 0}}, + {12, &JitArm::Default}, //"ps_muls0", OPTYPE_PS, 0}}, + {13, &JitArm::Default}, //"ps_muls1", OPTYPE_PS, 0}}, + {14, &JitArm::Default}, //"ps_madds0", OPTYPE_PS, 0}}, + {15, &JitArm::Default}, //"ps_madds1", OPTYPE_PS, 0}}, + {18, &JitArm::Default}, //"ps_div", OPTYPE_PS, 0, 16}}, + {20, &JitArm::Default}, //"ps_sub", OPTYPE_PS, 0}}, + {21, &JitArm::Default}, //"ps_add", OPTYPE_PS, 0}}, + {23, &JitArm::Default}, //"ps_sel", OPTYPE_PS, 0}}, + {24, &JitArm::Default}, //"ps_res", OPTYPE_PS, 0}}, + {25, &JitArm::Default}, //"ps_mul", OPTYPE_PS, 0}}, + {26, &JitArm::Default}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, + {28, &JitArm::Default}, //"ps_msub", OPTYPE_PS, 0}}, + {29, &JitArm::Default}, //"ps_madd", OPTYPE_PS, 0}}, + {30, &JitArm::Default}, //"ps_nmsub", OPTYPE_PS, 0}}, + {31, &JitArm::Default}, //"ps_nmadd", OPTYPE_PS, 0}}, +}; + + +static GekkoOPTemplate table4_3[] = +{ + {6, &JitArm::Default}, //"psq_lx", OPTYPE_PS, 0}}, + {7, &JitArm::Default}, //"psq_stx", OPTYPE_PS, 0}}, + {38, &JitArm::Default}, //"psq_lux", OPTYPE_PS, 0}}, + {39, &JitArm::Default}, //"psq_stux", OPTYPE_PS, 0}}, +}; + +static GekkoOPTemplate table19[] = +{ + {528, &JitArm::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, + {16, &JitArm::bclrx}, //"bclrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, + {257, &JitArm::Default}, //"crand", OPTYPE_CR, FL_EVIL}}, + {129, &JitArm::Default}, //"crandc", OPTYPE_CR, FL_EVIL}}, + {289, &JitArm::Default}, //"creqv", OPTYPE_CR, FL_EVIL}}, + {225, &JitArm::Default}, //"crnand", OPTYPE_CR, FL_EVIL}}, + {33, &JitArm::Default}, //"crnor", OPTYPE_CR, FL_EVIL}}, + {449, &JitArm::Default}, //"cror", OPTYPE_CR, FL_EVIL}}, + {417, &JitArm::Default}, //"crorc", OPTYPE_CR, FL_EVIL}}, + {193, &JitArm::Default}, //"crxor", OPTYPE_CR, FL_EVIL}}, + + {150, &JitArm::DoNothing}, //"isync", OPTYPE_ICACHE, FL_EVIL}}, + {0, &JitArm::Default}, //"mcrf", OPTYPE_SYSTEM, FL_EVIL}}, + + {50, &JitArm::rfi}, //"rfi", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}}, + {18, &JitArm::Break}, //"rfid", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}} +}; + + +static GekkoOPTemplate table31[] = +{ + {28, &JitArm::Default}, //"andx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {60, &JitArm::Default}, //"andcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {444, &JitArm::orx}, //"orx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {124, &JitArm::Default}, //"norx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {316, &JitArm::Default}, //"xorx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {412, &JitArm::Default}, //"orcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {476, &JitArm::Default}, //"nandx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {284, &JitArm::Default}, //"eqvx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {0, &JitArm::cmp}, //"cmp", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, + {32, &JitArm::Default}, //"cmpl", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, + {26, &JitArm::Default}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {922, &JitArm::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {954, &JitArm::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {536, &JitArm::Default}, //"srwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {792, &JitArm::Default}, //"srawx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {824, &JitArm::Default}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {24, &JitArm::Default}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + + {54, &JitArm::Default}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, + {86, &JitArm::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, + {246, &JitArm::Default}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &JitArm::Default}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {470, &JitArm::Default}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, + {758, &JitArm::Default}, //"dcba", OPTYPE_DCACHE, 0, 4}}, + {1014, &JitArm::Default}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, + + //load word + {23, &JitArm::lwzx}, //"lwzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {55, &JitArm::Default}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load halfword + {279, &JitArm::Default}, //"lhzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {311, &JitArm::Default}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load halfword signextend + {343, &JitArm::Default}, //"lhax", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {375, &JitArm::Default}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load byte + {87, &JitArm::Default}, //"lbzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {119, &JitArm::Default}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load byte reverse + {534, &JitArm::Default}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {790, &JitArm::Default}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + + // Conditional load/store (Wii SMP) + {150, &JitArm::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}}, + {20, &JitArm::Default}, //"lwarx", OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}}, + + //load string (interpret these) + {533, &JitArm::Default}, //"lswx", OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}}, + {597, &JitArm::Default}, //"lswi", OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}}, + + //store word + {151, &JitArm::Default}, //"stwx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {183, &JitArm::Default}, //"stwux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store halfword + {407, &JitArm::Default}, //"sthx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {439, &JitArm::Default}, //"sthux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store byte + {215, &JitArm::Default}, //"stbx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {247, &JitArm::Default}, //"stbux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store bytereverse + {662, &JitArm::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {918, &JitArm::Default}, //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}}, + + {661, &JitArm::Default}, //"stswx", OPTYPE_STORE, FL_EVIL}}, + {725, &JitArm::Default}, //"stswi", OPTYPE_STORE, FL_EVIL}}, + + // fp load/store + {535, &JitArm::Default}, //"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {567, &JitArm::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + {599, &JitArm::Default}, //"lfdx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {631, &JitArm::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + + {663, &JitArm::Default}, //"stfsx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + {695, &JitArm::Default}, //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, + {727, &JitArm::Default}, //"stfdx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + {759, &JitArm::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, + {983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + + {19, &JitArm::Default}, //"mfcr", OPTYPE_SYSTEM, FL_OUT_D}}, + {83, &JitArm::Default}, //"mfmsr", OPTYPE_SYSTEM, FL_OUT_D}}, + {144, &JitArm::Default}, //"mtcrf", OPTYPE_SYSTEM, 0}}, + {146, &JitArm::mtmsr}, //"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {210, &JitArm::Default}, //"mtsr", OPTYPE_SYSTEM, 0}}, + {242, &JitArm::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}}, + {339, &JitArm::mfspr}, //"mfspr", OPTYPE_SPR, FL_OUT_D}}, + {467, &JitArm::mtspr}, //"mtspr", OPTYPE_SPR, 0, 2}}, + {371, &JitArm::Default}, //"mftb", OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}}, + {512, &JitArm::Default}, //"mcrxr", OPTYPE_SYSTEM, 0}}, + {595, &JitArm::Default}, //"mfsr", OPTYPE_SYSTEM, FL_OUT_D, 2}}, + {659, &JitArm::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}}, + + {4, &JitArm::Break}, //"tw", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, + {598, &JitArm::Default}, //"sync", OPTYPE_SYSTEM, 0, 2}}, + {982, &JitArm::icbi}, //"icbi", OPTYPE_SYSTEM, FL_ENDBLOCK, 3}}, + + // Unused instructions on GC + {310, &JitArm::Default}, //"eciwx", OPTYPE_INTEGER, FL_RC_BIT}}, + {438, &JitArm::Default}, //"ecowx", OPTYPE_INTEGER, FL_RC_BIT}}, + {854, &JitArm::Default}, //"eieio", OPTYPE_INTEGER, FL_RC_BIT}}, + {306, &JitArm::Default}, //"tlbie", OPTYPE_SYSTEM, 0}}, + {370, &JitArm::Default}, //"tlbia", OPTYPE_SYSTEM, 0}}, + {566, &JitArm::Default}, //"tlbsync", OPTYPE_SYSTEM, 0}}, +}; + +static GekkoOPTemplate table31_2[] = +{ + {266, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {778, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {10, &JitArm::Default}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {138, &JitArm::Default}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {234, &JitArm::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {202, &JitArm::Default}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {491, &JitArm::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {1003, &JitArm::Default}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {459, &JitArm::Default}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {971, &JitArm::Default}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {75, &JitArm::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {11, &JitArm::Default}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {235, &JitArm::Default}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {747, &JitArm::Default}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {104, &JitArm::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {40, &JitArm::Default}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {552, &JitArm::Default}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {8, &JitArm::Default}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {136, &JitArm::Default}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {232, &JitArm::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {200, &JitArm::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, +}; + +static GekkoOPTemplate table59[] = +{ + {18, &JitArm::Default}, //{"fdivsx", OPTYPE_FPU, FL_RC_BIT_F, 16}}, + {20, &JitArm::Default}, //"fsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {21, &JitArm::Default}, //"faddsx", OPTYPE_FPU, FL_RC_BIT_F}}, +// {22, &JitArm::Default}, //"fsqrtsx", OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko + {24, &JitArm::Default}, //"fresx", OPTYPE_FPU, FL_RC_BIT_F}}, + {25, &JitArm::Default}, //"fmulsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {28, &JitArm::Default}, //"fmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::Default}, //"fmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {30, &JitArm::Default}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {31, &JitArm::Default}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, +}; + +static GekkoOPTemplate table63[] = +{ + {264, &JitArm::fabsx}, //"fabsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {32, &JitArm::Default}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, + {0, &JitArm::Default}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, + {14, &JitArm::Default}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, + {15, &JitArm::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, + {72, &JitArm::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, + {136, &JitArm::Default}, //"fnabsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {40, &JitArm::Default}, //"fnegx", OPTYPE_FPU, FL_RC_BIT_F}}, + {12, &JitArm::Default}, //"frspx", OPTYPE_FPU, FL_RC_BIT_F}}, + + {64, &JitArm::Default}, //"mcrfs", OPTYPE_SYSTEMFP, 0}}, + {583, &JitArm::Default}, //"mffsx", OPTYPE_SYSTEMFP, 0}}, + {70, &JitArm::Default}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}}, + {38, &JitArm::Default}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}}, + {134, &JitArm::Default}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}}, + {711, &JitArm::Default}, //"mtfsfx", OPTYPE_SYSTEMFP, 0, 2}}, +}; + +static GekkoOPTemplate table63_2[] = +{ + {18, &JitArm::Default}, //"fdivx", OPTYPE_FPU, FL_RC_BIT_F, 30}}, + {20, &JitArm::Default}, //"fsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {21, &JitArm::faddx}, //"faddx", OPTYPE_FPU, FL_RC_BIT_F}}, + {22, &JitArm::Default}, //"fsqrtx", OPTYPE_FPU, FL_RC_BIT_F}}, + {23, &JitArm::Default}, //"fselx", OPTYPE_FPU, FL_RC_BIT_F}}, + {25, &JitArm::Default}, //"fmulx", OPTYPE_FPU, FL_RC_BIT_F}}, + {26, &JitArm::Default}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}}, + {28, &JitArm::Default}, //"fmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::Default}, //"fmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, + {30, &JitArm::Default}, //"fnmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {31, &JitArm::Default}, //"fnmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, +}; + + +namespace JitArmTables +{ + +void CompileInstruction(PPCAnalyst::CodeOp & op) +{ + JitArm *jitarm = (JitArm *)jit; + (jitarm->*dynaOpTable[op.inst.OPCD])(op.inst); + GekkoOPInfo *info = op.opinfo; + if (info) { +#ifdef OPLOG + if (!strcmp(info->opname, OP_TO_LOG)){ ///"mcrfs" + rsplocations.push_back(jit.js.compilerPC); + } +#endif + info->compileCount++; + info->lastUse = jit->js.compilerPC; + } +} + +void InitTables() +{ + // once initialized, tables are read-only + static bool initialized = false; + if (initialized) + return; + + //clear + for (int i = 0; i < 32; i++) + { + dynaOpTable59[i] = &JitArm::unknown_instruction; + } + + for (int i = 0; i < 1024; i++) + { + dynaOpTable4 [i] = &JitArm::unknown_instruction; + dynaOpTable19[i] = &JitArm::unknown_instruction; + dynaOpTable31[i] = &JitArm::unknown_instruction; + dynaOpTable63[i] = &JitArm::unknown_instruction; + } + + for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++) + { + dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst; + } + + for (int i = 0; i < 32; i++) + { + int fill = i << 5; + for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill+table4_2[j].opcode; + dynaOpTable4[op] = table4_2[j].Inst; + } + } + + for (int i = 0; i < 16; i++) + { + int fill = i << 6; + for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill+table4_3[j].opcode; + dynaOpTable4[op] = table4_3[j].Inst; + } + } + + for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++) + { + int op = table4[i].opcode; + dynaOpTable4[op] = table4[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++) + { + int op = table31[i].opcode; + dynaOpTable31[op] = table31[i].Inst; + } + + for (int i = 0; i < 1; i++) + { + int fill = i << 9; + for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill + table31_2[j].opcode; + dynaOpTable31[op] = table31_2[j].Inst; + } + } + + for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++) + { + int op = table19[i].opcode; + dynaOpTable19[op] = table19[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++) + { + int op = table59[i].opcode; + dynaOpTable59[op] = table59[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++) + { + int op = table63[i].opcode; + dynaOpTable63[op] = table63[i].Inst; + } + + for (int i = 0; i < 32; i++) + { + int fill = i << 5; + for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill + table63_2[j].opcode; + dynaOpTable63[op] = table63_2[j].Inst; + } + } + + initialized = true; + +} + +} // namespace diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h new file mode 100644 index 0000000000..4904ce3984 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h @@ -0,0 +1,29 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef JITARM_TABLES_H +#define JITARM_TABLES_H + +#include "../Gekko.h" +#include "../PPCTables.h" + +namespace JitArmTables +{ + void CompileInstruction(PPCAnalyst::CodeOp & op); + void InitTables(); +} +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp new file mode 100644 index 0000000000..e45058b57b --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -0,0 +1,174 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + + +#include "../../HW/Memmap.h" + +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "MemoryUtil.h" + +#include "Jit.h" +#include "../JitCommon/JitCache.h" + +#include "../../HW/GPFifo.h" +#include "../../Core.h" +#include "JitAsm.h" +#include "ArmEmitter.h" + +using namespace ArmGen; + +//TODO - make an option +//#if _DEBUG +// bool enableDebug = false; +//#else +// bool enableDebug = false; +//#endif + +JitArmAsmRoutineManager asm_routines; + +void JitArmAsmRoutineManager::Generate() +{ + enterCode = GetCodePtr(); + PUSH(2, R11, _LR); // R11 is frame pointer in Debug. + + MOVI2R(R0, (u32)&CoreTiming::downcount); + MOVI2R(R9, (u32)&PowerPC::ppcState); + + FixupBranch skipToRealDispatcher = B(); + dispatcher = GetCodePtr(); + printf("Dispatcher is %p\n", dispatcher); + + // Downcount Check + // The result of slice decrementation should be in flags if somebody jumped here + // IMPORTANT - We jump on negative, not carry!!! + FixupBranch bail = B_CC(CC_MI); + + SetJumpTarget(skipToRealDispatcher); + dispatcherNoCheck = GetCodePtr(); + + // This block of code gets the address of the compiled block of code + // It runs though to the compiling portion if it isn't found + LDR(R12, R9, STRUCT_OFF(PowerPC::ppcState, pc));// Load the current PC into R12 + + MOVI2R(R14, JIT_ICACHE_MASK); // Potential for optimization + AND(R12, R12, R14); // R12 contains PC & JIT_ICACHE_MASK here. + // Confirmed good to this point 08-03-12 + + MOVI2R(R14, (u32)jit->GetBlockCache()->GetICache()); + // Confirmed That this loads the base iCache Location correctly 08-04-12 + + LDR(R12, R14, R12, true, true); // R12 contains iCache[PC & JIT_ICACHE_MASK] here + // R12 Confirmed this is the correct iCache Location loaded. + TST(R12, 0xFC); // Test to see if it is a JIT block. + + SetCC(CC_EQ); // Only run next part if R12 is zero + // Success, it is our Jitblock. + MOVI2R(R14, (u32)jit->GetBlockCache()->GetCodePointers()); + // LDR R14 right here to get CodePointers()[0] pointer. + REV(R12, R12); // Reversing this gives us our JITblock. + LSL(R12, R12, 2); // Multiply by four because address locations are u32 in size + LDR(R14, R14, R12, true, true); // Load the block address in to R14 + + B(R14); + + FixupBranch NextBlock = B(); // Jump to end so we can start a new block + SetCC(); // Return to always executing codes + + // If we get to this point, that means that we don't have the block cached to execute + // So call ArmJit to compile the block and then execute it. + MOVI2R(R14, (u32)&Jit); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, pc)); + BL(R14); + + B(dispatcherNoCheck); + + // fpException() + // Floating Point Exception Check, Jumped to if false + fpException = GetCodePtr(); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + ORR(R0, R0, EXCEPTION_FPU_UNAVAILABLE); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, pc)); + B(dispatcher); + + SetJumpTarget(bail); + doTiming = GetCodePtr(); + // XXX: In JIT64, Advance() gets called /after/ the exception checking + // once it jumps back to the start of outerLoop + QuickCallFunction(R14, (void*)&CoreTiming::Advance); + + // Does exception checking + testExceptions = GetCodePtr(); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, pc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, npc)); + QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, pc)); + // Check the state pointer to see if we are exiting + // Gets checked on every exception check + MOVI2R(R0, (u32)PowerPC::GetStatePtr()); + MVN(R1, 0); + LDR(R0, R0); + TST(R0, R1); + FixupBranch Exit = B_CC(CC_NEQ); + + SetJumpTarget(NextBlock); + B(dispatcher); + + SetJumpTarget(Exit); + + POP(2, R11, _PC); + FlushIcache(); +} + +void JitArmAsmRoutineManager::GenerateCommon() +{ +/* fifoDirectWrite8 = AlignCode4(); + GenFifoWrite(8); + fifoDirectWrite16 = AlignCode4(); + GenFifoWrite(16); + fifoDirectWrite32 = AlignCode4(); + GenFifoWrite(32); + fifoDirectWriteFloat = AlignCode4(); + GenFifoFloatWrite(); + fifoDirectWriteXmm64 = AlignCode4(); + GenFifoXmm64Write(); + + GenQuantizedLoads(); + GenQuantizedStores(); + GenQuantizedSingleStores(); +*/ + //CMPSD(R(XMM0), M(&zero), + // TODO + + // Fast write routines - special case the most common hardware write + // TODO: use this. + // Even in x86, the param values will be in the right registers. + /* + const u8 *fastMemWrite8 = AlignCode16(); + CMP(32, R(ABI_PARAM2), Imm32(0xCC008000)); + FixupBranch skip_fast_write = J_CC(CC_NE, false); + MOV(32, EAX, M(&m_gatherPipeCount)); + MOV(8, MDisp(EAX, (u32)&m_gatherPipe), ABI_PARAM1); + ADD(32, 1, M(&m_gatherPipeCount)); + RET(); + SetJumpTarget(skip_fast_write); + CALL((void *)&Memory::Write_U8);*/ +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h new file mode 100644 index 0000000000..9a61e9e653 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h @@ -0,0 +1,43 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMASM_H +#define _JITARMASM_H +#include "ArmEmitter.h" +#include "../JitCommon/JitAsmCommon.h" +using namespace ArmGen; +class JitArmAsmRoutineManager : public CommonAsmRoutinesBase, public ARMXCodeBlock +{ +private: + void Generate(); + void GenerateCommon(); + +public: + void Init() { + AllocCodeSpace(8192); + Generate(); + WriteProtect(); + } + + void Shutdown() { + FreeCodeSpace(); + } +}; + +extern JitArmAsmRoutineManager asm_routines; + +#endif // _JIT64ASM_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp new file mode 100644 index 0000000000..08f10df826 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp @@ -0,0 +1,168 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "JitFPRCache.h" + +ArmFPRCache::ArmFPRCache() +{ + emit = 0; +} + +void ArmFPRCache::Init(ARMXEmitter *emitter) +{ + emit = emitter; + ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG); + ARMReg *Regs = GetAllocationOrder(NUMARMREG); + + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].Reg = PPCRegs[a]; + ArmCRegs[a].LastLoad = 0; + ArmCRegs[a].PS1 = false; + } + for(u8 a = 0; a < NUMARMREG; ++a) + { + ArmRegs[a].Reg = Regs[a]; + ArmRegs[a].free = true; + } +} +void ArmFPRCache::Start(PPCAnalyst::BlockRegStats &stats) +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} +ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the ppc side. + static ARMReg allocationOrder[] = + { + D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, + D11, D12, D13, D14, D15, D16, D17, D18, D19, + D20, D21, D22, D23, D24, D25, D26, D27 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} +ARMReg *ArmFPRCache::GetAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the host side. + static ARMReg allocationOrder[] = + { + D31, D30, D29, D28 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} + +ARMReg ArmFPRCache::GetReg(bool AutoLock) +{ + for(u8 a = 0; a < NUMARMREG; ++a) + if(ArmRegs[a].free) + { + // Alright, this one is free + if (AutoLock) + ArmRegs[a].free = false; + return ArmRegs[a].Reg; + } + // Uh Oh, we have all them locked.... + _assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb"); + return D31; +} +void ArmFPRCache::Unlock(ARMReg V0) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + { + if(ArmRegs[RegNum].Reg == V0) + { + _assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked"); + ArmRegs[RegNum].free = true; + } + } +} +ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) +{ + u32 HighestUsed = 0; + u8 Num = 0; + for(u8 a = 0; a < NUMPPCREG; ++a){ + ++ArmCRegs[a].LastLoad; + if (ArmCRegs[a].LastLoad > HighestUsed) + { + HighestUsed = ArmCRegs[a].LastLoad; + Num = a; + } + } + // Check if already Loaded + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == preg && ArmCRegs[a].PS1 == PS1) + { + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Check if we have a free register + for (u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == 33) + { + u16 offset = STRUCT_OFF(PowerPC::ppcState, ps) + (preg * 16) + (PS1 ? 8 : 0); + if (preLoad) + emit->VLDR(ArmCRegs[a].Reg, R9, offset); + ArmCRegs[a].PPCReg = preg; + ArmCRegs[a].LastLoad = 0; + ArmCRegs[a].PS1 = PS1; + return ArmCRegs[a].Reg; + } + // Alright, we couldn't get a free space, dump that least used register + u16 offsetOld = STRUCT_OFF(PowerPC::ppcState, ps) + (ArmCRegs[Num].PPCReg * 16) + (ArmCRegs[Num].PS1 ? 8 : 0); + emit->VSTR(ArmCRegs[Num].Reg, R9, offsetOld); + + u16 offsetNew = STRUCT_OFF(PowerPC::ppcState, ps) + (preg * 16) + (PS1 ? 8 : 0); + if (preLoad) + emit->VLDR(ArmCRegs[Num].Reg, R9, offsetNew); + ArmCRegs[Num].PPCReg = preg; + ArmCRegs[Num].LastLoad = 0; + ArmCRegs[Num].PS1 = PS1; + return ArmCRegs[Num].Reg; + +} + +ARMReg ArmFPRCache::R0(u32 preg, bool preLoad) +{ + return GetPPCReg(preg, false, preLoad); +} + +ARMReg ArmFPRCache::R1(u32 preg, bool preLoad) +{ + return GetPPCReg(preg, true, preLoad); +} + +void ArmFPRCache::Flush() +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg != 33) + { + u16 offset = STRUCT_OFF(PowerPC::ppcState, ps) + (ArmCRegs[a].PPCReg * 16) + (ArmCRegs[a].PS1 ? 8 : 0); + emit->VSTR(ArmCRegs[a].Reg, R9, offset); + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h new file mode 100644 index 0000000000..6b4f056409 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h @@ -0,0 +1,62 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMFPRCACHE_H +#define _JITARMFPRCACHE_H + +#include "ArmEmitter.h" +#include "../Gekko.h" +#include "../PPCAnalyst.h" +#include "JitRegCache.h" + +#define ARMFPUREGS 32 +using namespace ArmGen; + +class ArmFPRCache +{ +private: + PPCCachedReg regs[32]; + JRCPPC ArmCRegs[ARMFPUREGS]; + JRCReg ArmRegs[ARMFPUREGS]; + + int NUMPPCREG; + int NUMARMREG; + + ARMReg *GetAllocationOrder(int &count); + ARMReg *GetPPCAllocationOrder(int &count); + + ARMReg GetPPCReg(u32 preg, bool PS1, bool preLoad); + +protected: + ARMXEmitter *emit; + +public: + ArmFPRCache(); + ~ArmFPRCache() {} + + void Init(ARMXEmitter *emitter); + void Start(PPCAnalyst::BlockRegStats &stats); + + void SetEmitter(ARMXEmitter *emitter) {emit = emitter;} + + ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use. + void Unlock(ARMReg V0); + void Flush(); + ARMReg R0(u32 preg, bool preLoad = true); // Returns a cached register + ARMReg R1(u32 preg, bool preLoad = true); +}; +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp new file mode 100644 index 0000000000..9c6ffdbac4 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp @@ -0,0 +1,167 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "JitRegCache.h" + +ArmRegCache::ArmRegCache() +{ + emit = 0; +} + +void ArmRegCache::Init(ARMXEmitter *emitter) +{ + emit = emitter; + ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG); + ARMReg *Regs = GetAllocationOrder(NUMARMREG); + for(u8 a = 0; a < 32; ++a) + { + // This gives us the memory locations of the gpr registers so we can + // load them. + regs[a].location = (u8*)&PowerPC::ppcState.gpr[a]; + regs[a].UsesLeft = 0; + } + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].Reg = PPCRegs[a]; + ArmCRegs[a].LastLoad = 0; + } + for(u8 a = 0; a < NUMARMREG; ++a) + { + ArmRegs[a].Reg = Regs[a]; + ArmRegs[a].free = true; + } +} +void ArmRegCache::Start(PPCAnalyst::BlockRegStats &stats) +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } + for(u8 a = 0; a < 32; ++a) + regs[a].UsesLeft = stats.GetTotalNumAccesses(a); +} +ARMReg *ArmRegCache::GetPPCAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the ppc side. + static ARMReg allocationOrder[] = + { + R0, R1, R2, R3, R4, R5, R6, R7, R8 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} +ARMReg *ArmRegCache::GetAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the host side. + static ARMReg allocationOrder[] = + { + R14, R12, R11, R10 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} + +ARMReg ArmRegCache::GetReg(bool AutoLock) +{ + for(u8 a = 0; a < NUMARMREG; ++a) + if(ArmRegs[a].free) + { + // Alright, this one is free + if (AutoLock) + ArmRegs[a].free = false; + return ArmRegs[a].Reg; + } + // Uh Oh, we have all them locked.... + _assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb"); + return R0; +} +void ArmRegCache::Lock(ARMReg Reg) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + if(ArmRegs[RegNum].Reg == Reg) + { + _assert_msg_(_DYNA_REC, ArmRegs[RegNum].free, "This register is already locked"); + ArmRegs[RegNum].free = false; + } + _assert_msg_(_DYNA_REC, false, "Register %d can't be used with lock", Reg); +} +void ArmRegCache::Unlock(ARMReg R0, ARMReg R1, ARMReg R2, ARMReg R3) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + { + if(ArmRegs[RegNum].Reg == R0) + { + _assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked"); + ArmRegs[RegNum].free = true; + } + if( R1 != INVALID_REG && ArmRegs[RegNum].Reg == R1) ArmRegs[RegNum].free = true; + if( R2 != INVALID_REG && ArmRegs[RegNum].Reg == R2) ArmRegs[RegNum].free = true; + if( R3 != INVALID_REG && ArmRegs[RegNum].Reg == R3) ArmRegs[RegNum].free = true; + } +} + +ARMReg ArmRegCache::R(u32 preg) +{ + u32 HighestUsed = 0; + u8 Num = 0; + for(u8 a = 0; a < NUMPPCREG; ++a){ + ++ArmCRegs[a].LastLoad; + if (ArmCRegs[a].LastLoad > HighestUsed) + { + HighestUsed = ArmCRegs[a].LastLoad; + Num = a; + } + } + // Check if already Loaded + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == preg) + { + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Check if we have a free register + for (u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == 33) + { + emit->LDR(ArmCRegs[a].Reg, R9, STRUCT_OFF(PowerPC::ppcState, gpr) + preg * 4); + ArmCRegs[a].PPCReg = preg; + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Alright, we couldn't get a free space, dump that least used register + emit->STR(R9, ArmCRegs[Num].Reg, STRUCT_OFF(PowerPC::ppcState, gpr) + ArmCRegs[Num].PPCReg * 4); + emit->LDR(ArmCRegs[Num].Reg, R9, STRUCT_OFF(PowerPC::ppcState, gpr) + preg * 4); + ArmCRegs[Num].PPCReg = preg; + ArmCRegs[Num].LastLoad = 0; + return ArmCRegs[Num].Reg; +} + +void ArmRegCache::Flush() +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg != 33) + { + emit->STR(R9, ArmCRegs[a].Reg, STRUCT_OFF(PowerPC::ppcState, gpr) + ArmCRegs[a].PPCReg * 4); + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h new file mode 100644 index 0000000000..7292ce1581 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h @@ -0,0 +1,92 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMREGCACHE_H +#define _JITARMREGCACHE_H + +#include "ArmEmitter.h" +#include "../Gekko.h" +#include "../PPCAnalyst.h" + +using namespace ArmGen; +// This ARM Register cache actually pre loads the most used registers before +// the block to increase speed since every memory load requires two +// instructions to load it. We are going to use R0-RMAX as registers for the +// use of PPC Registers. +// Allocation order as follows +#define ARMREGS 16 +// Allocate R0 to R9 for PPC first. +// For General registers on the host side, start with R14 and go down as we go +// R13 is reserved for our stack pointer, don't ever use that. Unless you save +// it +// So we have R14, R12, R11, R10 to work with instructions + +struct PPCCachedReg +{ + const u8 *location; + u32 UsesLeft; +}; +struct JRCPPC +{ + u32 PPCReg; // Tied to which PPC Register + bool PS1; + ARMReg Reg; // Tied to which ARM Register + u32 LastLoad; +}; +struct JRCReg +{ + ARMReg Reg; // Which reg this is. + bool free; +}; +class ArmRegCache +{ +private: + PPCCachedReg regs[32]; + JRCPPC ArmCRegs[ARMREGS]; + JRCReg ArmRegs[ARMREGS]; // Four registers remaining + + int NUMPPCREG; + int NUMARMREG; + + ARMReg *GetAllocationOrder(int &count); + ARMReg *GetPPCAllocationOrder(int &count); + +protected: + ARMXEmitter *emit; + +public: + ArmRegCache(); + ~ArmRegCache() {} + + void Init(ARMXEmitter *emitter); + void Start(PPCAnalyst::BlockRegStats &stats); + + void SetEmitter(ARMXEmitter *emitter) {emit = emitter;} + + ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use. + void Lock(ARMReg reg); + void Unlock(ARMReg R0, ARMReg R1 = INVALID_REG, ARMReg R2 = INVALID_REG, ARMReg R3 = + INVALID_REG); + void Flush(); + ARMReg R(u32 preg); // Returns a cached register + +}; + + + + +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp index 34b9a681e9..7f509dbf0e 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "CPUDetect.h" #include "x64Emitter.h" @@ -26,7 +26,7 @@ #include "../../CoreTiming.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "../JitCommon/JitCache.h" #include "../../HW/GPFifo.h" diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h index cbec27d2aa..a610a03326 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h @@ -21,16 +21,8 @@ #include "../JitCommon/Jit_Util.h" #include "Thunk.h" -class CommonAsmRoutines : public EmuCodeBlock { -protected: - void GenQuantizedLoads(); - void GenQuantizedStores(); - void GenQuantizedSingleStores(); - +class CommonAsmRoutinesBase { public: - void GenFifoWrite(int size); - void GenFifoXmm64Write(); - void GenFifoFloatWrite(); const u8 *fifoDirectWrite8; const u8 *fifoDirectWrite16; @@ -72,8 +64,23 @@ public: // In: XMM0: Bottom 32-bit slot holds the float to be written. const u8 **singleStoreQuantized; +}; + +class CommonAsmRoutines : public CommonAsmRoutinesBase, public EmuCodeBlock +{ +protected: + void GenQuantizedLoads(); + void GenQuantizedStores(); + void GenQuantizedSingleStores(); + +public: + void GenFifoWrite(int size); + void GenFifoXmm64Write(); + void GenFifoFloatWrite(); + private: ThunkManager thunks; + }; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index 9337f87b77..76e791a94c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -25,7 +25,7 @@ #include "../../HW/Memmap.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "x64Analyzer.h" @@ -90,6 +90,13 @@ const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info) case 4: CALL(thunks.ProtectFunction((void *)&Memory::Read_U32, 1)); break; + case 2: + CALL(thunks.ProtectFunction((void *)&Memory::Read_U16, 1)); + SHL(32, R(EAX), Imm8(16)); + break; + case 1: + CALL(thunks.ProtectFunction((void *)&Memory::Read_U8, 1)); + break; } ABI_PopAllCallerSavedRegsAndAdjustStack(); if (dataReg != EAX) { @@ -153,7 +160,7 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info) // 1) It's really necessary. We don't know anything about the context. // 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be // that many of them in a typical program/game. -const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) { #ifdef _M_X64 CONTEXT *ctx = (CONTEXT *)ctx_void; @@ -176,10 +183,6 @@ const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *c codePtr, emAddress); }*/ - if (info.operandSize != 4) { - BackPatchError(StringFromFormat("BackPatch - no support for operand size %i", info.operandSize), codePtr, emAddress); - } - if (info.otherReg != RBX) PanicAlert("BackPatch : Base reg not RBX." "\n\nAttempted to access %08x.", emAddress); @@ -188,7 +191,6 @@ const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *c PanicAlert("BackPatch : Currently only supporting reads." "\n\nAttempted to write to %08x.", emAddress); - // In the first iteration, we assume that all accesses are 32-bit. We also only deal with reads. if (accessType == 0) { XEmitter emitter(codePtr); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h index 4b880eb86d..871a112c6c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h @@ -34,6 +34,9 @@ // from the real context. struct CONTEXT { + #ifdef _M_ARM + u32 reg_pc; + #else #ifdef _M_X64 u64 Rip; u64 Rax; @@ -41,6 +44,7 @@ u32 Eip; u32 Eax; #endif + #endif }; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index 5352c06d04..158171be0f 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -32,12 +32,9 @@ #define JIT_OPCODE 0 -class JitBase : public CPUCoreBase, public EmuCodeBlock +class JitBase : public CPUCoreBase { protected: - JitBlockCache blocks; - TrampolineCache trampolines; - struct JitOptions { bool optimizeStack; @@ -85,14 +82,29 @@ public: // This should probably be removed from public: JitOptions jo; JitState js; - - JitBlockCache *GetBlockCache() { return &blocks; } + + virtual JitBaseBlockCache *GetBlockCache() = 0; virtual void Jit(u32 em_address) = 0; + virtual const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) = 0; + + virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; + + virtual bool IsInCodeSpace(u8 *ptr) = 0; +}; + +class Jitx86Base : public JitBase, public EmuCodeBlock +{ +protected: + JitBlockCache blocks; + TrampolineCache trampolines; +public: + JitBlockCache *GetBlockCache() { return &blocks; } + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); - virtual const CommonAsmRoutines *GetAsmRoutines() = 0; + bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } }; extern JitBase *jit; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index b209a7299b..415b37ca61 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -32,15 +32,13 @@ #include "MemoryUtil.h" #include "../../HW/Memmap.h" +#include "../JitInterface.h" #include "../../CoreTiming.h" #include "../PowerPC.h" #include "../PPCTables.h" #include "../PPCAnalyst.h" -#include "x64Emitter.h" -#include "x64Analyzer.h" - #include "JitCache.h" #include "JitBase.h" @@ -68,12 +66,12 @@ bool JitBlock::ContainsAddress(u32 em_address) return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize); } - bool JitBlockCache::IsFull() const + bool JitBaseBlockCache::IsFull() const { return GetNumBlocks() >= MAX_NUM_BLOCKS - 1; } - void JitBlockCache::Init() + void JitBaseBlockCache::Init() { MAX_NUM_BLOCKS = 65536*2; @@ -91,11 +89,11 @@ bool JitBlock::ContainsAddress(u32 em_address) } else { - PanicAlert("JitBlockCache::Init() - iCache is already initialized"); + PanicAlert("JitBaseBlockCache::Init() - iCache is already initialized"); } if (iCache == 0 || iCacheEx == 0 || iCacheVMEM == 0) { - PanicAlert("JitBlockCache::Init() - unable to allocate iCache"); + PanicAlert("JitBaseBlockCache::Init() - unable to allocate iCache"); } memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); memset(iCacheEx, JIT_ICACHE_INVALID_BYTE, JIT_ICACHEEX_SIZE); @@ -104,7 +102,7 @@ bool JitBlock::ContainsAddress(u32 em_address) Clear(); } - void JitBlockCache::Shutdown() + void JitBaseBlockCache::Shutdown() { delete[] blocks; delete[] blockCodePointers; @@ -133,20 +131,25 @@ bool JitBlock::ContainsAddress(u32 em_address) // This clears the JIT cache. It's called from JitCache.cpp when the JIT cache // is full and when saving and loading states. - void JitBlockCache::Clear() + void JitBaseBlockCache::Clear() { - Core::DisplayMessage("Clearing code cache.", 3000); + if (IsFull()) + Core::DisplayMessage("Clearing block cache.", 3000); + else + Core::DisplayMessage("Clearing code cache.", 3000); + for (int i = 0; i < num_blocks; i++) { DestroyBlock(i, false); } links_to.clear(); block_map.clear(); + valid_block.reset(); num_blocks = 0; memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS); } - void JitBlockCache::ClearSafe() + void JitBaseBlockCache::ClearSafe() { #ifdef JIT_UNLIMITED_ICACHE memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); @@ -155,7 +158,7 @@ bool JitBlock::ContainsAddress(u32 em_address) #endif } - /*void JitBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag) + /*void JitBaseBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag) { for (int i = 0; i < num_blocks; i++) { @@ -166,23 +169,23 @@ bool JitBlock::ContainsAddress(u32 em_address) } }*/ - void JitBlockCache::Reset() + void JitBaseBlockCache::Reset() { Shutdown(); Init(); } - JitBlock *JitBlockCache::GetBlock(int no) + JitBlock *JitBaseBlockCache::GetBlock(int no) { return &blocks[no]; } - int JitBlockCache::GetNumBlocks() const + int JitBaseBlockCache::GetNumBlocks() const { return num_blocks; } - bool JitBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const + bool JitBaseBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const { // check if any endpoint is inside the other range if ((s1 >= s2 && s1 <= e2) || @@ -194,7 +197,7 @@ bool JitBlock::ContainsAddress(u32 em_address) return false; } - int JitBlockCache::AllocateBlock(u32 em_address) + int JitBaseBlockCache::AllocateBlock(u32 em_address) { JitBlock &b = blocks[num_blocks]; b.invalid = false; @@ -210,16 +213,19 @@ bool JitBlock::ContainsAddress(u32 em_address) return num_blocks - 1; } - void JitBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr) + void JitBaseBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr) { blockCodePointers[block_num] = code_ptr; JitBlock &b = blocks[block_num]; - b.originalFirstOpcode = Memory::Read_Opcode_JIT(b.originalAddress); - Memory::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); + b.originalFirstOpcode = JitInterface::Read_Opcode_JIT(b.originalAddress); + JitInterface::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); // Convert the logical address to a physical address for the block map u32 pAddr = b.originalAddress & 0x1FFFFFFF; + for (u32 i = 0; i < (b.originalSize + 7) / 8; ++i) + valid_block[pAddr / 32 + i] = true; + block_map[std::make_pair(pAddr + 4 * b.originalSize - 1, pAddr)] = block_num; if (block_link) { @@ -256,29 +262,29 @@ bool JitBlock::ContainsAddress(u32 em_address) #endif } - const u8 **JitBlockCache::GetCodePointers() + const u8 **JitBaseBlockCache::GetCodePointers() { return blockCodePointers; } #ifdef JIT_UNLIMITED_ICACHE - u8* JitBlockCache::GetICache() + u8* JitBaseBlockCache::GetICache() { return iCache; } - u8* JitBlockCache::GetICacheEx() + u8* JitBaseBlockCache::GetICacheEx() { return iCacheEx; } - u8* JitBlockCache::GetICacheVMEM() + u8* JitBaseBlockCache::GetICacheVMEM() { return iCacheVMEM; } #endif - int JitBlockCache::GetBlockNumberFromStartAddress(u32 addr) + int JitBaseBlockCache::GetBlockNumberFromStartAddress(u32 addr) { if (!blocks) return -1; @@ -309,24 +315,24 @@ bool JitBlock::ContainsAddress(u32 em_address) return inst; } - void JitBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers) + void JitBaseBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers) { for (int i = 0; i < num_blocks; i++) if (blocks[i].ContainsAddress(em_address)) block_numbers->push_back(i); } - u32 JitBlockCache::GetOriginalFirstOp(int block_num) + u32 JitBaseBlockCache::GetOriginalFirstOp(int block_num) { if (block_num >= num_blocks) { - //PanicAlert("JitBlockCache::GetOriginalFirstOp - block_num = %u is out of range", block_num); + //PanicAlert("JitBaseBlockCache::GetOriginalFirstOp - block_num = %u is out of range", block_num); return block_num; } return blocks[block_num].originalFirstOpcode; } - CompiledCode JitBlockCache::GetCompiledCodeFromBlock(int block_num) + CompiledCode JitBaseBlockCache::GetCompiledCodeFromBlock(int block_num) { return (CompiledCode)blockCodePointers[block_num]; } @@ -337,7 +343,7 @@ bool JitBlock::ContainsAddress(u32 em_address) //Can be faster by doing a queue for blocks to link up, and only process those //Should probably be done - void JitBlockCache::LinkBlockExits(int i) + void JitBaseBlockCache::LinkBlockExits(int i) { JitBlock &b = blocks[i]; if (b.invalid) @@ -352,8 +358,7 @@ bool JitBlock::ContainsAddress(u32 em_address) int destinationBlock = GetBlockNumberFromStartAddress(b.exitAddress[e]); if (destinationBlock != -1) { - XEmitter emit(b.exitPtrs[e]); - emit.JMP(blocks[destinationBlock].checkedEntry, true); + WriteLinkBlock(b.exitPtrs[e], blocks[destinationBlock].checkedEntry); b.linkStatus[e] = true; } } @@ -362,33 +367,31 @@ bool JitBlock::ContainsAddress(u32 em_address) using namespace std; - void JitBlockCache::LinkBlock(int i) + void JitBaseBlockCache::LinkBlock(int i) { LinkBlockExits(i); JitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; // equal_range(b) returns pair representing the range // of element with key b ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { - // PanicAlert("Linking block %i to block %i", iter2->second, i); - LinkBlockExits(iter2->second); + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { + // PanicAlert("Linking block %i to block %i", iter->second, i); + LinkBlockExits(iter->second); } } - void JitBlockCache::UnlinkBlock(int i) + void JitBaseBlockCache::UnlinkBlock(int i) { JitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { - JitBlock &sourceBlock = blocks[iter2->second]; + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { + JitBlock &sourceBlock = blocks[iter->second]; for (int e = 0; e < 2; e++) { if (sourceBlock.exitAddress[e] == b.originalAddress) @@ -397,7 +400,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } } - void JitBlockCache::DestroyBlock(int block_num, bool invalidate) + void JitBaseBlockCache::DestroyBlock(int block_num, bool invalidate) { if (block_num < 0 || block_num >= num_blocks) { @@ -413,7 +416,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } b.invalid = true; #ifdef JIT_UNLIMITED_ICACHE - Memory::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD); + JitInterface::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD); #else if (Memory::ReadFast32(b.originalAddress) == block_num) Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress); @@ -424,51 +427,56 @@ bool JitBlock::ContainsAddress(u32 em_address) // Send anyone who tries to run this block back to the dispatcher. // Not entirely ideal, but .. pretty good. // Spurious entrances from previously linked blocks can only come through checkedEntry - XEmitter emit((u8 *)b.checkedEntry); - emit.MOV(32, M(&PC), Imm32(b.originalAddress)); - emit.JMP(jit->GetAsmRoutines()->dispatcher, true); - // this is not needed really - /* - emit.SetCodePtr((u8 *)blockCodePointers[blocknum]); - emit.MOV(32, M(&PC), Imm32(b.originalAddress)); - emit.JMP(asm_routines.dispatcher, true); - */ + WriteDestroyBlock(b.checkedEntry, b.originalAddress); } - void JitBlockCache::InvalidateICache(u32 address, const u32 length) + void JitBaseBlockCache::InvalidateICache(u32 address, const u32 length) { // Convert the logical address to a physical address for the block map u32 pAddr = address & 0x1FFFFFFF; + // Optimize the common case of length == 32 which is used by Interpreter::dcb* + bool destroy_block = true; + if (length == 32) + { + if (!valid_block[pAddr / 32]) + destroy_block = false; + else + valid_block[pAddr / 32] = false; + } + // destroy JIT blocks // !! this works correctly under assumption that any two overlapping blocks end at the same address - std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1, it; - while (it2 != block_map.end() && it2->first.second < pAddr + length) + if (destroy_block) + { + std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1; + while (it2 != block_map.end() && it2->first.second < pAddr + length) { #ifdef JIT_UNLIMITED_ICACHE - JitBlock &b = blocks[it2->second]; - if (b.originalAddress & JIT_ICACHE_VMEM_BIT) - { - u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } - else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) - { - u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } - else - { - u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } + JitBlock &b = blocks[it2->second]; + if (b.originalAddress & JIT_ICACHE_VMEM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } + else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } + else + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } #endif - DestroyBlock(it2->second, true); - it2++; - } - if (it1 != it2) - { - block_map.erase(it1, it2); + DestroyBlock(it2->second, true); + it2++; + } + if (it1 != it2) + { + block_map.erase(it1, it2); + } } #ifdef JIT_UNLIMITED_ICACHE @@ -497,3 +505,14 @@ bool JitBlock::ContainsAddress(u32 em_address) } #endif } + void JitBlockCache::WriteLinkBlock(u8* location, const u8* address) + { + XEmitter emit(location); + emit.JMP(address, true); + } + void JitBlockCache::WriteDestroyBlock(const u8* location, u32 address) + { + XEmitter emit((u8 *)location); + emit.MOV(32, M(&PC), Imm32(address)); + emit.JMP(jit->GetAsmRoutines()->dispatcher, true); + } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index cc373d6114..b148cb8090 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -18,6 +18,7 @@ #ifndef _JITCACHE_H #define _JITCACHE_H +#include #include #include @@ -77,13 +78,15 @@ struct JitBlock typedef void (*CompiledCode)(); -class JitBlockCache + +class JitBaseBlockCache { const u8 **blockCodePointers; JitBlock *blocks; int num_blocks; std::multimap links_to; std::map, u32> block_map; // (end_addr, start_addr) -> number + std::bitset<0x20000000 / 32> valid_block; #ifdef JIT_UNLIMITED_ICACHE u8 *iCache; u8 *iCacheEx; @@ -95,9 +98,13 @@ class JitBlockCache void LinkBlockExits(int i); void LinkBlock(int i); void UnlinkBlock(int i); + + // Virtual for overloaded + virtual void WriteLinkBlock(u8* location, const u8* address) = 0; + virtual void WriteDestroyBlock(const u8* location, u32 address) = 0; public: - JitBlockCache() : + JitBaseBlockCache() : blockCodePointers(0), blocks(0), num_blocks(0), #ifdef JIT_UNLIMITED_ICACHE iCache(0), iCacheEx(0), iCacheVMEM(0), @@ -144,4 +151,11 @@ public: //void DestroyBlocksWithFlag(BlockFlag death_flag); }; +// x86 BlockCache +class JitBlockCache : public JitBaseBlockCache +{ +private: + void WriteLinkBlock(u8* location, const u8* address); + void WriteDestroyBlock(const u8* location, u32 address); +}; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 333f0cdc05..f5c4cb022b 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -25,7 +25,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitBase.h" #include "Jit_Util.h" @@ -96,7 +96,11 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, MOVZX(32, accessSize, EAX, MDisp(EAX, (u32)Memory::base + offset)); } #endif - + + // Add a 2 bytes NOP to have some space for the backpatching + if (accessSize == 8) + NOP(2); + if (accessSize == 32) { BSWAP(32, EAX); @@ -118,14 +122,13 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend) { -#if defined(_WIN32) && defined(_M_X64) +#if defined(_M_X64) #ifdef ENABLE_MEM_CHECK - if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) + if (!Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) #else - if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU) + if (!Core::g_CoreStartupParameter.bMMU) #endif { - // BackPatch only supports 32-bits accesses UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend); } else @@ -269,23 +272,18 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr) { - u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; - - if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack) - { - mem_mask |= Memory::ADDR_MASK_MEM1; - } - -#ifdef ENABLE_MEM_CHECK - if (Core::g_CoreStartupParameter.bEnableDebugging) - { - mem_mask |= Memory::EXRAM_MASK; - } -#endif - - TEST(32, R(reg_addr), Imm32(mem_mask)); if (false && cpu_info.bSSSE3) { // This path should be faster but for some reason it causes errors so I've disabled it. + u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; + + if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack) + mem_mask |= Memory::ADDR_MASK_MEM1; + +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bEnableDebugging) + mem_mask |= Memory::EXRAM_MASK; +#endif + TEST(32, R(reg_addr), Imm32(mem_mask)); FixupBranch argh = J_CC(CC_Z); MOVSS(M(&float_buffer), xmm_value); MOV(32, R(EAX), M(&float_buffer)); diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.cpp b/Source/Core/Core/Src/PowerPC/JitInterface.cpp new file mode 100644 index 0000000000..8fcdd9837f --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitInterface.cpp @@ -0,0 +1,350 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#ifdef _WIN32 +#include +#endif + +#include "JitInterface.h" +#include "JitCommon/JitBase.h" + +#ifndef _M_GENERIC +#include "Jit64IL/JitIL.h" +#include "Jit64/Jit.h" +#include "Jit64/Jit64_Tables.h" +#include "Jit64IL/JitIL_Tables.h" +#endif + +#ifdef _M_ARM +#include "JitArm32/Jit.h" +#include "JitArm32/JitArm_Tables.h" +#endif + +#include "Profiler.h" +#include "PPCSymbolDB.h" +#include "HW/Memmap.h" +#include "ConfigManager.h" + +bool bFakeVMEM = false; +bool bMMU = false; + +namespace JitInterface +{ + void DoState(PointerWrap &p) + { + if (jit && p.GetMode() == PointerWrap::MODE_READ) + jit->GetBlockCache()->ClearSafe(); + } + CPUCoreBase *InitJitCore(int core) + { + bFakeVMEM = SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack == 1; + bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; + + CPUCoreBase *ptr = NULL; + switch(core) + { + #ifndef _M_GENERIC + case 1: + { + ptr = new Jit64(); + break; + } + case 2: + { + ptr = new JitIL(); + break; + } + #endif + #ifdef _M_ARM + case 3: + { + ptr = new JitArm(); + break; + } + #endif + default: + { + PanicAlert("Unrecognizable cpu_core: %d", core); + return NULL; + break; + } + } + jit = static_cast(ptr); + jit->Init(); + return ptr; + } + void InitTables(int core) + { + switch(core) + { + #ifndef _M_GENERIC + case 1: + { + Jit64Tables::InitTables(); + break; + } + case 2: + { + JitILTables::InitTables(); + break; + } + #endif + #ifdef _M_ARM + case 3: + { + JitArmTables::InitTables(); + break; + } + #endif + default: + { + PanicAlert("Unrecognizable cpu_core: %d", core); + break; + } + } + } + CPUCoreBase *GetCore() + { + return jit; + } + + void WriteProfileResults(const char *filename) + { + // Can't really do this with no jit core available + #ifndef _M_GENERIC + + std::vector stats; + stats.reserve(jit->GetBlockCache()->GetNumBlocks()); + u64 cost_sum = 0; + #ifdef _WIN32 + u64 timecost_sum = 0; + u64 countsPerSec; + QueryPerformanceFrequency((LARGE_INTEGER *)&countsPerSec); + #endif + for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++) + { + const JitBlock *block = jit->GetBlockCache()->GetBlock(i); + // Rough heuristic. Mem instructions should cost more. + u64 cost = block->originalSize * (block->runCount / 4); + #ifdef _WIN32 + u64 timecost = block->ticCounter; + #endif + // Todo: tweak. + if (block->runCount >= 1) + stats.push_back(BlockStat(i, cost)); + cost_sum += cost; + #ifdef _WIN32 + timecost_sum += timecost; + #endif + } + + sort(stats.begin(), stats.end()); + File::IOFile f(filename, "w"); + if (!f) + { + PanicAlert("failed to open %s", filename); + return; + } + fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); + for (unsigned int i = 0; i < stats.size(); i++) + { + const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum); + if (block) + { + std::string name = g_symbolDB.GetDescription(block->originalAddress); + double percent = 100.0 * (double)stats[i].cost / (double)cost_sum; + #ifdef _WIN32 + double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum; + fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", + block->originalAddress, name.c_str(), stats[i].cost, + block->ticCounter, percent, timePercent, + (double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize); + #else + fprintf(f.GetHandle(), "%08x\t%s\t%llu\t???\t%.2lf\t???\t???\t%i\n", + block->originalAddress, name.c_str(), stats[i].cost, percent, block->codeSize); + #endif + } + } + #endif + } + bool IsInCodeSpace(u8 *ptr) + { + return jit->IsInCodeSpace(ptr); + } + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) + { + return jit->BackPatch(codePtr, accessType, em_address, ctx); + } + + void ClearCache() + { + if (jit) + jit->ClearCache(); + } + void ClearSafe() + { + if (jit) + jit->GetBlockCache()->ClearSafe(); + } + + void InvalidateICache(u32 address, u32 size) + { + if (jit) + jit->GetBlockCache()->InvalidateICache(address, size); + } + + + // Memory functions + u32 Read_Opcode_JIT_Uncached(const u32 _Address) + { + u8* iCache; + u32 addr; + if (_Address & JIT_ICACHE_VMEM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheVMEM(); + addr = _Address & JIT_ICACHE_MASK; + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheEx(); + addr = _Address & JIT_ICACHEEX_MASK; + } + else + { + iCache = jit->GetBlockCache()->GetICache(); + addr = _Address & JIT_ICACHE_MASK; + } + u32 inst = *(u32*)(iCache + addr); + if (inst == JIT_ICACHE_INVALID_WORD) + { + u32 cache_block_start = addr & ~0x1f; + u32 mem_block_start = _Address & ~0x1f; + u8 *pMem = Memory::GetPointer(mem_block_start); + memcpy(iCache + cache_block_start, pMem, 32); + inst = *(u32*)(iCache + addr); + } + inst = Common::swap32(inst); + + if ((inst & 0xfc000000) == 0) + { + inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); + } + + return inst; + } + + u32 Read_Opcode_JIT(u32 _Address) + { + #ifdef FAST_ICACHE + if (bMMU && !bFakeVMEM && (_Address & Memory::ADDR_MASK_MEM1)) + { + _Address = Memory::TranslateAddress(_Address, Memory::FLAG_OPCODE); + if (_Address == 0) + { + return 0; + } + } + u32 inst = 0; + + // Bypass the icache for the external interrupt exception handler + if ( (_Address & 0x0FFFFF00) == 0x00000500 ) + inst = Read_Opcode_JIT_Uncached(_Address); + else + inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); + #else + u32 inst = Memory::ReadUnchecked_U32(_Address); + #endif + return inst; + } + + // The following function is deprecated in favour of FAST_ICACHE + u32 Read_Opcode_JIT_LC(const u32 _Address) + { + #ifdef JIT_UNLIMITED_ICACHE + if ((_Address & ~JIT_ICACHE_MASK) != 0x80000000 && (_Address & ~JIT_ICACHE_MASK) != 0x00000000 && + (_Address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area + (_Address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (_Address & ~JIT_ICACHEEX_MASK) != 0x10000000) + { + PanicAlertT("iCacheJIT: Reading Opcode from %x. Please report.", _Address); + ERROR_LOG(MEMMAP, "iCacheJIT: Reading Opcode from %x. Please report.", _Address); + return 0; + } + u8* iCache; + u32 addr; + if (_Address & JIT_ICACHE_VMEM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheVMEM(); + addr = _Address & JIT_ICACHE_MASK; + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheEx(); + addr = _Address & JIT_ICACHEEX_MASK; + } + else + { + iCache = jit->GetBlockCache()->GetICache(); + addr = _Address & JIT_ICACHE_MASK; + } + u32 inst = *(u32*)(iCache + addr); + if (inst == JIT_ICACHE_INVALID_WORD) + inst = Memory::ReadUnchecked_U32(_Address); + else + inst = Common::swap32(inst); + #else + u32 inst = Memory::ReadUnchecked_U32(_Address); + #endif + if ((inst & 0xfc000000) == 0) + { + inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); + } + return inst; + } + + // WARNING! No checks! + // We assume that _Address is cached + void Write_Opcode_JIT(const u32 _Address, const u32 _Value) + { + #ifdef JIT_UNLIMITED_ICACHE + if (_Address & JIT_ICACHE_VMEM_BIT) + { + *(u32*)(jit->GetBlockCache()->GetICacheVMEM() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + *(u32*)(jit->GetBlockCache()->GetICacheEx() + (_Address & JIT_ICACHEEX_MASK)) = Common::swap32(_Value); + } + else + *(u32*)(jit->GetBlockCache()->GetICache() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); + #else + Memory::WriteUnchecked_U32(_Value, _Address); + #endif + } + + + void Shutdown() + { + if (jit) + { + jit->Shutdown(); + delete jit; + jit = NULL; + } + } +} diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.h b/Source/Core/Core/Src/PowerPC/JitInterface.h new file mode 100644 index 0000000000..a01c3dfa6e --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitInterface.h @@ -0,0 +1,56 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "ChunkFile.h" +#include "CPUCoreBase.h" + +namespace JitInterface +{ + void DoState(PointerWrap &p); + + CPUCoreBase *InitJitCore(int core); + void InitTables(int core); + CPUCoreBase *GetCore(); + + // Debugging + void WriteProfileResults(const char *filename); + + // Memory Utilities + bool IsInCodeSpace(u8 *ptr); + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + + // used by JIT to read instructions + u32 Read_Opcode_JIT(const u32 _Address); + // used by JIT. uses iCacheJIT. Reads in the "Locked cache" mode + u32 Read_Opcode_JIT_LC(const u32 _Address); + void Write_Opcode_JIT(const u32 _Address, const u32 _Value); + + // Clearing CodeCache + void ClearCache(); + + void ClearSafe(); + + void InvalidateICache(u32 address, u32 size); + + void Shutdown(); +} +extern bool bFakeVMEM; +extern bool bMMU; + +#ifdef _M_ARM +#include "JitArm32/Jit.h" +#endif diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index ddfec1c328..15a85568de 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -21,6 +21,7 @@ #include "StringUtil.h" #include "Interpreter/Interpreter.h" #include "../HW/Memmap.h" +#include "JitInterface.h" #include "PPCTables.h" #include "PPCSymbolDB.h" #include "SignatureDB.h" @@ -246,17 +247,13 @@ bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b) return false; } - // For now, only integer ops acceptable. - switch (b_info->type) { - case OPTYPE_INTEGER: - case OPTYPE_LOAD: - case OPTYPE_STORE: - //case OPTYPE_LOADFP: - //case OPTYPE_STOREFP: - break; - default: + // For now, only integer ops acceptable. Any instruction which can raise an + // interrupt is *not* a possible swap candidate: see [1] for an example of + // a crash caused by this error. + // + // [1] https://code.google.com/p/dolphin-emu/issues/detail?id=5864#c7 + if (b_info->type != OPTYPE_INTEGER) return false; - } // Check that we have no register collisions. // That is, check that none of b's outputs matches any of a's inputs, @@ -372,7 +369,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, } else { - inst = Memory::Read_Opcode_JIT(address); + inst = JitInterface::Read_Opcode_JIT(address); } } diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 6956e9db1c..a0e4c666a4 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -20,6 +20,7 @@ #include "PowerPC.h" #include "JitCommon/JitBase.h" #include "JitCommon/JitCache.h" +#include "JitInterface.h" namespace PowerPC { @@ -76,8 +77,7 @@ namespace PowerPC memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex)); memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem)); #endif - if (jit) - jit->GetBlockCache()->ClearSafe(); + JitInterface::ClearSafe(); } void InstructionCache::Init() @@ -109,8 +109,7 @@ namespace PowerPC } #endif valid[set] = 0; - if (jit) - jit->GetBlockCache()->InvalidateICache(addr & ~0x1f, 32); + JitInterface::InvalidateICache(addr & ~0x1f, 32); } u32 InstructionCache::ReadInstruction(u32 addr) diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp index d96089cebb..a6975f5860 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp @@ -24,11 +24,7 @@ #include "FileUtil.h" #include "Interpreter/Interpreter.h" #include "Interpreter/Interpreter_Tables.h" -#include "Jit64IL/JitIL_Tables.h" -#include "Jit64/Jit64_Tables.h" - -#include "Jit64IL/JitIL.h" -#include "Jit64/Jit.h" +#include "JitInterface.h" struct op_inf { @@ -165,19 +161,9 @@ void InitTables(int cpu_core) // Interpreter break; } - case 1: - { - Jit64Tables::InitTables(); - break; - } - case 2: - { - JitILTables::InitTables(); - break; - } default: { - PanicAlert("Unrecognizable cpu_core: %d", cpu_core); + JitInterface::InitTables(cpu_core); break; } } diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 8a7b817212..d4447331e7 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -29,12 +29,10 @@ #include "../HW/SystemTimers.h" #include "Interpreter/Interpreter.h" -#include "JitCommon/JitBase.h" -#include "Jit64IL/JitIL.h" -#include "Jit64/Jit.h" #include "PowerPC.h" #include "PPCTables.h" #include "CPUCoreBase.h" +#include "JitInterface.h" #include "../Host.h" #include "HW/EXI.h" @@ -87,8 +85,7 @@ void DoState(PointerWrap &p) // SystemTimers::DecrementerSet(); // SystemTimers::TimeBaseSet(); - if (jit && p.GetMode() == PointerWrap::MODE_READ) - jit->GetBlockCache()->ClearSafe(); + JitInterface::DoState(p); } void ResetRegisters() @@ -131,28 +128,18 @@ void ResetRegisters() void Init(int cpu_core) { - enum { - FPU_PREC_24 = 0 << 8, - FPU_PREC_53 = 2 << 8, - FPU_PREC_64 = 3 << 8, - FPU_PREC_MASK = 3 << 8, - }; -#ifdef _M_IX86 - // sets the floating-point lib to 53-bit - // PowerPC has a 53bit floating pipeline only - // eg: sscanf is very sensitive -#ifdef _WIN32 - _control87(_PC_53, MCW_PC); -#else - unsigned short _mode; - asm ("fstcw %0" : : "m" (_mode)); - _mode = (_mode & ~FPU_PREC_MASK) | FPU_PREC_53; - asm ("fldcw %0" : : "m" (_mode)); -#endif -#else - //x64 doesn't need this - fpu is done with SSE - //but still - set any useful sse options here -#endif + FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53); + + memset(ppcState.mojs, 0, sizeof(ppcState.mojs)); + memset(ppcState.sr, 0, sizeof(ppcState.sr)); + ppcState.DebugCount = 0; + ppcState.dtlb_last = 0; + ppcState.dtlb_last = 0; + memset(ppcState.dtlb_va, 0, sizeof(ppcState.dtlb_va)); + memset(ppcState.dtlb_pa, 0, sizeof(ppcState.dtlb_pa)); + ppcState.itlb_last = 0; + memset(ppcState.itlb_va, 0, sizeof(ppcState.itlb_va)); + memset(ppcState.itlb_pa, 0, sizeof(ppcState.itlb_pa)); memset(ppcState.mojs, 0, sizeof(ppcState.mojs)); memset(ppcState.sr, 0, sizeof(ppcState.sr)); @@ -179,27 +166,13 @@ void Init(int cpu_core) cpu_core_base = interpreter; break; } - case 1: - { - cpu_core_base = new Jit64(); - break; - } - case 2: - { - cpu_core_base = new JitIL(); - break; - } - default: - { - PanicAlert("Unrecognizable cpu_core: %d", cpu_core); - break; - } + default: + cpu_core_base = JitInterface::InitJitCore(cpu_core); + break; } if (cpu_core_base != interpreter) { - jit = static_cast(cpu_core_base); - jit->Init(); mode = MODE_JIT; } else @@ -213,12 +186,7 @@ void Init(int cpu_core) void Shutdown() { - if (jit) - { - jit->Shutdown(); - delete jit; - jit = NULL; - } + JitInterface::Shutdown(); interpreter->Shutdown(); cpu_core_base = NULL; state = CPU_POWERDOWN; @@ -244,7 +212,7 @@ void SetMode(CoreMode new_mode) case MODE_JIT: // Switching from interpreter to JIT. // Don't really need to do much. It'll work, the cache will refill itself. - cpu_core_base = jit; + cpu_core_base = JitInterface::GetCore(); break; } } diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp index 3636b00717..fc8942f09b 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.cpp +++ b/Source/Core/Core/Src/PowerPC/Profiler.cpp @@ -15,17 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "JitCommon/JitBase.h" - -#include -#include - -#ifdef _WIN32 -#include -#endif - -#include "PPCSymbolDB.h" -#include "FileUtil.h" +#include "JitInterface.h" namespace Profiler { @@ -33,73 +23,9 @@ namespace Profiler bool g_ProfileBlocks; bool g_ProfileInstructions; -struct BlockStat -{ - BlockStat(int bn, u64 c) : blockNum(bn), cost(c) {} - int blockNum; - u64 cost; - - bool operator <(const BlockStat &other) const - { return cost > other.cost; } -}; - void WriteProfileResults(const char *filename) { - std::vector stats; - stats.reserve(jit->GetBlockCache()->GetNumBlocks()); - u64 cost_sum = 0; -#ifdef _WIN32 - u64 timecost_sum = 0; - u64 countsPerSec; - QueryPerformanceFrequency((LARGE_INTEGER *)&countsPerSec); -#endif - for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++) - { - const JitBlock *block = jit->GetBlockCache()->GetBlock(i); - if (block && !block->invalid) - { - // Rough heuristic. Mem instructions should cost more. - u64 cost = block->originalSize * (block->runCount / 4); -#ifdef _WIN32 - u64 timecost = block->ticCounter; -#endif - // Todo: tweak. - if (block->runCount >= 1) - stats.push_back(BlockStat(i, cost)); - cost_sum += cost; -#ifdef _WIN32 - timecost_sum += timecost; -#endif - } - } - - sort(stats.begin(), stats.end()); - File::IOFile f(filename, "w"); - if (!f) - { - PanicAlert("failed to open %s", filename); - return; - } - fprintf(f.GetHandle(), "origAddr\tblkName\tcost\trunCount\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); - for (unsigned int i = 0; i < stats.size(); i++) - { - const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum); - if (block && !block->invalid) - { - std::string name = g_symbolDB.GetDescription(block->originalAddress); - double percent = 100.0 * (double)stats[i].cost / (double)cost_sum; -#ifdef _WIN32 - double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum; - fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, block->runCount, - block->ticCounter, percent, timePercent, - (double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize); -#else - fprintf(f.GetHandle(), "%08x\t%s\t%llu\t???\t%.2lf\t???\t???\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, percent, block->codeSize); -#endif - } - } + JitInterface::WriteProfileResults(filename); } } // namespace diff --git a/Source/Core/Core/Src/PowerPC/Profiler.h b/Source/Core/Core/Src/PowerPC/Profiler.h index ada130e90f..b8beeaae72 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.h +++ b/Source/Core/Core/Src/PowerPC/Profiler.h @@ -57,6 +57,15 @@ #define PROFILER_VPOP #endif +struct BlockStat +{ + BlockStat(int bn, u64 c) : blockNum(bn), cost(c) {} + int blockNum; + u64 cost; + + bool operator <(const BlockStat &other) const + { return cost > other.cost; } +}; namespace Profiler { diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 8ef47467e8..773d757337 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -70,8 +70,8 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; -// Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 8; +// Don't forget to increase this after doing changes on the savestate system +static const u32 STATE_VERSION = 15; struct StateHeader { @@ -196,10 +196,18 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) { if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")) File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")); + if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) + File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")); if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")) Core::DisplayMessage("Failed to move previous state to state undo backup", 1000); + else + File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"); } + if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) + Movie::SaveRecording((filename + ".dtm").c_str()); + else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) + File::Delete(filename + ".dtm"); File::IOFile f(filename, "wb"); if (!f) @@ -273,10 +281,6 @@ void SaveAs(const std::string& filename) if (p.GetMode() == PointerWrap::MODE_WRITE) { Core::DisplayMessage("Saving State...", 1000); - if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) - Movie::SaveRecording((filename + ".dtm").c_str()); - else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) - File::Delete(filename + ".dtm"); CompressAndDumpState_args save_args; save_args.buffer_vector = &g_current_buffer; @@ -383,9 +387,14 @@ void LoadAs(const std::string& filename) g_loadDepth++; // Save temp buffer for undo load state + if (!Movie::IsJustStartingRecordingInputFromSaveState()) { std::lock_guard lk(g_cs_undo_load_buffer); SaveToBuffer(g_undo_load_buffer); + if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) + Movie::SaveRecording("undo.dtm"); + else if (File::Exists("undo.dtm")) + File::Delete("undo.dtm"); } bool loaded = false; @@ -413,7 +422,7 @@ void LoadAs(const std::string& filename) Core::DisplayMessage(StringFromFormat("Loaded state from %s", filename.c_str()).c_str(), 2000); if (File::Exists(filename + ".dtm")) Movie::LoadInput((filename + ".dtm").c_str()); - else if (!Movie::IsJustStartingRecordingInputFromSaveState()) + else if (!Movie::IsJustStartingRecordingInputFromSaveState() && !Movie::IsJustStartingPlayingInputFromSaveState()) Movie::EndPlayInput(false); } else @@ -534,7 +543,16 @@ void UndoLoadState() { std::lock_guard lk(g_cs_undo_load_buffer); if (!g_undo_load_buffer.empty()) - LoadFromBuffer(g_undo_load_buffer); + { + if (File::Exists("undo.dtm") || (!Movie::IsRecordingInput() && !Movie::IsPlayingInput())) + { + LoadFromBuffer(g_undo_load_buffer); + if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) + Movie::LoadInput("undo.dtm"); + } + else + PanicAlert("No undo.dtm found, aborting undo load state to prevent movie desyncs"); + } else PanicAlert("There is nothing to undo!"); } @@ -542,7 +560,7 @@ void UndoLoadState() // Load the state that the last save state overwritten on void UndoSaveState() { - LoadAs((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav").c_str()); + LoadAs((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav").c_str()); } } // namespace State diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp similarity index 96% rename from Source/Core/Core/Src/MemTools.cpp rename to Source/Core/Core/Src/x64MemTools.cpp index bb6fef6439..fff26b3cb3 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/x64MemTools.cpp @@ -52,8 +52,10 @@ #include "MemTools.h" #include "HW/Memmap.h" #include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" +#ifndef _M_GENERIC #include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitBackpatch.h" +#endif #include "x64Analyzer.h" namespace EMM @@ -77,7 +79,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) PVOID codeAddr = pPtrs->ExceptionRecord->ExceptionAddress; unsigned char *codePtr = (unsigned char*)codeAddr; - if (!jit->IsInCodeSpace(codePtr)) { + if (!JitInterface::IsInCodeSpace(codePtr)) { // Let's not prevent debugging. return (DWORD)EXCEPTION_CONTINUE_SEARCH; } @@ -107,7 +109,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) //We could emulate the memory accesses here, but then they would still be around to take up //execution resources. Instead, we backpatch into a generic memory call and retry. - const u8 *new_rip = jit->BackPatch(codePtr, accessType, emAddress, ctx); + const u8 *new_rip = JitInterface::BackPatch(codePtr, accessType, emAddress, ctx); // Rip/Eip needs to be updated. if (new_rip) @@ -182,6 +184,7 @@ void print_trace(const char * msg) void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) { +#ifndef _M_GENERIC if (signal != SIGSEGV) { // We are not interested in other signals - handle it as usual. @@ -203,7 +206,7 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) #else u8 *fault_instruction_ptr = (u8 *)CREG_EIP(ctx); #endif - if (!jit->IsInCodeSpace(fault_instruction_ptr)) { + if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) { // Let's not prevent debugging. return; } @@ -240,6 +243,7 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) CREG_EIP(ctx) = fake_ctx.Eip; #endif } +#endif } void InstallExceptionHandler() diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 6451c73670..2350896c9c 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -27,7 +27,9 @@ #include #else #include +#ifndef ANDROID #include +#endif #include #endif @@ -131,6 +133,9 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] buffer; } } +#else +#ifdef ANDROID + return false; #else if (_src) { @@ -193,6 +198,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] src_buffer_start; iconv_close(conv_desc); } +#endif #endif return returnCode; } diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index 1e5077b352..c4b1aa1385 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -222,7 +222,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type, // u64 size = header.block_size; std::fill(in_buf, in_buf + header.block_size, 0); if (scrubbing) - DiscScrubber::GetNextBlock(inf.GetHandle(), in_buf); + DiscScrubber::GetNextBlock(inf, in_buf); else inf.ReadBytes(in_buf, header.block_size); z_stream z; @@ -296,9 +296,13 @@ bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB ca } CompressedBlobReader* reader = CompressedBlobReader::Create(infile); - if (!reader) return false; + if (!reader) + return false; File::IOFile f(outfile, "wb"); + if (!f) + return false; + const CompressedBlobHeader &header = reader->GetHeader(); u8* buffer = new u8[header.block_size]; int progress_monitor = max(1, header.num_blocks / 100); diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp index 841c8283cc..9ea4a1911d 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.cpp +++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp @@ -127,7 +127,7 @@ bool SetupScrub(const char* filename, int block_size) return success; } -void GetNextBlock(FILE* in, u8* buffer) +void GetNextBlock(File::IOFile& in, u8* buffer) { u64 CurrentOffset = m_BlockCount * m_BlockSize; u64 i = CurrentOffset / CLUSTER_SIZE; @@ -136,12 +136,12 @@ void GetNextBlock(FILE* in, u8* buffer) { DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); std::fill(buffer, buffer + m_BlockSize, 0xFF); - fseeko(in, m_BlockSize, SEEK_CUR); + in.Seek(m_BlockSize, SEEK_CUR); } else { DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); - fread(buffer, m_BlockSize, 1, in); + in.ReadBytes(buffer, m_BlockSize); } m_BlockCount++; diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h index 2b17c7b2f4..d1d053f734 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.h +++ b/Source/Core/DiscIO/Src/DiscScrubber.h @@ -38,7 +38,7 @@ namespace DiscScrubber { bool SetupScrub(const char* filename, int block_size); -void GetNextBlock(FILE* in, u8* buffer); +void GetNextBlock(File::IOFile& in, u8* buffer); void Cleanup(); } // namespace DiscScrubber diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 8f40ab2f18..47651e2f23 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -19,6 +19,7 @@ #include "FileUtil.h" #include +#include #include "FileSystemGCWii.h" #include "StringUtil.h" @@ -95,7 +96,7 @@ bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFi const SFileInfo* pFileInfo = FindFileInfo(_rFullPath); - if (!pFileInfo || pFileInfo->m_FileSize == 0) + if (!pFileInfo) return false; u64 remainingSize = pFileInfo->m_FileSize; @@ -112,22 +113,17 @@ bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFi // Limit read size to 128 MB size_t readSize = (size_t)min(remainingSize, (u64)0x08000000); - u8* buffer = new u8[readSize]; + std::vector buffer(readSize); - result = m_rVolume->Read(fileOffset, readSize, buffer); + result = m_rVolume->Read(fileOffset, readSize, &buffer[0]); if (!result) - { - delete[] buffer; break; - } - f.WriteBytes(buffer, readSize); + f.WriteBytes(&buffer[0], readSize); remainingSize -= readSize; fileOffset += readSize; - - delete[] buffer; } return result; @@ -140,26 +136,24 @@ bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const AppSize += 0x20; // + header size DEBUG_LOG(DISCIO,"AppSize -> %x", AppSize); - u8* buffer = new u8[AppSize]; - if (m_rVolume->Read(0x2440, AppSize, buffer)) + std::vector buffer(AppSize); + if (m_rVolume->Read(0x2440, AppSize, &buffer[0])) { - char exportName[512]; - sprintf(exportName, "%s/apploader.img", _rExportFolder); + std::string exportName(_rExportFolder); + exportName += "/apploader.img"; File::IOFile AppFile(exportName, "wb"); if (AppFile) { - AppFile.WriteBytes(buffer, AppSize); - delete[] buffer; + AppFile.WriteBytes(&buffer[0], AppSize); return true; } } - delete[] buffer; return false; } -bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const +u32 CFileSystemGCWii::GetBootDOLSize() const { u32 DolOffset = Read32(0x420) << m_OffsetShift; u32 DolSize = 0, offset = 0, size = 0; @@ -181,22 +175,34 @@ bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const if (offset + size > DolSize) DolSize = offset + size; } + return DolSize; +} - u8* buffer = new u8[DolSize]; - if (m_rVolume->Read(DolOffset, DolSize, buffer)) +bool CFileSystemGCWii::GetBootDOL(u8* &buffer, u32 DolSize) const +{ + u32 DolOffset = Read32(0x420) << m_OffsetShift; + return m_rVolume->Read(DolOffset, DolSize, buffer); +} + +bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const +{ + u32 DolOffset = Read32(0x420) << m_OffsetShift; + u32 DolSize = GetBootDOLSize(); + + std::vector buffer(DolSize); + if (m_rVolume->Read(DolOffset, DolSize, &buffer[0])) { - char exportName[512]; - sprintf(exportName, "%s/boot.dol", _rExportFolder); + std::string exportName(_rExportFolder); + exportName += "/boot.dol"; + File::IOFile DolFile(exportName, "wb"); if (DolFile) { - DolFile.WriteBytes(buffer, DolSize); - delete[] buffer; + DolFile.WriteBytes(&buffer[0], DolSize); return true; } } - delete[] buffer; return false; } diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h index 38e5f181f9..0e7d836d75 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.h +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h @@ -38,6 +38,8 @@ public: virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename); virtual bool ExportApploader(const char* _rExportFolder) const; virtual bool ExportDOL(const char* _rExportFolder) const; + virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const; + virtual u32 GetBootDOLSize() const; private: bool m_Initialized; diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h index 71be4293e3..8bc98e6a77 100644 --- a/Source/Core/DiscIO/Src/Filesystem.h +++ b/Source/Core/DiscIO/Src/Filesystem.h @@ -57,6 +57,8 @@ public: virtual bool ExportApploader(const char* _rExportFolder) const = 0; virtual bool ExportDOL(const char* _rExportFolder) const = 0; virtual const char* GetFileName(u64 _Address) = 0; + virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const = 0; + virtual u32 GetBootDOLSize() const = 0; virtual const IVolume *GetVolume() const { return m_rVolume; } protected: diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index dc1f44739b..3c00d66be5 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -215,7 +215,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) { std::string TMDFileName(m_Path); - if (File::IsDirectory(TMDFileName)) + if ('/' == *TMDFileName.rbegin()) TMDFileName += "title.tmd"; else m_Path = TMDFileName.substr(0, TMDFileName.find("title.tmd")); diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f8a6f13ecb..557c71c31f 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -43,6 +43,7 @@ public: virtual std::string GetApploaderDate() const = 0; virtual bool SupportsIntegrityCheck() const { return false; } virtual bool CheckIntegrity() const { return false; } + virtual bool IsDiscTwo() const { return false; } enum ECountry { @@ -56,6 +57,7 @@ public: COUNTRY_TAIWAN, COUNTRY_SDK, COUNTRY_UNKNOWN, + COUNTRY_GERMANY, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp index f3389aea42..415af2725a 100644 --- a/Source/Core/DiscIO/Src/VolumeCommon.cpp +++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp @@ -28,10 +28,12 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) // PAL case 'D': // German + return IVolume::COUNTRY_GERMANY; + break; + case 'X': // Used by a couple PAL games case 'Y': // German, french - case 'L': // Japanese import to PAL regions case 'M': // Japanese import to PAL regions case 'S': // Spanish-speaking regions diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp index 51fac285fc..09e2c5eaa9 100644 --- a/Source/Core/DiscIO/Src/VolumeGC.cpp +++ b/Source/Core/DiscIO/Src/VolumeGC.cpp @@ -137,4 +137,11 @@ u64 CVolumeGC::GetSize() const return 0; } +bool CVolumeGC::IsDiscTwo() const +{ + bool discTwo; + Read(6,1, (u8*) &discTwo); + return discTwo; +} + } // namespace diff --git a/Source/Core/DiscIO/Src/VolumeGC.h b/Source/Core/DiscIO/Src/VolumeGC.h index 5fd18ea96a..4221df9493 100644 --- a/Source/Core/DiscIO/Src/VolumeGC.h +++ b/Source/Core/DiscIO/Src/VolumeGC.h @@ -39,6 +39,7 @@ public: std::string GetApploaderDate() const; ECountry GetCountry() const; u64 GetSize() const; + bool IsDiscTwo() const; private: IBlobReader* m_pReader; diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp index 0cdfc85925..2f9f0ef961 100644 --- a/Source/Core/DiscIO/Src/VolumeWad.cpp +++ b/Source/Core/DiscIO/Src/VolumeWad.cpp @@ -129,10 +129,10 @@ bool CVolumeWAD::GetWName(std::vector& _rwNames) const _rwNames.push_back(L""); continue; } - for (int i = 0; i < 42; ++i) + for (int j = 0; j < 42; ++j) { - u16 t = Common::swap16(temp[i]); - if (t == 0 && i > 0) + u16 t = Common::swap16(temp[j]); + if (t == 0 && j > 0) { if (out_temp.at(out_temp.size()-1) != ' ') out_temp.push_back(' '); diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 9a2d7a6804..c3cdccccfc 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -8,16 +8,21 @@ set(LIBS core z sfml-network ${GTK2_LIBRARIES} - ${OPENGL_LIBRARIES} ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) - -if(SDL2_FOUND) - set(LIBS ${LIBS} SDL2) -endif() - -if(SDL_FOUND) - set(LIBS ${LIBS} SDL) +if(NOT ANDROID) + if(SDL2_FOUND) + # Using shared SDL2 + set(LIBS ${LIBS} ${SDL2_LIBRARY}) + else(SDL2_FOUND) + if(SDL_FOUND) + # Using shared SDL + set(LIBS ${LIBS} ${SDL_LIBRARY}) + else(SDL_FOUND) + # Using static SDL from Externals + set(LIBS ${LIBS} SDL) + endif() + endif() endif() if(LIBAV_FOUND) @@ -25,7 +30,8 @@ if(LIBAV_FOUND) endif() if(wxWidgets_FOUND) - set(SRCS Src/ARCodeAddEdit.cpp + set(SRCS + Src/ARCodeAddEdit.cpp Src/AboutDolphin.cpp Src/CheatsWindow.cpp Src/ConfigMain.cpp @@ -73,7 +79,32 @@ if(wxWidgets_FOUND) set(WXLIBS ${wxWidgets_LIBRARIES}) else() - set(SRCS Src/MainNoGUI.cpp) + if(ANDROID) + set(SRCS Src/MainAndroid.cpp) + else() + set(SRCS Src/MainNoGUI.cpp) + endif() +endif() + +if(USE_EGL) + if(NOT ANDROID) + set(SRCS ${SRCS} Src/GLInterface/EGL_X11.cpp + Src/GLInterface/X11_Util.cpp) + endif() +else() + if(WIN32) + set(SRCS ${SRCS} Src/GLInterface/GLW.cpp) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + if(USE_WX) + set(SRCS ${SRCS} Src/GLInterface/WX.cpp) + else() + set(SRCS ${SRCS} Src/GLInterface/AGL.cpp) + endif() + else() + set(SRCS ${SRCS} Src/GLInterface/GLX.cpp + Src/GLInterface/X11_Util.cpp) + + endif() endif() if(WIN32) @@ -101,7 +132,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) else() - set(SRCS ${SRCS} Src/X11Utils.cpp) + if(NOT ANDROID) + set(SRCS ${SRCS} Src/X11Utils.cpp) + endif() endif() if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR @@ -120,72 +153,85 @@ else() set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui) endif() -add_executable(${DOLPHIN_EXE} ${SRCS}) -target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) - -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - include(BundleUtilities) - set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) - - # Ask for an application bundle. - set_target_properties(${DOLPHIN_EXE} PROPERTIES - MACOSX_BUNDLE true - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ) - - # Install Cg framework into application bundle. - copy_resolved_framework_into_bundle( - # Our framework in "Externals" does not have "Versions/Current/" in - # its path; work around the missing directory levels using "././". - "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg" - "${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg" - ) - - # Fix up the bundle after it is finished. - # There does not seem to be an easy way to run CMake commands post-build, - # so we invoke CMake again on a generated script. - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake " - include(BundleUtilities) - message(\"Fixing up application bundle: ${BUNDLE_PATH}\") - fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") - ") - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake - ) - - # Copy data files into application bundle. - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake " - file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User - DESTINATION ${BUNDLE_PATH}/Contents/Resources - ) - file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/*.gmo - ) - foreach(TRANSLATION_FILE \${TRANSLATION_FILES}) - string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR - \${TRANSLATION_FILE} - ) - # It would be better to copy to the new name as a single action, - # but I can't figure out a way to let CMake do that. - file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE} - DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR} - NO_SOURCE_PERMISSIONS - ) - file(RENAME - ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE} - ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo - ) - endforeach(TRANSLATION_FILE) - ") - add_custom_target(CopyDataIntoBundle ALL - COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake - VERBATIM - ) - - # Install bundle into systemwide /Applications directory. - install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications - USE_SOURCE_PERMISSIONS - ) +if(ANDROID) + add_library(${DOLPHIN_EXE} SHARED ${SRCS}) + target_link_libraries(${DOLPHIN_EXE} + log + android + "-Wl,--whole-archive" + ${LIBS} + "-Wl,--no-whole-archive" + ) else() - install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) + add_executable(${DOLPHIN_EXE} ${SRCS}) + target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(BundleUtilities) + set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) + + # Ask for an application bundle. + set_target_properties(${DOLPHIN_EXE} PROPERTIES + MACOSX_BUNDLE true + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in + ) + + # Install Cg framework into application bundle. + copy_resolved_framework_into_bundle( + # Our framework in "Externals" does not have "Versions/Current/" in + # its path; work around the missing directory levels using "././". + "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg" + "${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg" + ) + + # Fix up the bundle after it is finished. + # There does not seem to be an easy way to run CMake commands post-build, + # so we invoke CMake again on a generated script. + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake " + include(BundleUtilities) + message(\"Fixing up application bundle: ${BUNDLE_PATH}\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") + ") + add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD + COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake + ) + + # Copy data files into application bundle. + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake " + file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User + DESTINATION ${BUNDLE_PATH}/Contents/Resources + ) + file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/*.gmo + ) + foreach(TRANSLATION_FILE \${TRANSLATION_FILES}) + string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR + \${TRANSLATION_FILE} + ) + # It would be better to copy to the new name as a single action, + # but I can't figure out a way to let CMake do that. + file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE} + DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR} + NO_SOURCE_PERMISSIONS + ) + file(RENAME + ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE} + ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo + ) + endforeach(TRANSLATION_FILE) + ") + add_custom_target(CopyDataIntoBundle ALL + COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake + VERBATIM + ) + + # Install bundle into systemwide /Applications directory. + install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications + USE_SOURCE_PERMISSIONS + ) + else() + install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) + endif() endif() + +set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 72c40a3db4..cde306855b 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,13 +130,14 @@ - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -144,13 +145,14 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -158,7 +160,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -167,6 +169,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -174,13 +177,14 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -188,7 +192,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -197,20 +201,24 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) + + - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -265,6 +273,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + Create Create @@ -326,6 +335,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + @@ -387,4 +399,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + diff --git a/Source/Core/DolphinWX/DolphinWX.rc b/Source/Core/DolphinWX/DolphinWX.rc index e9c06a8fa9..550e08c35a 100644 --- a/Source/Core/DolphinWX/DolphinWX.rc +++ b/Source/Core/DolphinWX/DolphinWX.rc @@ -2,3 +2,7 @@ // #include "resource.h" IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" +"dolphin" ICON "..\\..\\..\\Installer\\Dolphin.ico" +#define wxUSE_NO_MANIFEST 1 +#include + diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index d13c12ee7f..5e1825b6ae 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -31,7 +31,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxBitmap(iDolphinLogo)); std::string Text = "Dolphin " SCM_DESC_STR "\n" - "Copyright (c) 2003-2011+ Dolphin Team\n" + "Copyright (c) 2003-2013+ Dolphin Team\n" "\n" "Branch: " SCM_BRANCH_STR "\n" "Revision: " SCM_REV_STR "\n" diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index eb25117533..63ddced86b 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -25,8 +25,6 @@ #include "HW/Memmap.h" #include "Frame.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY 256 extern std::vector arCodes; @@ -36,7 +34,7 @@ extern CFrame* main_frame; static wxCheatsWindow *g_cheat_window; wxCheatsWindow::wxCheatsWindow(wxWindow* const parent) - : wxDialog(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxDIALOG_NO_PARENT) { ::g_cheat_window = this; @@ -57,6 +55,7 @@ wxCheatsWindow::wxCheatsWindow(wxWindow* const parent) } } + SetSize(wxSize(-1, 600)); Center(); Show(); } @@ -79,8 +78,8 @@ void wxCheatsWindow::Init_ChildControls() m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_CheckListBox_CheatsList = new wxCheckListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_CheatStringList, wxLB_HSCROLL, wxDefaultValidator); - _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemSelected, wxEVT_COMMAND_LISTBOX_SELECTED, this); - _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemToggled, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this); + m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this); m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize); m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize); @@ -106,10 +105,10 @@ void wxCheatsWindow::Init_ChildControls() m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update")); - _connect_macro_(button_updatelog, wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_updatelog->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this); m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging")); - _connect_macro_(m_CheckBox_LogAR, wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_CheckBox_LogAR->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this); m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging()); m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); @@ -133,11 +132,11 @@ void wxCheatsWindow::Init_ChildControls() // Button Strip wxButton* const button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize); - _connect_macro_(button_apply, wxCheatsWindow::OnEvent_ApplyChanges_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this); wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize); - _connect_macro_(button_cancel, wxCheatsWindow::OnEvent_ButtonClose_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxCheatsWindow::OnEvent_Close), (wxObject*)0, this); + Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this); wxStdDialogButtonSizer* const sButtons = new wxStdDialogButtonSizer(); sButtons->AddButton(button_apply); @@ -159,11 +158,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) { // first scan button btnInitScan = new wxButton(this, -1, _("New Scan")); - _connect_macro_(btnInitScan, CheatSearchTab::StartNewSearch, wxEVT_COMMAND_BUTTON_CLICKED, this); + btnInitScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::StartNewSearch, this); // next scan button btnNextScan = new wxButton(this, -1, _("Next Scan")); - _connect_macro_(btnNextScan, CheatSearchTab::FilterCheatSearchResults, wxEVT_COMMAND_BUTTON_CLICKED, this); + btnNextScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::FilterCheatSearchResults, this); btnNextScan->Disable(); // data size radio buttons @@ -184,7 +183,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) // create AR code button wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code")); - _connect_macro_(button_cheat_search_copy_address, CheatSearchTab::CreateARCode, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_cheat_search_copy_address->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::CreateARCode, this); // results groupbox wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results")); @@ -199,7 +198,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) // search value textbox textctrl_value_x = new wxTextCtrl(this, -1, wxT("0x0"), wxDefaultPosition, wxSize(96,-1)); - _connect_macro_(textctrl_value_x, CheatSearchTab::ApplyFocus, wxEVT_SET_FOCUS, this); + textctrl_value_x->Bind(wxEVT_SET_FOCUS, &CheatSearchTab::ApplyFocus, this); wxBoxSizer* const sizer_cheat_filter_text = new wxBoxSizer(wxHORIZONTAL); sizer_cheat_filter_text->Add(value_x_radiobtn.rad_uservalue, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); @@ -494,7 +493,7 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&) UpdateCheatSearchResultsList(); } -void CheatSearchTab::ApplyFocus(wxCommandEvent& ev) +void CheatSearchTab::ApplyFocus(wxEvent& ev) { ev.Skip(true); value_x_radiobtn.rad_uservalue->SetValue(true); @@ -589,9 +588,9 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address) sizer_main->Add(textctrl_value, 0, wxALL, 5); sizer_main->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxALL, 5); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CreateCodeDialog::PressOK)); - Connect(wxID_CANCEL, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CreateCodeDialog::PressCancel)); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CreateCodeDialog::OnEvent_Close), (wxObject*)0, this); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressOK, this, wxID_OK); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressCancel, this, wxID_CANCEL); + Bind(wxEVT_CLOSE_WINDOW, &CreateCodeDialog::OnEvent_Close, this); SetSizerAndFit(sizer_main); SetFocus(); diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h index 9d44e878f3..f1acc1c118 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.h +++ b/Source/Core/DolphinWX/Src/CheatsWindow.h @@ -99,7 +99,7 @@ protected: void StartNewSearch(wxCommandEvent& event); void FilterCheatSearchResults(wxCommandEvent& event); void CreateARCode(wxCommandEvent&); - void ApplyFocus(wxCommandEvent&); + void ApplyFocus(wxEvent&); }; class wxCheatsWindow : public wxDialog diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 2534c4a9db..dc044afe09 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -17,10 +17,12 @@ #include // System #include +#include #include #include "Common.h" #include "CommonPaths.h" +#include "FileSearch.h" #include "Core.h" // Core #include "HW/EXI.h" @@ -40,6 +42,14 @@ #include "Main.h" #include "VideoBackendBase.h" +#if defined(__APPLE__) +#include +using std::tr1::function; +#else +#include +using std::function; +#endif + #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) extern CFrame* main_frame; @@ -79,6 +89,7 @@ static const wxLanguage langIds[] = #define DEV_DUMMY_STR _trans("Dummy") #define SIDEV_STDCONT_STR _trans("Standard Controller") +#define SIDEV_STEERING_STR _trans("Steering Wheel") #define SIDEV_BONGO_STR _trans("TaruKonga (Bongos)") #define SIDEV_GBA_STR "GBA" #define SIDEV_AM_BB_STR _trans("AM-Baseboard") @@ -111,7 +122,6 @@ EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged) EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged) -EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged) @@ -119,13 +129,13 @@ EVT_RADIOBOX(ID_DSPENGINE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DUMP_AUDIO, CConfigMain::AudioSettingsChanged) -EVT_CHOICE(ID_FREQUENCY, CConfigMain::AudioSettingsChanged) +EVT_CHECKBOX(ID_DPL2DECODER, CConfigMain::AudioSettingsChanged) EVT_CHOICE(ID_BACKEND, CConfigMain::AudioSettingsChanged) EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged) -EVT_RADIOBOX(ID_INTERFACE_THEME, CConfigMain::DisplaySettingsChanged) +EVT_CHECKBOX(ID_INTERFACE_ONSCREENDISPLAYMESSAGES, CConfigMain::DisplaySettingsChanged) EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::DisplaySettingsChanged) EVT_BUTTON(ID_HOTKEY_CONFIG, CConfigMain::DisplaySettingsChanged) @@ -209,12 +219,13 @@ void CConfigMain::UpdateGUI() EnableCheats->Disable(); CPUEngine->Disable(); - LockThreads->Disable(); _NTSCJ->Disable(); // Disable stuff on AudioPage DSPEngine->Disable(); DSPThread->Disable(); + DPL2Decoder->Disable(); + Latency->Disable(); // Disable stuff on GamecubePage GCSystemLang->Disable(); @@ -251,14 +262,6 @@ void CConfigMain::InitializeGUILists() arrayStringFor_DSPEngine.Add(_("DSP LLE recompiler")); arrayStringFor_DSPEngine.Add(_("DSP LLE interpreter (slow)")); - - // Display page - // Themes - arrayStringFor_Themes.Add(wxT("Boomy")); - arrayStringFor_Themes.Add(wxT("Vista")); - arrayStringFor_Themes.Add(wxT("X-Plastik")); - arrayStringFor_Themes.Add(wxT("KDE")); - // Gamecube page // GC Language arrayStrings arrayStringFor_GCSystemLang.Add(_("English")); @@ -318,9 +321,6 @@ void CConfigMain::InitializeGUIValues() { const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter; - // Load DSP Settings. - ac_Config.Load(); - // General - Basic CPUThread->SetValue(startup_params.bCPUThread); SkipIdle->SetValue(startup_params.bSkipIdle); @@ -330,14 +330,13 @@ void CConfigMain::InitializeGUIValues() // General - Advanced CPUEngine->SetSelection(startup_params.iCPUCore); - LockThreads->SetValue(startup_params.bLockThreads); _NTSCJ->SetValue(startup_params.bForceNTSCJ); // Display - Interface ConfirmStop->SetValue(startup_params.bConfirmStop); UsePanicHandlers->SetValue(startup_params.bUsePanicHandlers); - Theme->SetSelection(startup_params.iTheme); + OnScreenDisplayMessages->SetValue(startup_params.bOnScreenDisplayMessages); // need redesign for (unsigned int i = 0; i < sizeof(langIds) / sizeof(wxLanguage); i++) { @@ -352,16 +351,18 @@ void CConfigMain::InitializeGUIValues() if (startup_params.bDSPHLE) DSPEngine->SetSelection(0); else - DSPEngine->SetSelection(ac_Config.m_EnableJIT ? 1 : 2); + DSPEngine->SetSelection(SConfig::GetInstance().m_EnableJIT ? 1 : 2); // Audio - VolumeSlider->Enable(SupportsVolumeChanges(ac_Config.sBackend)); - VolumeSlider->SetValue(ac_Config.m_Volume); - VolumeText->SetLabel(wxString::Format(wxT("%d %%"), ac_Config.m_Volume)); + VolumeSlider->Enable(SupportsVolumeChanges(SConfig::GetInstance().sBackend)); + VolumeSlider->SetValue(SConfig::GetInstance().m_Volume); + VolumeText->SetLabel(wxString::Format(wxT("%d %%"), SConfig::GetInstance().m_Volume)); DSPThread->SetValue(startup_params.bDSPThread); - DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); - FrequencySelection->SetSelection( - FrequencySelection->FindString(wxString::Format(_("%d Hz"), ac_Config.iFrequency))); + DumpAudio->SetValue(SConfig::GetInstance().m_DumpAudio ? true : false); + DPL2Decoder->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL); + DPL2Decoder->SetValue(startup_params.bDPL2Decoder); + Latency->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL); + Latency->SetValue(startup_params.iLatency); // add backends to the list AddAudioBackends(); @@ -389,6 +390,7 @@ void CConfigMain::InitializeGUIValues() wxArrayString SIDevices; SIDevices.Add(_(DEV_NONE_STR)); SIDevices.Add(_(SIDEV_STDCONT_STR)); + SIDevices.Add(_(SIDEV_STEERING_STR)); SIDevices.Add(_(SIDEV_BONGO_STR)); SIDevices.Add(_(SIDEV_GBA_STR)); SIDevices.Add(_(SIDEV_AM_BB_STR)); @@ -441,15 +443,18 @@ void CConfigMain::InitializeGUIValues() case SIDEVICE_GC_CONTROLLER: GCSIDevice[i]->SetStringSelection(SIDevices[1]); break; - case SIDEVICE_GC_TARUKONGA: + case SIDEVICE_GC_STEERING: GCSIDevice[i]->SetStringSelection(SIDevices[2]); break; - case SIDEVICE_GC_GBA: + case SIDEVICE_GC_TARUKONGA: GCSIDevice[i]->SetStringSelection(SIDevices[3]); break; - case SIDEVICE_AM_BASEBOARD: + case SIDEVICE_GC_GBA: GCSIDevice[i]->SetStringSelection(SIDevices[4]); break; + case SIDEVICE_AM_BASEBOARD: + GCSIDevice[i]->SetStringSelection(SIDevices[5]); + break; default: GCSIDevice[i]->SetStringSelection(SIDevices[0]); break; @@ -489,19 +494,13 @@ void CConfigMain::InitializeGUITooltips() // Display - Interface ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); - UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); - - // Display - Themes: Copyright notice - Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]")); - Theme->SetItemToolTip(1, _("Created by VistaIcons.com")); - Theme->SetItemToolTip(2, _("Created by black_rider and published on ForumW.org > Web Developments")); - Theme->SetItemToolTip(3, _("Created by KDE-Look.org")); + UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occurred.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); + OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); // Audio tooltips DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended).")); - FrequencySelection->SetToolTip(_("Changing this will have no effect while the emulator is running!")); BackendSelection->SetToolTip(_("Changing this will have no effect while the emulator is running!")); // Gamecube - Devices @@ -509,6 +508,16 @@ void CConfigMain::InitializeGUITooltips() // Wii - Devices WiiKeyboard->SetToolTip(_("This could cause slow down in Wii Menu and some games.")); + +#if defined(__APPLE__) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX.")); +#elif defined(__linux__) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only.")); +#elif defined(_WIN32) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work.")); +#endif + + Latency->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only.")); } void CConfigMain::CreateGUIControls() @@ -541,7 +550,6 @@ void CConfigMain::CreateGUIControls() UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Limit by FPS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); - LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock Threads to Cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Populate the General settings @@ -557,7 +565,6 @@ void CConfigMain::CreateGUIControls() wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); sbAdvanced->Add(CPUEngine, 0, wxALL, 5); - sbAdvanced->Add(LockThreads, 0, wxALL, 5); sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); @@ -571,26 +578,62 @@ void CConfigMain::CreateGUIControls() // Hotkey configuration HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); - // Themes - this should really be a wxChoice... - Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, _("Theme"), - wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS); // Interface settings ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, _("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + OnScreenDisplayMessages = new wxCheckBox(DisplayPage, ID_INTERFACE_ONSCREENDISPLAYMESSAGES, + _("On-Screen Display Messages"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL); sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->AddStretchSpacer(); sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5); + + // theme selection + auto const theme_selection = new wxChoice(DisplayPage, wxID_ANY); + + CFileSearch::XStringVector theme_dirs; + theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX)); +#if !defined(_WIN32) + theme_dirs.push_back(SHARED_USER_DIR THEMES_DIR); +#endif + + CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs); + auto const& sv = cfs.GetFileNames(); + std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename) + { + std::string name, ext; + SplitPath(filename, NULL, &name, &ext); + + name += ext; + if (-1 == theme_selection->FindString(name)) + theme_selection->Append(name); + }); + + theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name); + + // std::function = avoid error on msvc + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([theme_selection](wxEvent&) + { + SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); + main_frame->InitBitmaps(); + main_frame->UpdateGameList(); + })); + + auto const scInterface = new wxBoxSizer(wxHORIZONTAL); + scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->Add(theme_selection, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->AddStretchSpacer(); + sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); - sbInterface->Add(Theme, 0, wxEXPAND | wxALL, 5); + sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5); + sbInterface->Add(scInterface, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5); - sDisplayPage = new wxBoxSizer(wxVERTICAL); sDisplayPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5); DisplayPage->SetSizer(sDisplayPage); @@ -602,21 +645,31 @@ void CConfigMain::CreateGUIControls() DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSP LLE on Thread")); DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder")); VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0); BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); - FrequencySelection = new wxChoice(AudioPage, ID_FREQUENCY); - FrequencySelection->Append(wxString::Format(_("%d Hz"), 48000)); - FrequencySelection->Append(wxString::Format(_("%d Hz"), 32000)); + Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, + wxSP_ARROW_KEYS, 0, 30); + + Latency->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &CConfigMain::AudioSettingsChanged, this); + + if (Core::GetState() != Core::CORE_UNINITIALIZED) + { + Latency->Disable(); + BackendSelection->Disable(); + DPL2Decoder->Disable(); + } // Create sizer and add items to dialog wxStaticBoxSizer *sbAudioSettings = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Sound Settings")); sbAudioSettings->Add(DSPEngine, 0, wxALL | wxEXPAND, 5); sbAudioSettings->Add(DSPThread, 0, wxALL, 5); sbAudioSettings->Add(DumpAudio, 0, wxALL, 5); + sbAudioSettings->Add(DPL2Decoder, 0, wxALL, 5); wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume")); sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13); @@ -625,8 +678,8 @@ void CConfigMain::CreateGUIControls() wxGridBagSizer *sBackend = new wxGridBagSizer(); sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); - sBackend->Add(TEXT_BOX(AudioPage, _("Sample Rate:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); - sBackend->Add(FrequencySelection, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sBackend->Add(Latency, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings")); sbBackend->Add(sBackend, 0, wxEXPAND); @@ -809,9 +862,6 @@ void CConfigMain::OnOk(wxCommandEvent& WXUNUSED (event)) // Save the config. Dolphin crashes to often to save the settings on closing only SConfig::GetInstance().SaveSettings(); - - // Save Audio settings - ac_Config.SaveSettings(); } // Core settings @@ -831,7 +881,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) break; case ID_FRAMELIMIT: SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection(); - ac_Config.Update(); + AudioCommon::UpdateSoundStream(); break; case ID_FRAMELIMIT_USEFPSFORLIMITING: SConfig::GetInstance().b_UseFPS = UseFPSForLimiting->IsChecked(); @@ -843,9 +893,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true); break; - case ID_LOCKTHREADS: - SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads = LockThreads->IsChecked(); - break; case ID_NTSCJ: SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked(); break; @@ -865,9 +912,9 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers = UsePanicHandlers->IsChecked(); SetEnableAlert(UsePanicHandlers->IsChecked()); break; - case ID_INTERFACE_THEME: - SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme = Theme->GetSelection(); - main_frame->InitBitmaps(); + case ID_INTERFACE_ONSCREENDISPLAYMESSAGES: + SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = OnScreenDisplayMessages->IsChecked(); + SetEnableAlert(OnScreenDisplayMessages->IsChecked()); break; case ID_INTERFACE_LANG: if (SConfig::GetInstance().m_InterfaceLanguage != langIds[InterfaceLang->GetSelection()]) @@ -891,13 +938,14 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) { case ID_DSPENGINE: SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = DSPEngine->GetSelection() == 0; - ac_Config.m_EnableJIT = DSPEngine->GetSelection() == 1; - ac_Config.Update(); + if (!DSPEngine->GetSelection() == 0) + SConfig::GetInstance().m_EnableJIT = DSPEngine->GetSelection() == 1; + AudioCommon::UpdateSoundStream(); break; case ID_VOLUME: - ac_Config.m_Volume = VolumeSlider->GetValue(); - ac_Config.Update(); + SConfig::GetInstance().m_Volume = VolumeSlider->GetValue(); + AudioCommon::UpdateSoundStream(); VolumeText->SetLabel(wxString::Format(wxT("%d %%"), VolumeSlider->GetValue())); break; @@ -905,19 +953,24 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = DSPThread->IsChecked(); break; + case ID_DPL2DECODER: + SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder = DPL2Decoder->IsChecked(); + break; + case ID_BACKEND: VolumeSlider->Enable(SupportsVolumeChanges(std::string(BackendSelection->GetStringSelection().mb_str()))); - ac_Config.sBackend = BackendSelection->GetStringSelection().mb_str(); - ac_Config.Update(); + Latency->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); + DPL2Decoder->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); + SConfig::GetInstance().sBackend = BackendSelection->GetStringSelection().mb_str(); + AudioCommon::UpdateSoundStream(); + break; + + case ID_LATENCY: + SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = Latency->GetValue(); break; default: - ac_Config.m_DumpAudio = DumpAudio->GetValue(); - - long int frequency; - FrequencySelection->GetStringSelection().ToLong(&frequency); - ac_Config.iFrequency = frequency; - ac_Config.Update(); + SConfig::GetInstance().m_DumpAudio = DumpAudio->GetValue(); break; } } @@ -931,7 +984,7 @@ void CConfigMain::AddAudioBackends() { BackendSelection->Append(wxString::FromAscii((*iter).c_str())); int num = BackendSelection->\ - FindString(wxString::FromAscii(ac_Config.sBackend.c_str())); + FindString(wxString::FromAscii(SConfig::GetInstance().sBackend.c_str())); BackendSelection->SetSelection(num); } } @@ -944,8 +997,7 @@ bool CConfigMain::SupportsVolumeChanges(std::string backend) return (backend == BACKEND_DIRECTSOUND || backend == BACKEND_COREAUDIO || backend == BACKEND_OPENAL || - backend == BACKEND_XAUDIO2 || - backend == BACKEND_PULSEAUDIO); + backend == BACKEND_XAUDIO2); } @@ -1013,6 +1065,13 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) return; } } + #ifdef _WIN32 + if (!strncmp(File::GetExeDirectory().c_str(), filename.c_str(), File::GetExeDirectory().size())) + { + filename.erase(0, File::GetExeDirectory().size() +1); + filename = "./" + filename; + } + #endif // also check that the path isn't used for the other memcard... if (filename.compare(isSlotA ? SConfig::GetInstance().m_strMemoryCardB @@ -1042,6 +1101,8 @@ void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum) SIDevices tempType; if (!deviceName.compare(WXSTR_TRANS(SIDEV_STDCONT_STR))) tempType = SIDEVICE_GC_CONTROLLER; + else if (!deviceName.compare(WXSTR_TRANS(SIDEV_STEERING_STR))) + tempType = SIDEVICE_GC_STEERING; else if (!deviceName.compare(WXSTR_TRANS(SIDEV_BONGO_STR))) tempType = SIDEVICE_GC_TARUKONGA; else if (!deviceName.compare(wxT(SIDEV_GBA_STR))) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index eae9f8996d..4f8820e01b 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -69,7 +69,6 @@ private: ID_FRAMELIMIT_USEFPSFORLIMITING, ID_CPUENGINE, - ID_LOCKTHREADS, ID_DSPTHREAD, ID_NTSCJ, @@ -79,14 +78,15 @@ private: ID_ENABLE_HLE_AUDIO, ID_ENABLE_THROTTLE, ID_DUMP_AUDIO, - ID_FREQUENCY, + ID_DPL2DECODER, + ID_LATENCY, ID_BACKEND, ID_VOLUME, // Interface settings ID_INTERFACE_CONFIRMSTOP, ID_INTERFACE_USEPANICHANDLERS, - ID_INTERFACE_THEME, + ID_INTERFACE_ONSCREENDISPLAYMESSAGES, ID_INTERFACE_LANG, ID_HOTKEY_CONFIG, @@ -142,7 +142,6 @@ private: wxCheckBox* EnableOpenCL; wxRadioBox* CPUEngine; wxCheckBox* DSPThread; - wxCheckBox* LockThreads; wxCheckBox* _NTSCJ; @@ -154,16 +153,17 @@ private: wxBoxSizer* sAudioPage; // GC settings wxRadioBox* DSPEngine; wxSlider* VolumeSlider; - wxStaticText* VolumeText; + wxStaticText* VolumeText; wxCheckBox* DumpAudio; + wxCheckBox* DPL2Decoder; wxArrayString wxArrayBackends; wxChoice* BackendSelection; - wxChoice* FrequencySelection; + wxSpinCtrl* Latency; // Interface wxCheckBox* ConfirmStop; wxCheckBox* UsePanicHandlers; - wxRadioBox* Theme; + wxCheckBox* OnScreenDisplayMessages; wxChoice* InterfaceLang; wxButton* HotkeyConfig; @@ -225,7 +225,6 @@ private: wxArrayString arrayStringFor_CPUEngine; wxArrayString arrayStringFor_DSPEngine; wxArrayString arrayStringFor_FullscreenResolution; - wxArrayString arrayStringFor_Themes; wxArrayString arrayStringFor_InterfaceLang; wxArrayString arrayStringFor_GCSystemLang; wxArrayString arrayStringFor_WiiSensBarPos; diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp index 7d40e820f2..35f957d71a 100644 --- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp @@ -31,13 +31,10 @@ extern "C" { #include "../../resources/toolbar_debugger_delete.c" } -#define _connect_macro_(id, handler) \ - Connect(id, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(handler), (wxObject*)0, (wxEvtHandler*)parent) - class CBreakPointBar : public wxAuiToolBar { public: - CBreakPointBar(wxWindow* parent, const wxWindowID id) + CBreakPointBar(CBreakPointWindow* parent, const wxWindowID id) : wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT) { @@ -51,26 +48,26 @@ public: wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24)); AddTool(ID_DELETE, wxT("Delete"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_DELETE, CBreakPointWindow::OnDelete); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnDelete, parent, ID_DELETE); AddTool(ID_CLEAR, wxT("Clear"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_CLEAR, CBreakPointWindow::OnClear); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnClear, parent, ID_CLEAR); AddTool(ID_ADDBP, wxT("+BP"), m_Bitmaps[Toolbar_Add_BP]); - _connect_macro_(ID_ADDBP, CBreakPointWindow::OnAddBreakPoint); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP); // Add memory breakpoints if you can use them if (Memory::AreMemoryBreakpointsActivated()) { AddTool(ID_ADDMC, wxT("+MC"), m_Bitmaps[Toolbar_Add_MC]); - _connect_macro_(ID_ADDMC, CBreakPointWindow::OnAddMemoryCheck); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC); } AddTool(ID_LOAD, wxT("Load"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_LOAD, CBreakPointWindow::LoadAll); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::LoadAll, parent, ID_LOAD); AddTool(ID_SAVE, wxT("Save"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_SAVE, CBreakPointWindow::Event_SaveAll); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE); } private: diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 0b6b366c88..601faeaec6 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -38,6 +38,7 @@ #include "LogManager.h" #include "HW/CPU.h" #include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" #include "Debugger/PPCDebugInterface.h" #include "Debugger/Debugger_SymbolMap.h" #include "PowerPC/PPCAnalyst.h" @@ -45,17 +46,12 @@ #include "PowerPC/PPCSymbolDB.h" #include "PowerPC/SignatureDB.h" #include "PowerPC/PPCTables.h" -#include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitCache.h" // for ClearCache() #include "ConfigManager.h" extern "C" // Bitmaps { - #include "../../resources/toolbar_play.c" - #include "../../resources/toolbar_pause.c" #include "../../resources/toolbar_add_memorycheck.c" - #include "../../resources/toolbar_debugger_delete.c" #include "../../resources/toolbar_add_breakpoint.c" } @@ -263,8 +259,7 @@ void CCodeWindow::SingleStep() { if (CCPU::IsStepping()) { - if (jit) - jit->GetBlockCache()->InvalidateICache(PC, 4); + JitInterface::InvalidateICache(PC, 4); CCPU::StepOpcode(&sync_event); wxThread::Sleep(20); // need a short wait here @@ -319,7 +314,7 @@ void CCodeWindow::UpdateLists() { int idx = callers->Append(wxString::FromAscii(StringFromFormat ("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str())); - callers->SetClientData(idx, (void*)caller_addr); + callers->SetClientData(idx, (void*)(u64)caller_addr); } } @@ -332,7 +327,7 @@ void CCodeWindow::UpdateLists() { int idx = calls->Append(wxString::FromAscii(StringFromFormat ("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str())); - calls->SetClientData(idx, (void*)call_addr); + calls->SetClientData(idx, (void*)(u64)call_addr); } } } @@ -495,10 +490,8 @@ void CCodeWindow::OnCPUMode(wxCommandEvent& event) } // Clear the JIT cache to enable these changes - if (jit) - { - jit->ClearCache(); - } + JitInterface::ClearCache(); + // Update UpdateButtonStates(); } @@ -512,7 +505,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event) break; case IDM_CLEARCODECACHE: - jit->ClearCache(); + JitInterface::ClearCache(); break; case IDM_SEARCHINSTRUCTION: @@ -563,23 +556,21 @@ bool CCodeWindow::JITBlockLinking() void CCodeWindow::InitBitmaps() { // load original size 48x48 - m_Bitmaps[Toolbar_DebugGo] = wxGetBitmapFromMemory(toolbar_play_png); m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png); m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_DebugPause] = wxGetBitmapFromMemory(toolbar_pause_png); // scale to 24x24 for toolbar - for (size_t n = Toolbar_DebugGo; n < ToolbarDebugBitmapMax; n++) + for (size_t n = 0; n < ToolbarDebugBitmapMax; n++) m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); } void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) { - int w = m_Bitmaps[Toolbar_DebugGo].GetWidth(), - h = m_Bitmaps[Toolbar_DebugGo].GetHeight(); + int w = m_Bitmaps[0].GetWidth(), + h = m_Bitmaps[0].GetHeight(); toolBar->SetToolBitmapSize(wxSize(w, h)); toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]); diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index 05915ecd20..706b398dce 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -54,15 +54,6 @@ #include "ConfigManager.h" -extern "C" // Bitmaps -{ - #include "../../resources/toolbar_play.c" - #include "../../resources/toolbar_pause.c" - #include "../../resources/toolbar_add_memorycheck.c" - #include "../../resources/toolbar_debugger_delete.c" - #include "../../resources/toolbar_add_breakpoint.c" -} - // Save and load settings // ----------------------------- void CCodeWindow::Load() diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp index cec986ad90..a4591d3994 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp @@ -139,7 +139,7 @@ void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event) if (DSPCore_GetState() == DSPCORE_STEPPING) { DSPCore_Step(); - Refresh(); + Update(); } break; @@ -155,10 +155,10 @@ void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event) void Host_RefreshDSPDebuggerWindow() { if (m_DebuggerFrame) - m_DebuggerFrame->Refresh(); + m_DebuggerFrame->Update(); } -void DSPDebuggerLLE::Refresh() +void DSPDebuggerLLE::Update() { #if defined __WXGTK__ if (!wxIsMainThread()) diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h index 95bd3b4286..0e4feccef2 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h @@ -50,7 +50,7 @@ public: DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); virtual ~DSPDebuggerLLE(); - void Refresh(); + void Update(); private: DECLARE_EVENT_TABLE(); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index cb467389ee..81268e3467 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -22,7 +22,12 @@ #include "FifoPlayer/FifoPlayer.h" #include "FifoPlayer/FifoRecorder.h" #include "OpcodeDecoding.h" + #include +#include + +#include +#include DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) @@ -51,24 +56,24 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) : FifoPlayerDlg::~FifoPlayerDlg() { - Disconnect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); - Disconnect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); + Unbind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this); + Unbind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this); // Disconnect Events - Disconnect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint), NULL, this); - m_FrameFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this); - m_FrameToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this); - m_ObjectFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this); - m_ObjectToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectTo), NULL, this); - m_EarlyMemoryUpdates->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCheckEarlyMemoryUpdates), NULL, this); - m_RecordStop->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnRecordStop), NULL, this); - m_Save->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnSaveFile), NULL, this); - m_FramesToRecordCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); - m_Close->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + Unbind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this); + m_FrameFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this); + m_FrameToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this); + m_ObjectFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this); + m_ObjectToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this); + m_EarlyMemoryUpdates->Unbind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this); + m_RecordStop->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this); + m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this); + m_FramesToRecordCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this); + m_Close->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this); - m_framesList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); - m_objectsList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); - m_objectCmdList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + m_framesList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this); + m_objectsList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this); + m_objectCmdList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this); FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL); @@ -301,30 +306,37 @@ void FifoPlayerDlg::CreateGUIControls() Center(wxBOTH); // Connect Events - Connect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint)); - m_FrameFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this); - m_FrameToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this); - m_ObjectFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this); - m_ObjectToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectTo), NULL, this); - m_EarlyMemoryUpdates->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCheckEarlyMemoryUpdates), NULL, this); - m_RecordStop->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnRecordStop), NULL, this); - m_Save->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnSaveFile), NULL, this); - m_FramesToRecordCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); - Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + Bind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this); + m_FrameFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this); + m_FrameToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this); + m_ObjectFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this); + m_ObjectToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this); + m_EarlyMemoryUpdates->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this); + m_RecordStop->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this); + m_Save->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this); + m_FramesToRecordCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this); - m_framesList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); - m_objectsList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); - m_objectCmdList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + m_framesList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this); + m_objectsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this); + m_objectCmdList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this); - m_beginSearch->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); - m_findNext->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindNextClick), NULL, this); - m_findPrevious->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindPreviousClick), NULL, this); + m_beginSearch->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnBeginSearch, this); + m_findNext->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindNextClick, this); + m_findPrevious->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindPreviousClick, this); - m_searchField->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); - m_searchField->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(FifoPlayerDlg::OnSearchFieldTextChanged), NULL, this); + m_searchField->Bind(wxEVT_COMMAND_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this); + m_searchField->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FifoPlayerDlg::OnSearchFieldTextChanged, this); - Connect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); - Connect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); + // Setup command copying + wxAcceleratorEntry entry; + entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY); + wxAcceleratorTable accel(1, &entry); + m_objectCmdList->SetAcceleratorTable(accel); + m_objectCmdList->Bind(wxEVT_COMMAND_MENU_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY); + + Bind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this); + Bind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this); Show(); } @@ -432,26 +444,22 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) return; } - unsigned int val_length = str_search_val.Length() / 2; - u8* search_val = new u8[val_length]; + unsigned int const val_length = str_search_val.Length() / 2; + std::vector search_val(val_length); for (unsigned int i = 0; i < val_length; ++i) { wxString char_str = str_search_val.Mid(2*i, 2); - unsigned long val; + unsigned long val = 0; if (!char_str.ToULong(&val, 16)) { m_numResultsText->SetLabel(_("Invalid search string (couldn't convert to number)")); - delete[] search_val; return; } search_val[i] = (u8)val; } search_results.clear(); - u8* start_ptr; - u8* end_ptr; - - int frame_idx = m_framesList->GetSelection(); + int const frame_idx = m_framesList->GetSelection(); FifoPlayer& player = FifoPlayer::GetInstance(); const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx); @@ -464,18 +472,18 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)")); return; } - start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; - end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]]; - for (u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr) + const u8* const start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; + const u8* const end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]]; + + for (const u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr) { - if (memcmp(ptr, search_val, val_length) == 0) + if (std::equal(search_val.begin(), search_val.end(), ptr)) { SearchResult result; result.frame_idx = frame_idx; - int obj_idx = m_objectsList->GetSelection(); - result.obj_idx = obj_idx; + result.obj_idx = m_objectsList->GetSelection(); result.cmd_idx = 0; for (unsigned int cmd_idx = 1; cmd_idx < m_objectCmdOffsets.size(); ++cmd_idx) { @@ -488,7 +496,6 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) search_results.push_back(result); } } - delete[] search_val; ChangeSearchResult(0); m_beginSearch->Disable(); @@ -616,9 +623,10 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) int cmd = *objectdata++; int stream_size = Common::swap16(objectdata); objectdata += 2; - int vertex_size = (objectdata_end - objectdata) / stream_size; wxString newLabel = wxString::Format(wxT("%08X: %02X %04X "), obj_offset, cmd, stream_size); - if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); + if (stream_size && ((objectdata_end - objectdata) % stream_size)) + newLabel += _("NOTE: Stream size doesn't match actual data length\n"); + while (objectdata < objectdata_end) { newLabel += wxString::Format(wxT("%02X"), *objectdata++); @@ -635,8 +643,8 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) { m_objectCmdOffsets.push_back(objectdata - objectdata_start); int new_offset = objectdata - &fifo_frame.fifoData[frame.objectStarts[0]]; - int cmd = *objectdata++; - switch (cmd) + int command = *objectdata++; + switch (command) { case GX_NOP: newLabel = _("NOP"); @@ -684,9 +692,9 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) case GX_LOAD_INDX_C: case GX_LOAD_INDX_D: objectdata += 4; - newLabel = wxString::Format(wxT("LOAD INDX %s"), (cmd == GX_LOAD_INDX_A) ? _("A") : - (cmd == GX_LOAD_INDX_B) ? _("B") : - (cmd == GX_LOAD_INDX_C) ? _("C") : _("D")); + newLabel = wxString::Format(wxT("LOAD INDX %s"), (command == GX_LOAD_INDX_A) ? _("A") : + (command == GX_LOAD_INDX_B) ? _("B") : + (command == GX_LOAD_INDX_C) ? _("C") : _("D")); break; case GX_CMD_CALL_DL: @@ -763,12 +771,21 @@ void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event) Fit(); } +void FifoPlayerDlg::OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event)) +{ + if (wxTheClipboard->Open()) + { + wxTheClipboard->SetData(new wxTextDataObject(m_objectCmdList->GetStringSelection())); + wxTheClipboard->Close(); + } +} + void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event)) { Hide(); } -void FifoPlayerDlg::OnRecordingFinished(wxCommandEvent& WXUNUSED(event)) +void FifoPlayerDlg::OnRecordingFinished(wxEvent&) { m_RecordStop->SetLabel(_("Record")); m_RecordStop->Enable(); @@ -776,7 +793,7 @@ void FifoPlayerDlg::OnRecordingFinished(wxCommandEvent& WXUNUSED(event)) UpdateRecorderGui(); } -void FifoPlayerDlg::OnFrameWritten(wxCommandEvent& WXUNUSED(event)) +void FifoPlayerDlg::OnFrameWritten(wxEvent&) { m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel()); m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel()); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index 4e2c24fdd6..f00af6119b 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -51,12 +51,13 @@ private: void OnSearchFieldTextChanged(wxCommandEvent& event); void ChangeSearchResult(unsigned int result_idx); - void OnRecordingFinished(wxCommandEvent& event); - void OnFrameWritten(wxCommandEvent& event); + void OnRecordingFinished(wxEvent& event); + void OnFrameWritten(wxEvent& event); void OnFrameListSelectionChanged(wxCommandEvent& event); void OnObjectListSelectionChanged(wxCommandEvent& event); void OnObjectCmdListSelectionChanged(wxCommandEvent& event); + void OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event)); void UpdatePlayGui(); void UpdateRecorderGui(); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 6b0e7b7678..b0b53cc5ea 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -26,7 +26,6 @@ #include "Common.h" // Common #include "FileUtil.h" #include "Timer.h" -#include "Setup.h" #include "Globals.h" // Local #include "Frame.h" @@ -53,49 +52,10 @@ extern "C" { #include "../resources/Dolphin.c" // Dolphin icon -#include "../resources/toolbar_browse.c" -#include "../resources/toolbar_file_open.c" -#include "../resources/toolbar_fullscreen.c" -#include "../resources/toolbar_help.c" -#include "../resources/toolbar_pause.c" -#include "../resources/toolbar_play.c" -#include "../resources/toolbar_plugin_dsp.c" -#include "../resources/toolbar_plugin_gfx.c" -#include "../resources/toolbar_plugin_options.c" -#include "../resources/toolbar_plugin_pad.c" -#include "../resources/toolbar_refresh.c" -#include "../resources/toolbar_stop.c" -#include "../resources/Boomy.h" // Theme packages -#include "../resources/Vista.h" -#include "../resources/X-Plastik.h" -#include "../resources/KDE.h" }; -// Windows functions. Setting the cursor with wxSetCursor() did not work in -// this instance. Probably because it's somehow reset from the WndProc() in -// the child window #ifdef _WIN32 -// Declare a blank icon and one that will be the normal cursor -HCURSOR hCursor = NULL, hCursorBlank = NULL; - -// Create the default cursor -void CreateCursor() -{ - hCursor = LoadCursor( NULL, IDC_ARROW ); -} - -void MSWSetCursor(bool Show) -{ - if(Show) - SetCursor(hCursor); - else - { - SetCursor(hCursorBlank); - //wxSetCursor(wxCursor(wxNullCursor)); - } -} - // I could not use FindItemByHWND() instead of this, it crashed on that occation I used it */ HWND MSWGetParent_(HWND Parent) { @@ -134,42 +94,12 @@ CPanel::CPanel( case WM_USER_SETCURSOR: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && - main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN) - MSWSetCursor(!SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor); + main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN && + SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) + SetCursor(wxCURSOR_BLANK); else - MSWSetCursor(true); + SetCursor(wxNullCursor); break; - - case WIIMOTE_DISCONNECT: - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) - { - const int wiimote_idx = lParam; - const int wiimote_num = wiimote_idx + 1; - - //Auto reconnect if option is turned on. - //TODO: Make this only auto reconnect wiimotes that have the option activated. - SConfig::GetInstance().LoadSettingsWii();//Make sure we are using the newest settings. - if (SConfig::GetInstance().m_WiiAutoReconnect[wiimote_idx]) - { - GetUsbPointer()->AccessWiiMote(wiimote_idx | 0x100)->Activate(true); - NOTICE_LOG(WIIMOTE, "Wiimote %i has been auto-reconnected...", wiimote_num); - } - else - { - // The Wiimote has been disconnected, we offer reconnect here. - wxMessageDialog *dlg = new wxMessageDialog( - this, - wxString::Format(_("Wiimote %i has been disconnected by system.\nMaybe this game doesn't support multi-wiimote,\nor maybe it is due to idle time out or other reason.\nDo you want to reconnect immediately?"), wiimote_num), - _("Reconnect Wiimote Confirm"), - wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, - wxDefaultPosition); - - if (dlg->ShowModal() == wxID_YES) - GetUsbPointer()->AccessWiiMote(wiimote_idx | 0x100)->Activate(true); - - dlg->Destroy(); - } - } } break; @@ -244,6 +174,8 @@ EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording) EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport) EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly) EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput) +EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie) +EVT_MENU(IDM_SHOWLAG, CFrame::OnShowLag) EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep) EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) @@ -350,7 +282,7 @@ CFrame::CFrame(wxFrame* parent, ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener(); if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(); - // Start debugging mazimized + // Start debugging maximized if (UseDebugger) this->Maximize(true); // Debugger class if (UseDebugger) @@ -386,8 +318,6 @@ CFrame::CFrame(wxFrame* parent, // --------------- // Manager - // wxAUI_MGR_LIVE_RESIZE does not exist in the wxWidgets 2.8.9 that comes with Ubuntu 9.04 - // Could just check for wxWidgets version if it becomes a problem. m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() @@ -434,9 +364,7 @@ CFrame::CFrame(wxFrame* parent, // Commit m_Mgr->Update(); - // Create cursors #ifdef _WIN32 - CreateCursor(); SetToolTip(wxT("")); GetToolTip()->SetAutoPop(25000); #endif @@ -449,20 +377,11 @@ CFrame::CFrame(wxFrame* parent, // ------------------------- // Connect event handlers - m_Mgr->Connect(wxID_ANY, wxEVT_AUI_RENDER, // Resize - wxAuiManagerEventHandler(CFrame::OnManagerResize), - (wxObject*)0, this); + m_Mgr->Bind(wxEVT_AUI_RENDER, &CFrame::OnManagerResize, this); // ---------- // Update controls UpdateGUI(); - - // If we are rerecording create the status bar now instead of later when a game starts - #ifdef RERECORDING - ModifyStatusBar(); - // It's to early for the OnHostMessage(), we will update the status when Ctrl or Space is pressed - //Core::WriteStatus(); - #endif } // Destructor CFrame::~CFrame() @@ -500,20 +419,6 @@ void CFrame::OnActive(wxActivateEvent& event) { if (event.GetActive() && event.GetEventObject() == m_RenderFrame) { - // 32x32, 8bpp b/w image - // We want all transparent, so we can just use the same buffer for - // the "image" as for the transparency mask - static const char cursor_data[32 * 32] = { 0 }; - -#ifdef __WXGTK__ - wxCursor cursor_transparent = wxCursor(cursor_data, 32, 32, 6, 14, - cursor_data, wxWHITE, wxBLACK); -#else - wxBitmap cursor_bitmap(cursor_data, 32, 32); - cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); - wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); -#endif - #ifdef __WXMSW__ ::SetFocus((HWND)m_RenderParent->GetHandle()); #else @@ -522,7 +427,7 @@ void CFrame::OnActive(wxActivateEvent& event) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) - m_RenderParent->SetCursor(cursor_transparent); + m_RenderParent->SetCursor(wxCURSOR_BLANK); } else { @@ -652,12 +557,12 @@ void CFrame::OnHostMessage(wxCommandEvent& event) } break; -#ifdef __WXGTK__ case WM_USER_CREATE: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxCURSOR_BLANK); break; +#ifdef __WXGTK__ case IDM_PANIC: { wxString caption = event.GetString().BeforeFirst(':'); @@ -799,83 +704,112 @@ bool IsHotkey(wxKeyEvent &event, int Id) { return (event.GetKeyCode() != WXK_NONE && event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && - event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); + event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); } int GetCmdForHotkey(unsigned int key) { - if (key == HK_OPEN) + switch (key) + { + case HK_OPEN: return wxID_OPEN; - if (key == HK_CHANGE_DISC) + + case HK_CHANGE_DISC: return IDM_CHANGEDISC; - if (key == HK_REFRESH_LIST) + + case HK_REFRESH_LIST: return wxID_REFRESH; - if (key == HK_PLAY_PAUSE) + case HK_PLAY_PAUSE: return IDM_PLAY; - if (key == HK_STOP) + + case HK_STOP: return IDM_STOP; - if (key == HK_RESET) + + case HK_RESET: return IDM_RESET; - if (key == HK_FRAME_ADVANCE) + + case HK_FRAME_ADVANCE: return IDM_FRAMESTEP; - if (key == HK_START_RECORDING) + case HK_START_RECORDING: return IDM_RECORD; - if (key == HK_PLAY_RECORDING) + + case HK_PLAY_RECORDING: return IDM_PLAYRECORD; - if (key == HK_EXPORT_RECORDING) + + case HK_EXPORT_RECORDING: return IDM_RECORDEXPORT; - if (key == HK_READ_ONLY_MODE) + + case HK_READ_ONLY_MODE: return IDM_RECORDREADONLY; - if (key == HK_FULLSCREEN) + case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN; - if (key == HK_SCREENSHOT) + + case HK_SCREENSHOT: return IDM_SCREENSHOT; - if (key == HK_WIIMOTE1_CONNECT) + case HK_WIIMOTE1_CONNECT: return IDM_CONNECT_WIIMOTE1; - if (key == HK_WIIMOTE2_CONNECT) + + case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2; - if (key == HK_WIIMOTE3_CONNECT) + + case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3; - if (key == HK_WIIMOTE4_CONNECT) + + case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4; - if (key == HK_LOAD_STATE_SLOT_1) + case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1; - if (key == HK_LOAD_STATE_SLOT_2) + + case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2; - if (key == HK_LOAD_STATE_SLOT_3) + + case HK_LOAD_STATE_SLOT_3: return IDM_LOADSLOT3; - if (key == HK_LOAD_STATE_SLOT_4) + + case HK_LOAD_STATE_SLOT_4: return IDM_LOADSLOT4; - if (key == HK_LOAD_STATE_SLOT_5) + + case HK_LOAD_STATE_SLOT_5: return IDM_LOADSLOT5; - if (key == HK_LOAD_STATE_SLOT_6) + + case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6; - if (key == HK_LOAD_STATE_SLOT_7) + + case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7; - if (key == HK_LOAD_STATE_SLOT_8) + + case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8; - if (key == HK_SAVE_STATE_SLOT_1) + case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1; - if (key == HK_SAVE_STATE_SLOT_2) + + case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2; - if (key == HK_SAVE_STATE_SLOT_3) + + case HK_SAVE_STATE_SLOT_3: return IDM_SAVESLOT3; - if (key == HK_SAVE_STATE_SLOT_4) + + case HK_SAVE_STATE_SLOT_4: return IDM_SAVESLOT4; - if (key == HK_SAVE_STATE_SLOT_5) + + case HK_SAVE_STATE_SLOT_5: return IDM_SAVESLOT5; - if (key == HK_SAVE_STATE_SLOT_6) + + case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6; - if (key == HK_SAVE_STATE_SLOT_7) + + case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7; - if (key == HK_SAVE_STATE_SLOT_8) + + case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8; + } return -1; } diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 770d459220..45a0eb1ad4 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -210,15 +210,6 @@ private: EToolbar_Max }; - enum EBitmapsThemes - { - BOOMY, - VISTA, - XPLASTIK, - KDE, - THEMES_MAX - }; - wxBitmap m_Bitmaps[EToolbar_Max]; wxBitmap m_BitmapsMenu[EToolbar_Max]; @@ -297,6 +288,8 @@ private: void OnRecordExport(wxCommandEvent& event); void OnRecordReadOnly(wxCommandEvent& event); void OnTASInput(wxCommandEvent& event); + void OnTogglePauseMovie(wxCommandEvent& event); + void OnShowLag(wxCommandEvent& event); void OnChangeDisc(wxCommandEvent& event); void OnScreenshot(wxCommandEvent& event); void OnActive(wxActivateEvent& event); diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index 503d6994af..0550c5cd39 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -1004,15 +1004,11 @@ wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, m_MainSizer->Add(Child, 1, wxEXPAND); - Frame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(CFrame::OnFloatingPageClosed), - (wxObject*)0, this); + Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this); if (Id == IDM_CONSOLEWINDOW_PARENT) { - Frame->Connect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnFloatingPageSize), - (wxObject*)0, this); + Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this); } // Main sizer diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d24bd2f23e..cb2750ade4 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -27,9 +27,6 @@ window handle that is returned by CreateWindow() can be accessed from Core::GetWindowHandle(). */ - -#include "Setup.h" // Common - #include "NetWindow.h" #include "Common.h" // Common #include "FileUtil.h" @@ -53,6 +50,7 @@ Core::GetWindowHandle(). #include "LogConfigWindow.h" #include "FifoPlayerDlg.h" #include "WxUtils.h" +#include "Host.h" #include "ConfigManager.h" // Core #include "Core.h" @@ -80,25 +78,10 @@ Core::GetWindowHandle(). // Resources extern "C" { #include "../resources/Dolphin.c" // Dolphin icon -#include "../resources/toolbar_browse.c" -#include "../resources/toolbar_file_open.c" -#include "../resources/toolbar_fullscreen.c" -#include "../resources/toolbar_help.c" -#include "../resources/toolbar_pause.c" -#include "../resources/toolbar_play.c" -#include "../resources/toolbar_plugin_dsp.c" -#include "../resources/toolbar_plugin_gfx.c" -#include "../resources/toolbar_plugin_options.c" -#include "../resources/toolbar_plugin_pad.c" -#include "../resources/toolbar_plugin_wiimote.c" -#include "../resources/toolbar_refresh.c" -#include "../resources/toolbar_stop.c" -#include "../resources/Boomy.h" // Theme packages -#include "../resources/Vista.h" -#include "../resources/X-Plastik.h" -#include "../resources/KDE.h" }; +bool confirmStop = false; + // Create menu items // --------------------- void CFrame::CreateMenu() @@ -142,9 +125,13 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING)); emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); + emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); + emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie); + emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); + emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag); emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); - + emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString); wxMenu *skippingMenu = new wxMenu; @@ -162,7 +149,7 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu); saveMenu->Append(IDM_SAVESTATEFILE, _("Save State...")); - loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State") + wxString(wxT("\tShift+F12"))); + loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State") + wxString(wxT("\tF12"))); saveMenu->AppendSeparator(); loadMenu->Append(IDM_LOADSTATEFILE, _("Load State...")); @@ -173,7 +160,7 @@ void CFrame::CreateMenu() else loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State") + wxString(wxT("\tF11"))); - loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tF12"))); + loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tShift+F12"))); loadMenu->AppendSeparator(); for (int i = 1; i <= 8; i++) { @@ -437,7 +424,7 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar) ToolBar->AddTool(IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); ToolBar->AddTool(IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); - ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_FullScreen], _("Take Screenshot")); + ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); ToolBar->AddSeparator(); ToolBar->AddTool(wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); ToolBar->AddTool(IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); @@ -508,102 +495,33 @@ void CFrame::RecreateToolbar() void CFrame::InitBitmaps() { - // Get selected theme - int Theme = SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme; + std::string theme(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"); + std::string dir(File::GetUserPath(D_THEMES_IDX) + theme); - // Save memory by only having one set of bitmaps loaded at any time. I mean, they are still - // in the exe, which is in memory, but at least we wont make another copy of all of them. - switch (Theme) - { - case BOOMY: - { - // These are stored as 48x48 - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(toolbar_file_open_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(toolbar_refresh_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(toolbar_browse_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(toolbar_play_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(toolbar_stop_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(toolbar_pause_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(toolbar_plugin_options_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(toolbar_plugin_gfx_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(toolbar_plugin_dsp_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(toolbar_plugin_pad_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(toolbar_plugin_wiimote_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(toolbar_fullscreen_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(toolbar_fullscreen_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(toolbar_help_png); +#if !defined(_WIN32) + // If theme does not exist in user's dir load from shared directory + if (!File::Exists(dir)) + dir = SHARED_USER_DIR THEMES_DIR "/" + theme; +#endif - // Scale the 48x48 bitmaps to 24x24 - for (size_t n = Toolbar_FileOpen; n < EToolbar_Max; n++) - { - m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); - } - } - break; - - case VISTA: - { - // These are stored as 24x24 and need no scaling - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open1_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh1_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse1_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play1_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop1_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause1_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options1_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx1_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP1_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad1_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote1_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen1_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen1_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help1_png); - } - break; - - case XPLASTIK: - { - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open2_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh2_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse2_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play2_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop2_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause2_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options2_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx2_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP2_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad2_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote2_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen2_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen2_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help2_png); - } - break; - - case KDE: - { - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open3_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh3_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse3_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play3_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop3_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause3_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options3_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx3_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP3_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad3_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote3_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen3_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen3_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help3_png); - } - break; - - default: PanicAlertT("Theme selection went wrong"); - } + m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Browse].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Play].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Stop].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Pause].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigMain].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigGFX].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigDSP].LoadFile(dir + "dsp.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigPAD].LoadFile(dir + "gcpad.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Wiimote].LoadFile(dir + "wiimote.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Help].LoadFile(dir + "help.png", wxBITMAP_TYPE_PNG); // Update in case the bitmap has been updated - if (m_ToolBar != NULL) RecreateToolbar(); + if (m_ToolBar != NULL) + RecreateToolbar(); } // Menu items @@ -702,6 +620,18 @@ void CFrame::OnTASInput(wxCommandEvent& event) g_TASInputDlg->Show(true); } +void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) +{ + SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie; + SConfig::GetInstance().SaveSettings(); +} + +void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event)) +{ + SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag; + SConfig::GetInstance().SaveSettings(); +} + void CFrame::OnFrameStep(wxCommandEvent& event) { bool wasPaused = (Core::GetState() == Core::CORE_PAUSE); @@ -732,7 +662,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) } for (int i = 0; i < 4; i++) { - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) controllers |= (1 << i); if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) @@ -942,15 +872,9 @@ void CFrame::StartGame(const std::string& filename) wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight()); - m_RenderFrame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(CFrame::OnRenderParentClose), - (wxObject*)0, this); - m_RenderFrame->Connect(wxID_ANY, wxEVT_ACTIVATE, - wxActivateEventHandler(CFrame::OnActive), - (wxObject*)0, this); - m_RenderFrame->Connect(wxID_ANY, wxEVT_MOVE, - wxMoveEventHandler(CFrame::OnRenderParentMove), - (wxObject*)0, this); + m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this); + m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this); + m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this); m_RenderParent = new CPanel(m_RenderFrame, wxID_ANY); m_RenderFrame->Show(); } @@ -983,30 +907,14 @@ void CFrame::StartGame(const std::string& filename) m_RenderParent->SetFocus(); #endif - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(CFrame::OnKeyDown), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_UP, - wxKeyEventHandler(CFrame::OnKeyUp), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_RIGHT_DOWN, // Mouse - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_RIGHT_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MIDDLE_DOWN, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MIDDLE_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MOTION, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - m_RenderParent->Connect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnRenderParentResize), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); + m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); } wxEndBusyCursor(); @@ -1042,27 +950,15 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + m_RenderParent->SetCursor(wxNullCursor); + Core::UpdateTitle(); } else { - // 32x32, 8bpp b/w image - // We want all transparent, so we can just use the same buffer for - // the "image" as for the transparency mask - static const char cursor_data[32 * 32] = { 0 }; -#ifdef __WXGTK__ - wxCursor cursor_transparent = wxCursor(cursor_data, 32, 32, 6, 14, - cursor_data, wxWHITE, wxBLACK); -#else - wxBitmap cursor_bitmap(cursor_data, 32, 32); - cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); - wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); -#endif - Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - m_RenderParent->SetCursor(cursor_transparent); + m_RenderParent->SetCursor(wxCURSOR_BLANK); } UpdateGUI(); } @@ -1070,6 +966,9 @@ void CFrame::DoPause() // Stop the emulation void CFrame::DoStop() { + if (confirmStop) + return; + m_bGameLoading = false; if (Core::GetState() != Core::CORE_UNINITIALIZED || m_RenderParent != NULL) @@ -1082,17 +981,23 @@ void CFrame::DoStop() // Ask for confirmation in case the user accidentally clicked Stop / Escape if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop) { - wxMessageDialog *m_StopDlg = new wxMessageDialog( + Core::EState state = Core::GetState(); + confirmStop = true; + Core::SetState(Core::CORE_PAUSE); + wxMessageDialog m_StopDlg( this, _("Do you want to stop the current emulation?"), _("Please confirm..."), wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxDefaultPosition); - int Ret = m_StopDlg->ShowModal(); - m_StopDlg->Destroy(); + int Ret = m_StopDlg.ShowModal(); + confirmStop = false; if (Ret != wxID_YES) + { + Core::SetState(state); return; + } } // TODO: Show the author/description dialog here @@ -1113,35 +1018,26 @@ void CFrame::DoStop() m_RenderFrame->SetTitle(wxString::FromAscii(scm_rev_str)); // Destroy the renderer frame when not rendering to main - m_RenderParent->Disconnect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnRenderParentResize), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(CFrame::OnKeyDown), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_UP, - wxKeyEventHandler(CFrame::OnKeyUp), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_RIGHT_DOWN, // Mouse - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_RIGHT_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MIDDLE_DOWN, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MIDDLE_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MOTION, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); + m_RenderParent->Unbind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); + + // Keyboard + wxTheApp->Unbind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Unbind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + + // Mouse + wxTheApp->Unbind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MOTION, &CFrame::OnMouse, this); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) m_RenderFrame->Destroy(); + else + // Make sure the window is not longer set to stay on top + m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP); m_RenderParent = NULL; // Clean framerate indications from the status bar. @@ -1162,6 +1058,7 @@ void CFrame::DoStop() m_GameListCtrl->Enable(); m_GameListCtrl->Show(); + m_GameListCtrl->SetFocus(); UpdateGUI(); } } @@ -1232,6 +1129,8 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event)) #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); Pad::Initialize((void *)win); +#elif defined(__APPLE__) + Pad::Initialize((void *)this); #else Pad::Initialize(GetHandle()); #endif @@ -1256,6 +1155,8 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event)) #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); Wiimote::Initialize((void *)win); +#elif defined(__APPLE__) + Wiimote::Initialize((void *)this); #else Wiimote::Initialize(GetHandle()); #endif @@ -1289,7 +1190,7 @@ void CFrame::OnHelp(wxCommandEvent& event) } break; case IDM_HELPWEBSITE: - WxUtils::Launch("http://www.dolphin-emulator.com/"); + WxUtils::Launch("http://dolphin-emu.org/"); break; case IDM_HELPGOOGLECODE: WxUtils::Launch("http://code.google.com/p/dolphin-emu/"); @@ -1307,9 +1208,8 @@ void CFrame::StatusBarMessage(const char * Text, ...) const int MAX_BYTES = 1024*10; char Str[MAX_BYTES]; va_list ArgPtr; - int Cnt; va_start(ArgPtr, Text); - Cnt = vsnprintf(Str, MAX_BYTES, Text, ArgPtr); + vsnprintf(Str, MAX_BYTES, Text, ArgPtr); va_end(ArgPtr); if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxString::FromAscii(Str),0); @@ -1455,12 +1355,13 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1, connect ? wxT("Connected") : wxT("Disconnected"))); Core::DisplayMessage(msg.ToAscii(), 3000); + Host_UpdateMainFrame(); } } void CFrame::OnConnectWiimote(wxCommandEvent& event) { - ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, event.IsChecked()); + ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, !GetUsbPointer()->AccessWiiMote((event.GetId() - IDM_CONNECT_WIIMOTE1) | 0x100)->IsConnected()); } // Toogle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover @@ -1661,6 +1562,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() @@ -1669,6 +1572,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } else { @@ -1676,6 +1581,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, false); GetMenuBar()->FindItem(IDM_PLAY)->Enable(false); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(false); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(false); } } @@ -1691,6 +1598,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } } else if (Initialized) diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.cpp b/Source/Core/DolphinWX/Src/GCMicDlg.cpp index 1cdd166cf5..ddf804b57b 100644 --- a/Source/Core/DolphinWX/Src/GCMicDlg.cpp +++ b/Source/Core/DolphinWX/Src/GCMicDlg.cpp @@ -56,9 +56,7 @@ void GCMicDialog::SaveButtonMapping(int Id, int Key, int Modkey) void GCMicDialog::EndGetButtons(void) { - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(GCMicDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Unbind(wxEVT_KEY_DOWN, &GCMicDialog::OnKeyDown, this); m_ButtonMappingTimer->Stop(); GetButtonWaitingTimer = 0; GetButtonWaitingID = 0; @@ -153,9 +151,7 @@ void GCMicDialog::OnButtonClick(wxCommandEvent& event) if (m_ButtonMappingTimer->IsRunning()) return; - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(GCMicDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &GCMicDialog::OnKeyDown, this); // Get the button ClickedButton = (wxButton *)event.GetEventObject(); diff --git a/Source/Core/DolphinWX/Src/GLInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h new file mode 100644 index 0000000000..70b4942e94 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface.h @@ -0,0 +1,80 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _GLINTERFACE_H_ +#define _GLINTERFACE_H_ + +#include "Thread.h" +#ifdef ANDROID +#include +#include +#elif defined(USE_EGL) && USE_EGL +#include "GLInterface/EGL_X11.h" +#elif defined(USE_WX) && USE_WX +#include "GLInterface/WX.h" +#elif defined(__APPLE__) +#include "GLInterface/AGL.h" +#elif defined(_WIN32) +#include "GLInterface/WGL.h" +#elif defined(HAVE_X11) && HAVE_X11 +#include "GLInterface/GLX.h" +#else +#error Platform doesnt have a GLInterface +#endif + +typedef struct { +#ifdef ANDROID +#elif defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop + int screen; + Display *dpy; + Display *evdpy; + Window win; + Window parent; + EGLSurface egl_surf; + EGLContext egl_ctx; + EGLDisplay egl_dpy; + XVisualInfo *vi; + XSetWindowAttributes attr; + std::thread xEventThread; + int x, y; + unsigned int width, height; +#elif defined(USE_WX) && USE_WX + wxGLCanvas *glCanvas; + wxGLContext *glCtxt; + wxPanel *panel; +#elif defined(__APPLE__) + NSWindow *cocoaWin; + NSOpenGLContext *cocoaCtx; +#elif defined(HAVE_X11) && HAVE_X11 + int screen; + Window win; + Window parent; + // dpy used for glx stuff, evdpy for window events etc. + // evdpy is to be used by XEventThread only + Display *dpy, *evdpy; + XVisualInfo *vi; + GLXContext ctx; + XSetWindowAttributes attr; + std::thread xEventThread; + int x, y; + unsigned int width, height; +#endif +} GLWindow; + +extern cInterfaceBase *GLInterface; +extern GLWindow GLWin; + +#endif diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp new file mode 100644 index 0000000000..cf68c0baa4 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp @@ -0,0 +1,118 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" +#include "ConfigManager.h" + +#include "VertexShaderManager.h" +#include "../GLInterface.h" +#include "AGL.h" + +void cInterfaceAGL::Swap() +{ + [GLWin.cocoaCtx flushBuffer]; +} + +// Show the current FPS +void cInterfaceAGL::UpdateFPSDisplay(const char *text) +{ + [GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]]; +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceAGL::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + NSRect size; + NSUInteger style = NSMiniaturizableWindowMask; + NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 }; + NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] + initWithAttributes: attr]; + if (fmt == nil) { + ERROR_LOG(VIDEO, "failed to create pixel format"); + return NULL; + } + + GLWin.cocoaCtx = [[NSOpenGLContext alloc] + initWithFormat: fmt shareContext: nil]; + [fmt release]; + if (GLWin.cocoaCtx == nil) { + ERROR_LOG(VIDEO, "failed to create context"); + return NULL; + } + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { + size = [[NSScreen mainScreen] frame]; + style |= NSBorderlessWindowMask; + } else { + size = NSMakeRect(_tx, _ty, _twidth, _theight); + style |= NSResizableWindowMask | NSTitledWindowMask; + } + + GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size + styleMask: style backing: NSBackingStoreBuffered defer: NO]; + if (GLWin.cocoaWin == nil) { + ERROR_LOG(VIDEO, "failed to create window"); + return NULL; + } + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { + CGDisplayCapture(CGMainDisplayID()); + [GLWin.cocoaWin setLevel: CGShieldingWindowLevel()]; + } + + [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; + [GLWin.cocoaWin makeKeyAndOrderFront: nil]; + + return true; +} + +bool cInterfaceAGL::MakeCurrent() +{ + int width, height; + + width = [[GLWin.cocoaWin contentView] frame].size.width; + height = [[GLWin.cocoaWin contentView] frame].size.height; + if (width == s_backbuffer_width && height == s_backbuffer_height) + return; + + [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; + [GLWin.cocoaCtx update]; + [GLWin.cocoaCtx makeCurrentContext]; + s_backbuffer_width = width; + s_backbuffer_height = height; + return true; +} + +// Close backend +void cInterfaceAGL::Shutdown() +{ + [GLWin.cocoaWin close]; + [GLWin.cocoaCtx clearDrawable]; + [GLWin.cocoaCtx release]; +} + + diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h new file mode 100644 index 0000000000..e03256ab4e --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h @@ -0,0 +1,37 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEAGL_H_ +#define _INTERFACEAGL_H_ + +#ifdef __APPLE__ +#include +#import +#endif + +#include "InterfaceBase.h" + +class cInterfaceAGL : public cInterfaceBase +{ +public: + void Swap(); + void UpdateFPSDisplay(const char *Text); + bool Create(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp new file mode 100644 index 0000000000..c092aced64 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp @@ -0,0 +1,181 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Host.h" +#include "RenderBase.h" + +#include "../GLInterface.h" +#include "EGL_X11.h" + +// Show the current FPS +void cInterfaceEGL::UpdateFPSDisplay(const char *text) +{ + XStoreName(GLWin.dpy, GLWin.win, text); +} + +void cInterfaceEGL::SwapInterval(int Interval) +{ + eglSwapInterval(GLWin.egl_dpy, Interval); +} + +void cInterfaceEGL::Swap() +{ + eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceEGL::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + EGLint egl_major, egl_minor; + + GLWin.dpy = XOpenDisplay(NULL); + + if (!GLWin.dpy) { + ERROR_LOG(VIDEO, "Error: couldn't open display\n"); + return false; + } + + GLWin.egl_dpy = eglGetDisplay(GLWin.dpy); + if (!GLWin.egl_dpy) { + ERROR_LOG(VIDEO, "Error: eglGetDisplay() failed\n"); + return false; + } + + if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) { + ERROR_LOG(VIDEO, "Error: eglInitialize() failed\n"); + return false; + } + + INFO_LOG(VIDEO, "EGL_VERSION = %s\n", eglQueryString(GLWin.egl_dpy, EGL_VERSION)); + INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", eglQueryString(GLWin.egl_dpy, EGL_VENDOR)); + INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS)); + INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS)); + + // attributes for a visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attribs[] = { + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_DEPTH_SIZE, 24, +#ifdef USE_GLES + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, +#else + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, +#endif + EGL_NONE }; + + static const EGLint ctx_attribs[] = { +#ifdef USE_GLES + EGL_CONTEXT_CLIENT_VERSION, 2, +#endif + EGL_NONE + }; + + GLWin.evdpy = XOpenDisplay(NULL); + GLWin.parent = (Window)window_handle; + GLWin.screen = DefaultScreen(GLWin.dpy); + if (GLWin.parent == 0) + GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); + + XVisualInfo visTemplate; + int num_visuals; + EGLConfig config; + EGLint num_configs; + EGLint vid; + + if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) { + ERROR_LOG(VIDEO, "Error: couldn't get an EGL visual config\n"); + return false; + } + + if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { + ERROR_LOG(VIDEO, "Error: eglGetConfigAttrib() failed\n"); + return false; + } + + /* The X window visual must match the EGL config */ + visTemplate.visualid = vid; + GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals); + if (!GLWin.vi) { + ERROR_LOG(VIDEO, "Error: couldn't get X visual\n"); + return false; + } + + GLWin.x = _tx; + GLWin.y = _ty; + GLWin.width = _twidth; + GLWin.height = _theight; + + XWindow.CreateXWindow(); +#ifdef USE_GLES + eglBindAPI(EGL_OPENGL_ES_API); +#else + eglBindAPI(EGL_OPENGL_API); +#endif + GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs ); + if (!GLWin.egl_ctx) { + ERROR_LOG(VIDEO, "Error: eglCreateContext failed\n"); + return false; + } + + GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL); + if (!GLWin.egl_surf) { + ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n"); + return false; + } + + if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) { + ERROR_LOG(VIDEO, "Error: eglMakeCurrent() failed\n"); + return false; + } + + INFO_LOG(VIDEO, "GL_VENDOR: %s\n", glGetString(GL_VENDOR)); + INFO_LOG(VIDEO, "GL_RENDERER: %s\n", glGetString(GL_RENDERER)); + INFO_LOG(VIDEO, "GL_VERSION: %s\n", glGetString(GL_VERSION)); + INFO_LOG(VIDEO, "GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS)); + window_handle = (void *)GLWin.win; + return true; +} + +bool cInterfaceEGL::MakeCurrent() +{ + return eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx); +} +// Close backend +void cInterfaceEGL::Shutdown() +{ + XWindow.DestroyXWindow(); + if (GLWin.egl_ctx && !eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + if (GLWin.egl_ctx) + { + eglDestroyContext(GLWin.egl_dpy, GLWin.egl_ctx); + eglDestroySurface(GLWin.egl_dpy, GLWin.egl_surf); + eglTerminate(GLWin.egl_dpy); + GLWin.egl_ctx = NULL; + } +} + diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h new file mode 100644 index 0000000000..513fb2ce4a --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h @@ -0,0 +1,45 @@ +// 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 _INTERFACEEGL_H_ +#define _INTERFACEEGL_H_ + +#include +#ifdef USE_GLES +#include +#else +#include +#include +#endif + +#include "X11_Util.h" +#include "InterfaceBase.h" + +class cInterfaceEGL : public cInterfaceBase +{ +private: + cX11Window XWindow; +public: + friend class cX11Window; + void SwapInterval(int Interval); + void Swap(); + void UpdateFPSDisplay(const char *Text); + bool Create(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp new file mode 100644 index 0000000000..5745823cbf --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -0,0 +1,160 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Host.h" +#include "RenderBase.h" +#include "VideoConfig.h" + +#include "../GLInterface.h" +#include "GLX.h" + +// Show the current FPS +void cInterfaceGLX::UpdateFPSDisplay(const char *text) +{ + XStoreName(GLWin.dpy, GLWin.win, text); +} + +void cInterfaceGLX::SwapInterval(int Interval) +{ + if (glXSwapIntervalSGI) + glXSwapIntervalSGI(Interval); + else + ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); +} + +void cInterfaceGLX::Swap() +{ + glXSwapBuffers(GLWin.dpy, GLWin.win); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceGLX::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + int glxMajorVersion, glxMinorVersion; + + // attributes for a single buffered visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + None}; + + // attributes for a double buffered visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, + GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, + None }; + + int attrListDefault[] = { + GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DOUBLEBUFFER, + GLX_DEPTH_SIZE, 1, + None }; + + GLWin.dpy = XOpenDisplay(0); + GLWin.evdpy = XOpenDisplay(0); + GLWin.parent = (Window)window_handle; + GLWin.screen = DefaultScreen(GLWin.dpy); + if (GLWin.parent == 0) + GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); + + glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); + NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); + + // Get an appropriate visual + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); + if (GLWin.vi == NULL) + { + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl); + if (GLWin.vi != NULL) + { + ERROR_LOG(VIDEO, "Only single buffered visual!"); + } + else + { + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault); + if (GLWin.vi == NULL) + { + ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)"); + return false; + } + } + } + else + NOTICE_LOG(VIDEO, "Got double buffered visual!"); + + // Create a GLX context. + GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE); + if (!GLWin.ctx) + { + PanicAlert("Unable to create GLX context."); + return false; + } + + GLWin.x = _tx; + GLWin.y = _ty; + GLWin.width = _twidth; + GLWin.height = _theight; + + XWindow.CreateXWindow(); + window_handle = (void *)GLWin.win; + return true; +} + +bool cInterfaceGLX::MakeCurrent() +{ + // connect the glx-context to the window + #if defined(HAVE_WX) && (HAVE_WX) + Host_GetRenderWindowSize(GLWin.x, GLWin.y, + (int&)GLWin.width, (int&)GLWin.height); + XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y, + GLWin.width, GLWin.height); + #endif + return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); +} +// Close backend +void cInterfaceGLX::Shutdown() +{ + XWindow.DestroyXWindow(); + if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + if (GLWin.ctx) + { + glXDestroyContext(GLWin.dpy, GLWin.ctx); + XCloseDisplay(GLWin.dpy); + XCloseDisplay(GLWin.evdpy); + GLWin.ctx = NULL; + } +} + diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h new file mode 100644 index 0000000000..83bb14a507 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h @@ -0,0 +1,42 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEGLX_H_ +#define _INTERFACEGLX_H_ + +#include +#include +#include +#include + +#include "X11_Util.h" +#include "InterfaceBase.h" + +class cInterfaceGLX : public cInterfaceBase +{ +private: + cX11Window XWindow; +public: + friend class cX11Window; + void SwapInterval(int Interval); + void Swap(); + void UpdateFPSDisplay(const char *Text); + bool Create(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h new file mode 100644 index 0000000000..1c00a1fd89 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -0,0 +1,39 @@ +// 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 _GLINTERFACEBASE_H_ +#define _GLINTERFACEBASE_H_ +class cInterfaceBase +{ +protected: + // Window dimensions. + u32 s_backbuffer_width; + u32 s_backbuffer_height; +public: + virtual void Swap() {} + virtual void UpdateFPSDisplay(const char *Text) {} + virtual bool Create(void *&window_handle) { return true; } + virtual bool MakeCurrent() { return true; } + virtual void Shutdown() {} + + virtual void SwapInterval(int Interval) { } + virtual u32 GetBackBufferWidth() { return s_backbuffer_width; } + virtual u32 GetBackBufferHeight() { return s_backbuffer_height; } + virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; } + virtual void Update() { } + virtual bool PeekMessages() { return false; } +}; +#endif diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp new file mode 100644 index 0000000000..ce1bb3d946 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -0,0 +1,186 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLInterface.h" +#include "WGL.h" + +#include "EmuWindow.h" +static HDC hDC = NULL; // Private GDI Device Context +static HGLRC hRC = NULL; // Permanent Rendering Context + +void cInterfaceWGL::SwapInterval(int Interval) +{ + if (WGLEW_EXT_swap_control) + wglSwapIntervalEXT(Interval); + else + ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); +} +void cInterfaceWGL::Swap() +{ + SwapBuffers(hDC); +} + +// Draw messages on top of the screen +bool cInterfaceWGL::PeekMessages() +{ + // TODO: peekmessage + MSG msg; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + return FALSE; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + return TRUE; +} + +// Show the current FPS +void cInterfaceWGL::UpdateFPSDisplay(const char *text) +{ + TCHAR temp[512]; + swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text); + EmuWindow::SetWindowText(temp); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceWGL::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait...")); + if (window_handle == NULL) + { + Host_SysMessage("failed to create window"); + return false; + } + + // Show the window + EmuWindow::Show(); + + PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be + { + sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor + 1, // Version Number + PFD_DRAW_TO_WINDOW | // Format Must Support Window + PFD_SUPPORT_OPENGL | // Format Must Support OpenGL + PFD_DOUBLEBUFFER, // Must Support Double Buffering + PFD_TYPE_RGBA, // Request An RGBA Format + 32, // Select Our Color Depth + 0, 0, 0, 0, 0, 0, // Color Bits Ignored + 0, // 8bit Alpha Buffer + 0, // Shift Bit Ignored + 0, // No Accumulation Buffer + 0, 0, 0, 0, // Accumulation Bits Ignored + 24, // 24Bit Z-Buffer (Depth Buffer) + 8, // 8bit Stencil Buffer + 0, // No Auxiliary Buffer + PFD_MAIN_PLANE, // Main Drawing Layer + 0, // Reserved + 0, 0, 0 // Layer Masks Ignored + }; + + GLuint PixelFormat; // Holds The Results After Searching For A Match + + if (!(hDC=GetDC(EmuWindow::GetWnd()))) { + PanicAlert("(1) Can't create an OpenGL Device context. Fail."); + return false; + } + if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) { + PanicAlert("(2) Can't find a suitable PixelFormat."); + return false; + } + if (!SetPixelFormat(hDC, PixelFormat, &pfd)) { + PanicAlert("(3) Can't set the PixelFormat."); + return false; + } + if (!(hRC = wglCreateContext(hDC))) { + PanicAlert("(4) Can't create an OpenGL rendering context."); + return false; + } + return true; +} + +bool cInterfaceWGL::MakeCurrent() +{ + return wglMakeCurrent(hDC, hRC) ? true : false; +} + +// Update window width, size and etc. Called from Render.cpp +void cInterfaceWGL::Update() +{ + RECT rcWindow; + if (!EmuWindow::GetParentWnd()) + { + // We are not rendering to a child window - use client size. + GetClientRect(EmuWindow::GetWnd(), &rcWindow); + } + else + { + // We are rendering to a child window - use parent size. + GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); + } + + // Get the new window width and height + // See below for documentation + int width = rcWindow.right - rcWindow.left; + int height = rcWindow.bottom - rcWindow.top; + + // If we are rendering to a child window + if (EmuWindow::GetParentWnd() != 0 && + (s_backbuffer_width != width || s_backbuffer_height != height) && + width >= 4 && height >= 4) + { + ::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE); + s_backbuffer_width = width; + s_backbuffer_height = height; + } +} + +// Close backend +void cInterfaceWGL::Shutdown() +{ + if (hRC) + { + if (!wglMakeCurrent(NULL, NULL)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + + if (!wglDeleteContext(hRC)) + ERROR_LOG(VIDEO, "Release Rendering Context Failed."); + + hRC = NULL; + } + + if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) + { + ERROR_LOG(VIDEO, "Release Device Context Failed."); + hDC = NULL; + } +} + + diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h new file mode 100644 index 0000000000..18b8b2afb0 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h @@ -0,0 +1,42 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEWGL_H_ +#define _INTERFACEWGL_H_ + +#ifdef _WIN32 +#define GLEW_STATIC +#include +#include +#endif + +#include "InterfaceBase.h" + +class cInterfaceWGL : public cInterfaceBase +{ +public: + void SwapInterval(int Interval); + void Swap(); + void UpdateFPSDisplay(const char *Text); + bool Create(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); + + void Update(); + bool PeekMessages(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp new file mode 100644 index 0000000000..16de6369a7 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -0,0 +1,96 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLInterface.h" +#include "WX.h" + +void cInterfaceWX::SwapInterval(int Interval) +{ + // WX interface only used on Apple +#ifdef __APPLE__ +#if defined USE_WX && USE_WX + NSOpenGLContext *ctx = GLWin.glCtxt->GetWXGLContext(); +#else + NSOpenGLContext *ctx = GLWin.cocoaCtx; +#endif + [ctx setValues: &Interval forParameter: NSOpenGLCPSwapInterval]; +#endif +} + +void cInterfaceWX::Swap() +{ + GLWin.glCanvas->SwapBuffers(); +} + +void cInterfaceWX::UpdateFPSDisplay(const char *text) +{ + // Handled by Host_UpdateTitle() +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceWX::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + GLWin.panel = (wxPanel *)window_handle; + GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, + wxPoint(0, 0), wxSize(_twidth, _theight)); + GLWin.glCanvas->Show(true); + if (GLWin.glCtxt == NULL) // XXX dirty hack + GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); + return true; +} + +bool cInterfaceWX::MakeCurrent() +{ + return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); +} + +// Update window width, size and etc. Called from Render.cpp +void cInterfaceWX::Update() +{ + int width, height; + + GLWin.panel->GetSize(&width, &height); + if (width == s_backbuffer_width && height == s_backbuffer_height) + return; + + GLWin.glCanvas->SetFocus(); + GLWin.glCanvas->SetSize(0, 0, width, height); + GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); + s_backbuffer_width = width; + s_backbuffer_height = height; +} + +// Close backend +void cInterfaceWX::Shutdown() +{ + GLWin.glCanvas->Hide(); +} + + diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h similarity index 51% rename from Source/Core/AudioCommon/Src/AudioCommonConfig.h rename to Source/Core/DolphinWX/Src/GLInterface/WX.h index 76c50c6408..82304942ea 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h @@ -14,39 +14,35 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEWX_H_ +#define _INTERFACEWX_H_ -#ifndef _AUDIO_COMMON_CONFIG_H_ -#define _AUDIO_COMMON_CONFIG_H_ +#if defined HAVE_X11 && HAVE_X11 +#include +#include +#elif defined __APPLE__ +#include +#import +#endif -#include -#include "IniFile.h" +#if defined USE_WX && USE_WX +#include "wx/wx.h" +#include "wx/glcanvas.h" +#endif -// Backend Types -#define BACKEND_NULLSOUND "No audio output" -#define BACKEND_ALSA "ALSA" -#define BACKEND_AOSOUND "AOSound" -#define BACKEND_COREAUDIO "CoreAudio" -#define BACKEND_DIRECTSOUND "DSound" -#define BACKEND_OPENAL "OpenAL" -#define BACKEND_PULSEAUDIO "Pulse" -#define BACKEND_XAUDIO2 "XAudio2" +#include "InterfaceBase.h" -struct AudioCommonConfig +class cInterfaceWX : public cInterfaceBase { - bool m_EnableJIT; - bool m_DumpAudio; - int m_Volume; - std::string sBackend; - int iFrequency; - - // Load from given file - void Load(); - - // Self explanatory - void SaveSettings(); +public: + void SwapInterval(int Interval); + void Swap(); + void UpdateFPSDisplay(const char *Text); + bool Create(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); - // Update according to the values (stream/mixer) void Update(); }; +#endif -#endif //AUDIO_COMMON_CONFIG diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp new file mode 100644 index 0000000000..6a30bb90a6 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp @@ -0,0 +1,220 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Host.h" +#include "RenderBase.h" +#include "VideoConfig.h" +#include "../GLInterface.h" +#include "VertexShaderManager.h" + +void cX11Window::CreateXWindow(void) +{ + Atom wmProtocols[1]; + + // Setup window attributes + GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, + GLWin.parent, GLWin.vi->visual, AllocNone); + GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; + GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); + GLWin.attr.border_pixel = 0; + + // Create the window + GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, + GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + GLWin.vi->depth, InputOutput, GLWin.vi->visual, + CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); + wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); + XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); + XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XMapRaised(GLWin.evdpy, GLWin.win); + XSync(GLWin.evdpy, True); + + GLWin.xEventThread = std::thread(&cX11Window::XEventThread, this); +} + +void cX11Window::DestroyXWindow(void) +{ + XUnmapWindow(GLWin.dpy, GLWin.win); + GLWin.win = 0; + if (GLWin.xEventThread.joinable()) + GLWin.xEventThread.join(); + XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); +} + +void cX11Window::XEventThread() +{ + // Free look variables + static bool mouseLookEnabled = false; + static bool mouseMoveEnabled = false; + static float lastMouse[2]; + while (GLWin.win) + { + XEvent event; + KeySym key; + for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) + { + XNextEvent(GLWin.evdpy, &event); + switch(event.type) { + case KeyPress: + key = XLookupKeysym((XKeyEvent*)&event, 0); + if (g_Config.bOSDHotKey) + { + switch (key) + { + case XK_3: + OSDChoice = 1; + // Toggle native resolution + g_Config.iEFBScale = g_Config.iEFBScale + 1; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + break; + + case XK_4: + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + break; + + case XK_5: + OSDChoice = 3; + // Toggle EFB copy + if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + { + g_Config.bEFBCopyEnable ^= true; + g_Config.bCopyEFBToTexture = false; + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + break; + + case XK_6: + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + break; + + default: + break; + } + } + if (g_Config.bFreeLook) + { + static float debugSpeed = 1.0f; + switch (key) + { + case XK_parenleft: + debugSpeed /= 2.0f; + break; + case XK_parenright: + debugSpeed *= 2.0f; + break; + case XK_w: + VertexShaderManager::TranslateView(0.0f, debugSpeed); + break; + case XK_s: + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + break; + case XK_a: + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + break; + case XK_d: + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + break; + case XK_r: + VertexShaderManager::ResetView(); + break; + } + } + break; + case ButtonPress: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseMoveEnabled = true; + break; + case 3: // Right button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseLookEnabled = true; + break; + } + } + break; + case ButtonRelease: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + mouseMoveEnabled = false; + break; + case 3: // Right button + mouseLookEnabled = false; + break; + } + } + break; + case MotionNotify: + if (g_Config.bFreeLook) + { + if (mouseLookEnabled) + { + VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, + (event.xmotion.y - lastMouse[1]) / 200.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + + if (mouseMoveEnabled) + { + VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, + (event.xmotion.y - lastMouse[1]) / 50.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + } + break; + case ConfigureNotify: + Window winDummy; + unsigned int borderDummy, depthDummy; + XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, + &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); + GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height); + break; + case ClientMessage: + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) + Host_Message(WM_USER_STOP); + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "RESIZE", False)) + XMoveResizeWindow(GLWin.evdpy, GLWin.win, + event.xclient.data.l[1], event.xclient.data.l[2], + event.xclient.data.l[3], event.xclient.data.l[4]); + break; + default: + break; + } + } + Common::SleepCurrentThread(20); + } +} + + diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h new file mode 100644 index 0000000000..9e6f6d5e3c --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h @@ -0,0 +1,31 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _X11_UTIL_H_ +#define _X11_UTIL_H_ + +#include +#include + +class cX11Window +{ +private: + void XEventThread(); +public: + void CreateXWindow(void); + void DestroyXWindow(void); +}; +#endif diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 4a7d7d5dce..6fd298ad81 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -36,6 +37,7 @@ #include "Main.h" #include "../resources/Flag_Europe.xpm" +#include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" #include "../resources/Flag_Italy.xpm" #include "../resources/Flag_Japan.xpm" @@ -43,6 +45,8 @@ #include "../resources/Flag_Taiwan.xpm" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" +#include "../resources/Flag_SDK.xpm" + #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" #include "../resources/Platform_Gamecube.xpm" @@ -51,6 +55,9 @@ size_t CGameListCtrl::m_currentItem = 0; size_t CGameListCtrl::m_numberItem = 0; std::string CGameListCtrl::m_currentFilename; +bool sorted = false; + +extern CFrame* main_frame; static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2, long sortData = CGameListCtrl::COLUMN_TITLE) @@ -89,6 +96,13 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is switch(sortData) { case CGameListCtrl::COLUMN_TITLE: + if (!strcasecmp(iso1->GetName(indexOne).c_str(),iso2->GetName(indexOther).c_str())) + { + if (iso1->IsDiscTwo()) + return 1 * t; + else if (iso2->IsDiscTwo()) + return -1 * t; + } return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; case CGameListCtrl::COLUMN_NOTES: @@ -190,6 +204,8 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = + m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = @@ -203,7 +219,7 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = - m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); + m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); @@ -258,6 +274,7 @@ void CGameListCtrl::BrowseForDirectory() void CGameListCtrl::Update() { + int scrollPos = wxWindow::GetScrollPos(wxVERTICAL); // Don't let the user refresh it while a game is running if (Core::GetState() != Core::CORE_UNINITIALIZED) return; @@ -284,6 +301,7 @@ void CGameListCtrl::Update() InitBitmaps(); // add columns + InsertColumn(COLUMN_DUMMY,_T("")); InsertColumn(COLUMN_PLATFORM, _T("")); InsertColumn(COLUMN_BANNER, _("Banner")); InsertColumn(COLUMN_TITLE, _("Title")); @@ -303,6 +321,7 @@ void CGameListCtrl::Update() #endif // set initial sizes for columns + SetColumnWidth(COLUMN_DUMMY,0); SetColumnWidth(COLUMN_PLATFORM, 35 + platform_padding); SetColumnWidth(COLUMN_BANNER, 96 + platform_padding); SetColumnWidth(COLUMN_TITLE, 200 + platform_padding); @@ -319,10 +338,17 @@ void CGameListCtrl::Update() } // Sort items by Title + if (!sorted) + last_column = 0; + sorted = false; wxListEvent event; - event.m_col = COLUMN_TITLE; last_column = 0; + event.m_col = SConfig::GetInstance().m_ListSort2; OnColumnClick(event); + event.m_col = SConfig::GetInstance().m_ListSort; + OnColumnClick(event); + sorted = true; + SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); } else @@ -349,10 +375,13 @@ void CGameListCtrl::Update() SetItemFont(index, *wxITALIC_FONT); SetColumnWidth(0, wxLIST_AUTOSIZE); } - + if (GetSelectedISO() == NULL) + main_frame->UpdateGUI(); Show(); AutomaticColumnWidth(); + ScrollLines(scrollPos); + SetFocus(); } wxString NiceSizeFormat(s64 _size) @@ -414,9 +443,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) GameListItem& rISOFile = *m_ISOFiles[_Index]; m_gamePath.append(rISOFile.GetFileName() + '\n'); - // Insert a first row with the platform image, that will be used as the Index - long ItemIndex = InsertItem(_Index, wxEmptyString, - m_PlatformImageIndex[rISOFile.GetPlatform()]); + // Insert a first row with nothing in it, that will be used as the Index + long ItemIndex = InsertItem(_Index, wxEmptyString); + + // Insert the platform's image in the first (visible) column + SetItemColumnImage(_Index, COLUMN_PLATFORM, m_PlatformImageIndex[rISOFile.GetPlatform()]); if (rISOFile.GetImage().IsOk()) ImageIndex = m_imageListSmall->Add(rISOFile.GetImage()); @@ -452,14 +483,15 @@ void CGameListCtrl::InsertItemInReportView(long _Index) SelectedLanguage = 0; default: { - wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); - rISOFile.GetName(wstring_name, SelectedLanguage); + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); + rISOFile.GetName(wstring_name, SelectedLanguage); - name = wxString(rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252); - m_gameList.append(StringFromFormat("%s (%c)\n", - rISOFile.GetName(SelectedLanguage).c_str(), (rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA)?'U':'E')); - description = wxString(company.size() ? company.c_str() : - rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252); + name = wxString(rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252); + m_gameList.append(StringFromFormat("%s (%c)\n", + rISOFile.GetName(SelectedLanguage).c_str(), + (rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA) ? 'U' : 'E')); + description = wxString(company.size() ? company.c_str() : + rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252); } break; } @@ -652,7 +684,11 @@ void CGameListCtrl::ScanForISOs() for (std::vector::const_iterator iter = drives.begin(); iter != drives.end(); ++iter) { + #ifdef __APPLE__ std::auto_ptr gli(new GameListItem(*iter)); + #else + std::unique_ptr gli(new GameListItem(*iter)); + #endif if (gli->IsValid()) m_ISOFiles.push_back(gli.release()); @@ -697,17 +733,25 @@ void CGameListCtrl::OnColumnClick(wxListEvent& event) if(event.GetColumn() != COLUMN_BANNER) { int current_column = event.GetColumn(); - - if(last_column == current_column) + if (sorted) { - last_sort = -last_sort; + if (last_column == current_column) + { + last_sort = -last_sort; + } + else + { + SConfig::GetInstance().m_ListSort2 = last_sort; + last_column = current_column; + last_sort = current_column; + } + SConfig::GetInstance().m_ListSort = last_sort; } else { - last_column = current_column; last_sort = current_column; + last_column = current_column; } - caller = this; SortItems(wxListCompare, last_sort); } @@ -904,7 +948,8 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event) { if (selected_iso->IsCompressed()) popupMenu->Append(IDM_COMPRESSGCM, _("Decompress ISO...")); - else + else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" + && selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs") popupMenu->Append(IDM_COMPRESSGCM, _("Compress ISO...")); } else popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu")); @@ -933,7 +978,7 @@ const GameListItem * CGameListCtrl::GetSelectedISO() { long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == wxNOT_FOUND) - return new GameListItem(""); // TODO: wtf is this + return NULL; else { // Here is a little workaround for multiselections: @@ -953,9 +998,11 @@ void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event)) const GameListItem *iso = GetSelectedISO(); if (!iso) return; - std::string path; - SplitPath(iso->GetFileName(), &path, 0, 0); - WxUtils::Explore(path.c_str()); + + wxString strPath(iso->GetFileName().c_str(), wxConvUTF8); + wxFileName path = wxFileName::FileName(strPath); + path.MakeAbsolute(); + WxUtils::Explore(path.GetPath().char_str()); } void CGameListCtrl::OnOpenSaveFolder(wxCommandEvent& WXUNUSED (event)) @@ -1055,7 +1102,7 @@ void CGameListCtrl::OnWiki(wxCommandEvent& WXUNUSED (event)) if (!iso) return; - std::string wikiUrl = "http://api.dolphin-emulator.com/wiki.html?id=[GAME_ID]&name=[GAME_NAME]"; + std::string wikiUrl = "http://wiki.dolphin-emu.org/dolphin-redirect.php?gameid=[GAME_ID]"; wikiUrl = ReplaceAll(wikiUrl, "[GAME_ID]", UriEncode(iso->GetUniqueID())); if (UriEncode(iso->GetName(0)).length() < 100) wikiUrl = ReplaceAll(wikiUrl, "[GAME_NAME]", UriEncode(iso->GetName(0))); @@ -1095,6 +1142,9 @@ void CGameListCtrl::CompressSelection(bool _compress) if (browseDialog.ShowModal() != wxID_OK) return; + bool all_good = true; + + { wxProgressDialog progressDialog( _compress ? _("Compressing ISO") : _("Decompressing ISO"), _("Working..."), @@ -1131,7 +1181,7 @@ void CGameListCtrl::CompressSelection(bool _compress) wxYES_NO) == wxNO) continue; - DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), + all_good &= DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), OutputFileName.c_str(), (iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0, 16384, &MultiCompressCB, &progressDialog); @@ -1159,11 +1209,16 @@ void CGameListCtrl::CompressSelection(bool _compress) wxYES_NO) == wxNO) continue; - DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), + all_good &= DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), OutputFileName.c_str(), &MultiCompressCB, &progressDialog); } m_currentItem++; } + } + + if (!all_good) + wxMessageBox(_("Dolphin was unable to complete the requested action.")); + Update(); } @@ -1223,6 +1278,9 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) _("Confirm File Overwrite"), wxYES_NO) == wxNO); + bool all_good = false; + + { wxProgressDialog dialog( iso->IsCompressed() ? _("Decompressing ISO") : _("Compressing ISO"), _("Working..."), @@ -1233,14 +1291,19 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) wxPD_SMOOTH ); + if (iso->IsCompressed()) - DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), + all_good = DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), path.char_str(), &CompressCB, &dialog); else - DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), + all_good = DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), path.char_str(), (iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0, 16384, &CompressCB, &dialog); + } + + if (!all_good) + wxMessageBox(_("Dolphin was unable to complete the requested action.")); Update(); } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 274cfdb7ee..5d97c12724 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -57,7 +57,8 @@ public: enum { - COLUMN_PLATFORM = 0, + COLUMN_DUMMY = 0, + COLUMN_PLATFORM, COLUMN_BANNER, COLUMN_TITLE, COLUMN_NOTES, diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index cffeb25e7f..e015c55ae8 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -18,8 +18,6 @@ #include -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - namespace Gecko { @@ -31,8 +29,8 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) { m_listbox_gcodes = new wxCheckListBox(this, -1, wxDefaultPosition, wxDefaultSize); - _connect_macro_(m_listbox_gcodes, CodeConfigPanel::UpdateInfoBox, wxEVT_COMMAND_LISTBOX_SELECTED, this); - _connect_macro_(m_listbox_gcodes, CodeConfigPanel::ToggleCode, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_listbox_gcodes->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &CodeConfigPanel::UpdateInfoBox, this); + m_listbox_gcodes->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &CodeConfigPanel::ToggleCode, this); m_infobox.label_name = new wxStaticText(this, -1, wxGetTranslation(wxstr_name)); m_infobox.label_creator = new wxStaticText(this, -1, wxGetTranslation(wxstr_creator)); @@ -53,7 +51,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) // button sizer wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL); wxButton* const btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1)); - _connect_macro_(btn_download, CodeConfigPanel::DownloadCodes, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_download->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CodeConfigPanel::DownloadCodes, this); sizer_buttons->AddStretchSpacer(1); sizer_buttons->Add(btn_download, 1, wxEXPAND); diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index 8089a2622c..85ac104923 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -26,8 +26,6 @@ enum { - Toolbar_DebugGo, - Toolbar_DebugPause, Toolbar_Step, Toolbar_StepOver, Toolbar_Skip, @@ -80,6 +78,8 @@ enum IDM_RECORDEXPORT, IDM_RECORDREADONLY, IDM_TASINPUT, + IDM_TOGGLE_PAUSEMOVIE, + IDM_SHOWLAG, IDM_FRAMESTEP, IDM_SCREENSHOT, IDM_BROWSE, diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp index ecd4f49ace..c214fac466 100644 --- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp @@ -56,9 +56,7 @@ void HotkeyConfigDialog::SaveButtonMapping(int Id, int Key, int Modkey) void HotkeyConfigDialog::EndGetButtons(void) { - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(HotkeyConfigDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Unbind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this); m_ButtonMappingTimer->Stop(); GetButtonWaitingTimer = 0; GetButtonWaitingID = 0; @@ -153,9 +151,7 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event) if (m_ButtonMappingTimer->IsRunning()) return; - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(HotkeyConfigDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this); // Get the button ClickedButton = (wxButton *)event.GetEventObject(); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 9734e97131..833268ad63 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -34,9 +34,9 @@ #include "FileSearch.h" #include "CompressedBlob.h" #include "ChunkFile.h" -#include "../resources/no_banner.cpp" +#include "ConfigManager.h" -#define CACHE_REVISION 0x10D +#define CACHE_REVISION 0x10F #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -91,6 +91,7 @@ GameListItem::GameListItem(const std::string& _rFileName) m_UniqueID = pVolume->GetUniqueID(); m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName.c_str()); + m_IsDiscTwo = pVolume->IsDiscTwo(); // check if we can get some infos from the banner file too DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); @@ -140,8 +141,8 @@ GameListItem::GameListItem(const std::string& _rFileName) SplitPath(m_FileName, NULL, &FileName, NULL); int length = FileName.length(); wFileName.reserve(length+1); - for (int i = 0; i < length; ++i) - wFileName.push_back(FileName[i]); + for (int j = 0; j < length; ++j) + wFileName.push_back(FileName[j]); wFileName.push_back(0); } *i = wFileName; @@ -173,10 +174,16 @@ GameListItem::GameListItem(const std::string& _rFileName) } else { + std::string theme = SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"; + std::string dir = File::GetUserPath(D_THEMES_IDX) + theme; + +#if !defined(_WIN32) + // If theme does not exist in user's dir load from shared directory + if (!File::Exists(dir)) + dir = SHARED_USER_DIR THEMES_DIR "/" + theme; +#endif // default banner - wxMemoryInputStream istream(no_banner_png, sizeof no_banner_png); - wxImage iNoBanner(istream, wxBITMAP_TYPE_PNG); - m_Image = iNoBanner; + m_Image = wxImage(dir + "nobanner.png", wxBITMAP_TYPE_PNG); } } @@ -235,6 +242,7 @@ void GameListItem::DoState(PointerWrap &p) p.Do(m_BlobCompressed); p.Do(m_pImage); p.Do(m_Platform); + p.Do(m_IsDiscTwo); } std::string GameListItem::CreateCacheFilename() @@ -283,9 +291,9 @@ bool GameListItem::GetName(std::wstring& wName, int index) const // This function will only succeed for wii discs with banners or WADs // utilize the same array as for gc discs (-1= Japanese, 0 = English etc index++; - if ((index >=0) && (index < 10)) + if ((index >= 0) && (index < 10)) { - if (m_wNames.size() > index) + if (m_wNames.size() > (size_t)index) { wName = m_wNames[index]; return true; diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index fe7d3d6c6c..e58dcf7713 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -48,6 +48,7 @@ public: bool IsCompressed() const {return m_BlobCompressed;} u64 GetFileSize() const {return m_FileSize;} u64 GetVolumeSize() const {return m_VolumeSize;} + bool IsDiscTwo() const {return m_IsDiscTwo;} #if defined(HAVE_WX) && HAVE_WX const wxImage& GetImage() const {return m_Image;} #endif @@ -87,6 +88,7 @@ private: bool m_BlobCompressed; std::vector m_pImage; u32 m_ImageSize; + bool m_IsDiscTwo; bool LoadFromCache(); void SaveToCache(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index f004989055..c44aad5d5b 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -212,8 +212,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW // Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title ChangeBannerDetails((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); m_Banner->SetBitmap(OpenGameListItem->GetImage()); - m_Banner->Connect(wxID_ANY, wxEVT_RIGHT_DOWN, - wxMouseEventHandler(CISOProperties::RightClickOnBanner), (wxObject*)NULL, this); + m_Banner->Bind(wxEVT_RIGHT_DOWN, &CISOProperties::RightClickOnBanner, this); // Filesystem browser/dumper // TODO : Should we add a way to browse the wad file ? @@ -316,10 +315,10 @@ void CISOProperties::CreateGUIControls(bool IsWad) SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - MMUBAT = new wxCheckBox(m_GameConfig, ID_MMUBAT, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - MMUBAT->SetToolTip(_("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)")); TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game.")); + DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("Accurate VBeam emulation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); VBeam->SetToolTip(_("If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)")); FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); @@ -328,10 +327,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Wii Console - EnableProgressiveScan = new wxCheckBox(m_GameConfig, ID_ENABLEPROGRESSIVESCAN, _("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker = new wxCheckBox(m_GameConfig, ID_DISABLEWIIMOTESPEAKER, _("Alternate Wiimote Timing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); // Video UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); @@ -366,7 +362,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5); sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5); sbCoreOverrides->Add(MMU, 0, wxLEFT, 5); - sbCoreOverrides->Add(MMUBAT, 0, wxLEFT, 5); + sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5); sbCoreOverrides->Add(TLBHack, 0, wxLEFT, 5); sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5); @@ -378,20 +374,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) { sbWiiOverrides->ShowItems(false); - EnableProgressiveScan->Hide(); EnableWideScreen->Hide(); - DisableWiimoteSpeaker->Hide(); } - else - { - // Progressive Scan is not used by Dolphin itself, and changing it on a per-game - // basis would have the side-effect of changing the SysConf, making this setting - // rather useless. - EnableProgressiveScan->Disable(); - } - sbWiiOverrides->Add(EnableProgressiveScan, 0, wxLEFT, 5); sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); - sbWiiOverrides->Add(DisableWiimoteSpeaker, 0, wxLEFT, 5); wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); @@ -687,14 +672,13 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event)) void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolder, const int partitionNum) { char exportName[512]; - u32 index[2] = {0, 0}, offsetShift = 0; + u32 index[2] = {0, 0}; std::vector fst; DiscIO::IFileSystem *FS = 0; if (DiscIO::IsVolumeWiiDisc(OpenISO)) { FS = WiiDisc.at(partitionNum).FileSystem; - offsetShift = 2; } else FS = pFileSystem; @@ -942,16 +926,16 @@ void CISOProperties::LoadGameConfig() else MMU->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Core", "BAT", &bTemp)) - MMUBAT->Set3StateValue((wxCheckBoxState)bTemp); - else - MMUBAT->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Core", "TLBHack", &bTemp)) TLBHack->Set3StateValue((wxCheckBoxState)bTemp); else TLBHack->Set3StateValue(wxCHK_UNDETERMINED); + if (GameIni.Get("Core", "DCBZ", &bTemp)) + DCBZOFF->Set3StateValue((wxCheckBoxState)bTemp); + else + DCBZOFF->Set3StateValue(wxCHK_UNDETERMINED); + if (GameIni.Get("Core", "VBeam", &bTemp)) VBeam->Set3StateValue((wxCheckBoxState)bTemp); else @@ -972,22 +956,12 @@ void CISOProperties::LoadGameConfig() else DSPHLE->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Display", "ProgressiveScan", &bTemp)) - EnableProgressiveScan->Set3StateValue((wxCheckBoxState)bTemp); - else - EnableProgressiveScan->Set3StateValue(wxCHK_UNDETERMINED); - // ?? if (GameIni.Get("Wii", "Widescreen", &bTemp)) EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp); else EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Wii", "DisableWiimoteSpeaker", &bTemp)) - DisableWiimoteSpeaker->Set3StateValue((wxCheckBoxState)bTemp); - else - DisableWiimoteSpeaker->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "UseBBox", &bTemp)) UseBBox->Set3StateValue((wxCheckBoxState)bTemp); else @@ -1016,7 +990,6 @@ void CISOProperties::LoadGameConfig() if (!sTemp.empty()) { EmuIssues->SetValue(wxString(sTemp.c_str(), *wxConvCurrent)); - bRefreshList = true; } EmuIssues->Enable(EmuState->GetSelection() != 0); @@ -1042,16 +1015,16 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Core", "MMU", MMU->Get3StateValue()); - if (MMUBAT->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "BAT"); - else - GameIni.Set("Core", "BAT", MMUBAT->Get3StateValue()); - if (TLBHack->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Core", "TLBHack"); else GameIni.Set("Core", "TLBHack", TLBHack->Get3StateValue()); + if (DCBZOFF->Get3StateValue() == wxCHK_UNDETERMINED) + GameIni.DeleteKey("Core", "DCBZ"); + else + GameIni.Set("Core", "DCBZ", DCBZOFF->Get3StateValue()); + if (VBeam->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Core", "VBeam"); else @@ -1072,21 +1045,11 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Core", "DSPHLE", DSPHLE->Get3StateValue()); - if (EnableProgressiveScan->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Display", "ProgressiveScan"); - else - GameIni.Set("Display", "ProgressiveScan", EnableProgressiveScan->Get3StateValue()); - if (EnableWideScreen->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Wii", "Widescreen"); else GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - if (DisableWiimoteSpeaker->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Wii", "DisableWiimoteSpeaker"); - else - GameIni.Set("Wii", "DisableWiimoteSpeaker", DisableWiimoteSpeaker->Get3StateValue()); - if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "UseBBox"); else @@ -1107,6 +1070,11 @@ bool CISOProperties::SaveGameConfig() GameIni.Set("Video", "PH_ZFar", PHack_Data.PHZFar); GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection()); + + std::string sTemp; + GameIni.Get("EmuState","EmulationIssues", &sTemp); + if (EmuIssues->GetValue() != sTemp) + bRefreshList = true; GameIni.Set("EmuState", "EmulationIssues", (const char*)EmuIssues->GetValue().mb_str(*wxConvCurrent)); PatchList_Save(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index da275136fe..499b242516 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -69,10 +69,10 @@ private: DECLARE_EVENT_TABLE(); // Core - wxCheckBox *CPUThread, *SkipIdle, *MMU, *MMUBAT, *TLBHack; + wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *TLBHack; wxCheckBox *VBeam, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii - wxCheckBox *EnableProgressiveScan, *EnableWideScreen, *DisableWiimoteSpeaker; + wxCheckBox *EnableWideScreen; // Video wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox; wxButton *PHSettings; @@ -127,7 +127,7 @@ private: ID_USEDUALCORE, ID_IDLESKIP, ID_MMU, - ID_MMUBAT, + ID_DCBZOFF, ID_TLBHACK, ID_VBEAM, ID_DISCSPEED, @@ -139,7 +139,6 @@ private: ID_PHSETTINGS, ID_ENABLEPROGRESSIVESCAN, ID_ENABLEWIDESCREEN, - ID_DISABLEWIIMOTESPEAKER, ID_EDITCONFIG, ID_EMUSTATE, ID_EMU_ISSUES, diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp index b3d57ae89c..1efcf98af6 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp @@ -18,7 +18,6 @@ #include "InputConfigDiag.h" #include "UDPConfigDiag.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) #define WXSTR_FROM_STR(s) (wxString::FromUTF8((s).c_str())) #define WXTSTR_FROM_CSTR(s) (wxGetTranslation(wxString::FromUTF8(s))) #define STR_FROM_WXSTR(w) (std::string((w).ToUTF8())) @@ -123,10 +122,10 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, Con //device_cbox = new wxComboBox(this, -1, WXSTR_FROM_STR(ref->device_qualifier.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); device_cbox = new wxComboBox(this, -1, WXSTR_FROM_STR(m_devq.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); - _connect_macro_(device_cbox, ControlDialog::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this); - _connect_macro_(device_cbox, ControlDialog::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this); + device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &ControlDialog::SetDevice, this); + device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &ControlDialog::SetDevice, this); - wxStaticBoxSizer* const control_chooser = CreateControlChooser(this, parent); + wxStaticBoxSizer* const control_chooser = CreateControlChooser(parent); wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer(wxVERTICAL, this, _("Device")); d_szr->Add(device_cbox, 0, wxEXPAND|wxALL, 5); @@ -406,7 +405,7 @@ void GamepadPage::AdjustControlOption(wxCommandEvent&) m_control_dialog->control_reference->range = (ControlState)(m_control_dialog->range_slider->GetValue()) / SLIDER_TICK_COUNT; } -void GamepadPage::ConfigControl(wxCommandEvent& event) +void GamepadPage::ConfigControl(wxEvent& event) { m_control_dialog = new ControlDialog(this, m_plugin, ((ControlButton*)event.GetEventObject())->control_reference); m_control_dialog->ShowModal(); @@ -416,7 +415,7 @@ void GamepadPage::ConfigControl(wxCommandEvent& event) UpdateGUI(); } -void GamepadPage::ClearControl(wxCommandEvent& event) +void GamepadPage::ClearControl(wxEvent& event) { ControlButton* const btn = (ControlButton*)event.GetEventObject(); btn->control_reference->expression.clear(); @@ -480,24 +479,24 @@ void GamepadPage::DetectControl(wxCommandEvent& event) } } -wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wxWindow* const eventsink) +wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) { - wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? _("Input") : _("Output")); + wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output")); - textctrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE); + textctrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE); - wxButton* const detect_button = new wxButton(parent, -1, control_reference->is_input ? _("Detect") : _("Test")); + wxButton* const detect_button = new wxButton(this, -1, control_reference->is_input ? _("Detect") : _("Test")); - wxButton* const clear_button = new wxButton(parent, -1, _("Clear")); - wxButton* const set_button = new wxButton(parent, -1, _("Set")); + wxButton* const clear_button = new wxButton(this, -1, _("Clear")); + wxButton* const set_button = new wxButton(this, -1, _("Set")); - wxButton* const select_button = new wxButton(parent, -1, _("Select")); - _connect_macro_(select_button, ControlDialog::SetSelectedControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + wxButton* const select_button = new wxButton(this, -1, _("Select")); + select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this); - wxButton* const or_button = new wxButton(parent, -1, _("| OR"), wxDefaultPosition); - _connect_macro_(or_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + wxButton* const or_button = new wxButton(this, -1, _("| OR"), wxDefaultPosition); + or_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); - control_lbox = new wxListBox(parent, -1, wxDefaultPosition, wxSize(-1, 64)); + control_lbox = new wxListBox(this, -1, wxDefaultPosition, wxSize(-1, 64)); wxBoxSizer* const button_sizer = new wxBoxSizer(wxVERTICAL); button_sizer->Add(detect_button, 1, 0, 5); @@ -507,30 +506,30 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wx if (control_reference->is_input) { // TODO: check if && is good on other OS - wxButton* const and_button = new wxButton(parent, -1, _("&& AND"), wxDefaultPosition); - wxButton* const not_button = new wxButton(parent, -1, _("! NOT"), wxDefaultPosition); - wxButton* const add_button = new wxButton(parent, -1, _("^ ADD"), wxDefaultPosition); + wxButton* const and_button = new wxButton(this, -1, _("&& AND"), wxDefaultPosition); + wxButton* const not_button = new wxButton(this, -1, _("! NOT"), wxDefaultPosition); + wxButton* const add_button = new wxButton(this, -1, _("^ ADD"), wxDefaultPosition); - _connect_macro_(and_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(not_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(add_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + and_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); + not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); + add_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); button_sizer->Add(and_button, 1, 0, 5); button_sizer->Add(not_button, 1, 0, 5); button_sizer->Add(add_button, 1, 0, 5); } - range_slider = new wxSlider(parent, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); + range_slider = new wxSlider(this, -1, SLIDER_TICK_COUNT, -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT)); - _connect_macro_(detect_button, ControlDialog::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(clear_button, ControlDialog::ClearControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(set_button, ControlDialog::SetControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + detect_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::DetectControl, this); + clear_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::ClearControl, this); + set_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetControl, this); - _connect_macro_(range_slider, GamepadPage::AdjustControlOption, wxEVT_SCROLL_CHANGED, eventsink); - wxStaticText* const range_label = new wxStaticText(parent, -1, _("Range")); - m_bound_label = new wxStaticText(parent, -1, wxT("")); + range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent); + wxStaticText* const range_label = new wxStaticText(this, -1, _("Range")); + m_bound_label = new wxStaticText(this, -1, wxT("")); wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL); range_sizer->Add(range_label, 0, wxCENTER|wxLEFT, 5); @@ -668,7 +667,7 @@ ControlGroupBox::~ControlGroupBox() delete *i; } -ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, wxWindow* const eventsink) +ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink) : wxBoxSizer(wxVERTICAL) , control_group(group) { @@ -691,16 +690,16 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin if ((*ci)->control_ref->is_input) { control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); - _connect_macro_(control_button, GamepadPage::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DetectControl, eventsink); } else { control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear.")); - _connect_macro_(control_button, GamepadPage::ConfigControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigControl, eventsink); } - _connect_macro_(control_button, GamepadPage::ClearControl, wxEVT_MIDDLE_DOWN, eventsink); - _connect_macro_(control_button, GamepadPage::ConfigControl, wxEVT_RIGHT_UP, eventsink); + control_button->Bind(wxEVT_MIDDLE_DOWN, &GamepadPage::ClearControl, eventsink); + control_button->Bind(wxEVT_RIGHT_UP, &GamepadPage::ConfigControl, eventsink); wxBoxSizer* const control_sizer = new wxBoxSizer(wxHORIZONTAL); control_sizer->AddStretchSpacer(1); @@ -733,7 +732,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingSpin* setting = new PadSettingSpin(parent, *i); - _connect_macro_(setting->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting); szr->Add(new wxStaticText(parent, -1, WXTSTR_FROM_CSTR((*i)->name))); szr->Add(setting->wxcontrol, 0, wxLEFT, 0); @@ -754,7 +753,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin static_bitmap = new wxStaticBitmap(parent, -1, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP); PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]); - _connect_macro_(threshold_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + threshold_cbox->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons.")); @@ -793,7 +792,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingSpin* setting = new PadSettingSpin(parent, *i); - _connect_macro_(setting->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting); wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); szr->Add(new wxStaticText(parent, -1, WXTSTR_FROM_CSTR((*i)->name)), 0, wxCENTER|wxRIGHT, 3); @@ -811,8 +810,8 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin options.push_back(attachments); - _connect_macro_(attachments->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_CHOICE_SELECTED, eventsink); - _connect_macro_(configure_btn, GamepadPage::ConfigExtension, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + attachments->wxcontrol->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &GamepadPage::AdjustSetting, eventsink); + configure_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigExtension, eventsink); Add(attachments->wxcontrol, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 3); Add(configure_btn, 0, wxALL|wxEXPAND, 3); @@ -821,7 +820,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin case GROUP_TYPE_UDPWII: { wxButton* const btn = new UDPConfigButton(parent, (UDPWrapper*)group); - _connect_macro_(btn, GamepadPage::ConfigUDPWii, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigUDPWii, eventsink); Add(btn, 0, wxALL|wxEXPAND, 3); } break; @@ -835,7 +834,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingCheckBox* setting_cbox = new PadSettingCheckBox(parent, (*i)->value, (*i)->name); - _connect_macro_(setting_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_CHECKBOX_CLICKED, eventsink); + setting_cbox->wxcontrol->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting_cbox); Add(setting_cbox->wxcontrol, 0, wxALL|wxLEFT, 5); @@ -850,7 +849,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin //AddStretchSpacer(0); } -ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, wxWindow* const eventsink, std::vector* groups) +ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector* groups) : wxBoxSizer(wxHORIZONTAL) { size_t col_size = 0; @@ -906,9 +905,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i wxButton* refresh_button = new wxButton(this, -1, _("Refresh"), wxDefaultPosition, wxSize(60,-1)); - _connect_macro_(device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this); - _connect_macro_(device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this); - _connect_macro_(refresh_button, GamepadPage::RefreshDevices, wxEVT_COMMAND_BUTTON_CLICKED, this); + device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &GamepadPage::SetDevice, this); + device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &GamepadPage::SetDevice, this); + refresh_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::RefreshDevices, this); device_sbox->Add(device_cbox, 1, wxLEFT|wxRIGHT, 3); device_sbox->Add(refresh_button, 0, wxRIGHT|wxBOTTOM, 3); @@ -920,8 +919,8 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i clear_sbox->Add(default_button, 1, wxLEFT, 3); clear_sbox->Add(clearall_button, 1, wxRIGHT, 3); - _connect_macro_(clearall_button, GamepadPage::ClearAll, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(default_button, GamepadPage::LoadDefaults, wxEVT_COMMAND_BUTTON_CLICKED, this); + clearall_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ClearAll, this); + default_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadDefaults, this); profile_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1)); @@ -929,9 +928,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i wxButton* const psave_btn = new wxButton(this, -1, _("Save"), wxDefaultPosition, wxSize(48,-1)); wxButton* const pdelete_btn = new wxButton(this, -1, _("Delete"), wxDefaultPosition, wxSize(60,-1)); - _connect_macro_(pload_btn, GamepadPage::LoadProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(psave_btn, GamepadPage::SaveProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(pdelete_btn, GamepadPage::DeleteProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); + pload_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadProfile, this); + psave_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::SaveProfile, this); + pdelete_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DeleteProfile, this); profile_sbox->Add(profile_cbox, 1, wxLEFT, 3); profile_sbox->Add(pload_btn, 0, wxLEFT, 3); @@ -972,7 +971,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin UpdateDeviceComboBox(); UpdateProfileComboBox(); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InputConfigDialog::ClickSave)); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputConfigDialog::ClickSave, this, wxID_OK); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); szr->Add(m_pad_notebook, 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, 5); @@ -983,7 +982,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin // live preview update timer m_update_timer = new wxTimer(this, -1); - Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(InputConfigDialog::UpdateBitmaps), (wxObject*)0, this); + Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this); m_update_timer->Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS); } diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h index 53f06a1144..1be97bff14 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.h +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h @@ -100,7 +100,7 @@ class ControlDialog : public wxDialog public: ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref); - wxStaticBoxSizer* CreateControlChooser(wxWindow* const parent, wxWindow* const eventsink); + wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent); void DetectControl(wxCommandEvent& event); void ClearControl(wxCommandEvent& event); @@ -159,7 +159,7 @@ public: class ControlGroupBox : public wxBoxSizer { public: - ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, wxWindow* const eventsink); + ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink); ~ControlGroupBox(); std::vector options; @@ -172,7 +172,7 @@ public: class ControlGroupsSizer : public wxBoxSizer { public: - ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, wxWindow* const eventsink, std::vector* const groups = NULL); + ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector* const groups = NULL); }; class InputConfigDialog; @@ -193,8 +193,8 @@ public: void SaveProfile(wxCommandEvent& event); void DeleteProfile(wxCommandEvent& event); - void ConfigControl(wxCommandEvent& event); - void ClearControl(wxCommandEvent& event); + void ConfigControl(wxEvent& event); + void ClearControl(wxEvent& event); void DetectControl(wxCommandEvent& event); void ConfigExtension(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp index d771a75c30..162647c64d 100644 --- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp @@ -21,9 +21,6 @@ #include "LogWindow.h" #include "FileUtil.h" -#define _connect_macro_(b, f, c, s) \ - (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id) : wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration")) , m_LogWindow(log_window), enableAll(true) @@ -53,29 +50,29 @@ void LogConfigWindow::CreateGUIControls() m_verbosity = new wxRadioBox(this, wxID_ANY, _("Verbosity"), wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxRA_SPECIFY_ROWS, wxDefaultValidator); - _connect_macro_(m_verbosity, LogConfigWindow::OnVerbosityChange, wxEVT_COMMAND_RADIOBOX_SELECTED, this); + m_verbosity->Bind(wxEVT_COMMAND_RADIOBOX_SELECTED, &LogConfigWindow::OnVerbosityChange, this); // Options m_writeFileCB = new wxCheckBox(this, wxID_ANY, _("Write to File")); - _connect_macro_(m_writeFileCB, LogConfigWindow::OnWriteFileChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeFileCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteFileChecked, this); m_writeConsoleCB = new wxCheckBox(this, wxID_ANY, _("Write to Console")); - _connect_macro_(m_writeConsoleCB, LogConfigWindow::OnWriteConsoleChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeConsoleCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteConsoleChecked, this); m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window")); - _connect_macro_(m_writeWindowCB, LogConfigWindow::OnWriteWindowChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeWindowCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteWindowChecked, this); m_writeDebuggerCB = NULL; #ifdef _MSC_VER if (IsDebuggerPresent()) { m_writeDebuggerCB = new wxCheckBox(this, wxID_ANY, _("Write to Debugger")); - _connect_macro_(m_writeDebuggerCB, LogConfigWindow::OnWriteDebuggerChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeDebuggerCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteDebuggerChecked, this); } #endif wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); - _connect_macro_(btn_toggle_all, LogConfigWindow::OnToggleAll, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_toggle_all->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &LogConfigWindow::OnToggleAll, this); m_checks = new wxCheckListBox(this, wxID_ANY); - _connect_macro_(m_checks, LogConfigWindow::OnLogCheck, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_checks->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &LogConfigWindow::OnLogCheck, this); for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) m_checks->Append(wxString::FromAscii(m_LogManager->GetFullName((LogTypes::LOG_TYPE)i))); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index d38c90e07f..d9d1908de3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -28,7 +28,6 @@ #include "CPUDetect.h" #include "IniFile.h" #include "FileUtil.h" -#include "Setup.h" #include "Host.h" // Core #include "HW/Wiimote.h" @@ -46,6 +45,19 @@ #include +#ifdef _WIN32 +#include +#endif + +// Nvidia drivers >= v302 will check if the application exports a global +// variable named NvOptimusEnablement to know if it should run the app in high +// performance graphics mode or using the IGP. +#ifdef WIN32 +extern "C" { + __declspec(dllexport) DWORD NvOptimusEnablement = 1; +} +#endif + // ------------ // Main window @@ -116,37 +128,37 @@ bool DolphinApp::OnInit() { { wxCMD_LINE_SWITCH, "h", "help", - _("Show this help message"), + "Show this help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { wxCMD_LINE_SWITCH, "d", "debugger", - _("Opens the debugger"), + "Opens the debugger", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_SWITCH, "l", "logger", - _("Opens the logger"), + "Opens the logger", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "e", "exec", - _("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"), + "Loads the specified file (DOL,ELF,GCM,ISO,WAD)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_SWITCH, "b", "batch", - _("Exit Dolphin with emulator"), + "Exit Dolphin with emulator", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "V", "video_backend", - _("Specify a video backend"), + "Specify a video backend", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "A", "audio_emulation", - _("Low level (LLE) or high level (HLE) audio"), + "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { @@ -167,7 +179,6 @@ bool DolphinApp::OnInit() BatchMode = parser.Found(wxT("batch")); selectVideoBackend = parser.Found(wxT("video_backend"), &videoBackendName); - // TODO: This currently has no effect. Implement or delete. selectAudioEmulation = parser.Found(wxT("audio_emulation"), &audioEmulationName); #endif // wxUSE_CMDLINE_PARSER @@ -237,6 +248,14 @@ bool DolphinApp::OnInit() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = std::string(videoBackendName.mb_str()); + if (selectAudioEmulation) + { + if (audioEmulationName == "HLE") + SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true; + else if (audioEmulationName == "LLE") + SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false; + } + VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend); // Enable the PNG image handler for screenshots @@ -249,6 +268,19 @@ bool DolphinApp::OnInit() int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth; int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight; +#ifdef _WIN32 + if (File::Exists("www.dolphin-emulator.com.txt")) + { + File::Delete("www.dolphin-emulator.com.txt"); + MessageBox(NULL, + L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please " + L"download Dolphin from the official website instead: http://dolphin-emu.org/", + L"Unofficial version detected", MB_OK | MB_ICONWARNING); + ShellExecute(NULL, L"open", L"http://dolphin-emu.org/?ref=badver", NULL, NULL, SW_SHOWDEFAULT); + exit(0); + } +#endif + // The following is not needed with X11, where window managers // do not allow windows to be created off the desktop. #ifdef _WIN32 @@ -358,10 +390,6 @@ void DolphinApp::InitLanguageSupport() int DolphinApp::OnExit() { WiimoteReal::Shutdown(); -#ifdef _WIN32 - if (SConfig::GetInstance().m_WiiAutoUnpair) - WiimoteReal::UnPair(); -#endif VideoBackend::ClearList(); SConfig::Shutdown(); LogManager::Shutdown(); diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp new file mode 100644 index 0000000000..ca2119921d --- /dev/null +++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp @@ -0,0 +1,149 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include +#include +#include + +#include "Common.h" +#include "FileUtil.h" + +#include "Core.h" +#include "Host.h" +#include "CPUDetect.h" +#include "Thread.h" + +#include "PowerPC/PowerPC.h" +#include "HW/Wiimote.h" + +#include "VideoBackendBase.h" +#include "ConfigManager.h" +#include "LogManager.h" +#include "BootManager.h" + +#include +#include +#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "Dolphinemu", __VA_ARGS__)) + +bool rendererHasFocus = true; +bool running = true; + +void Host_NotifyMapLoaded() {} +void Host_RefreshDSPDebuggerWindow() {} + +void Host_ShowJitResults(unsigned int address){} + +Common::Event updateMainFrameEvent; +void Host_Message(int Id) +{ +} + +void* Host_GetRenderHandle() +{ + return NULL; +} + +void* Host_GetInstance() { return NULL; } + +void Host_UpdateTitle(const char* title){}; + +void Host_UpdateLogDisplay(){} + +void Host_UpdateDisasmDialog(){} + +void Host_UpdateMainFrame() +{ +} + +void Host_UpdateBreakPointView(){} + +bool Host_GetKeyState(int keycode) +{ + return false; +} + +void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height) +{ + x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos; + y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos; + width = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth; + height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight; +} + +void Host_RequestRenderWindowSize(int width, int height) {} +void Host_SetStartupDebuggingParameters() +{ +} + +bool Host_RendererHasFocus() +{ + return true; +} + +void Host_ConnectWiimote(int wm_idx, bool connect) {} + +void Host_SetWaitCursor(bool enable){} + +void Host_UpdateStatusBar(const char* _pText, int Filed){} + +void Host_SysMessage(const char *fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + size_t len = strlen(msg); + if (msg[len - 1] != '\n') { + msg[len - 1] = '\n'; + msg[len] = '\0'; + } + LOGI(msg); +} + +void Host_SetWiiMoteConnectionState(int _State) {} + +#ifdef __cplusplus +extern "C" +{ +#endif +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_dolphinemuactivity_main(JNIEnv *env, jobject obj) +{ + LogManager::Init(); + SConfig::Init(); + VideoBackend::PopulateList(); + VideoBackend::ActivateBackend(SConfig::GetInstance(). + m_LocalCoreStartupParameter.m_strVideoBackend); + WiimoteReal::LoadSettings(); + + // No use running the loop when booting fails + if (BootManager::BootCore("")) + { + while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + updateMainFrameEvent.Wait(); + } + + WiimoteReal::Shutdown(); + VideoBackend::ClearList(); + SConfig::Shutdown(); + LogManager::Shutdown(); +} + +#ifdef __cplusplus +} +#endif diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index bf47a23c53..b3a7ab22b8 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -39,11 +39,11 @@ const u8 hdr[] = { 0x00,0x00,0x00,0x00 }; -wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, int width, int height) +wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height) { - int stride = (4*width); + u32 stride = (4*width); - int bytes = (stride*height) + sizeof(hdr); + u32 bytes = (stride*height) + sizeof(hdr); bytes = (bytes+3)&(~3); @@ -54,13 +54,13 @@ wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, int width, int height u8 *pixelData = pdata + sizeof(hdr); - for (int y=0;y 0) { @@ -776,6 +777,9 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles); t_Status[card]->SetLabel(wxLabel); + // Done so text doesn't overlap the UI. + this->Fit(); + return true; } diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h index beff71b671..537b0eb111 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.h +++ b/Source/Core/DolphinWX/Src/MemcardManager.h @@ -149,13 +149,11 @@ class CMemcardManager : public wxDialog : wxListCtrl(parent, id, pos, size, style) , __mcmSettings(_mcmSetngs) { - Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler( - CMemcardListCtrl::OnRightClick)); + Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } ~CMemcardListCtrl() { - Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler( - CMemcardListCtrl::OnRightClick)); + Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } _mcmSettings & __mcmSettings; bool prevPage, diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 0347385e73..142a7ea00c 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -24,9 +24,6 @@ #include -#define _connect_macro_(b, f, c, s) \ - (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - #define NETPLAY_TITLEBAR "Dolphin NetPlay" BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) @@ -86,7 +83,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, wxString::FromAscii(port.c_str())); wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect")); - _connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this); + connect_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnJoin, this); wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY, _("ALERT:\n\nNetPlay will currently only work properly when using the following settings:\n - Dual Core [OFF]\n - Audio Throttle [OFF]\n - DSP-HLE with \"Null Audio\" or DSP-LLE\n - Manually set the exact number of controllers that will be used to [Standard Controller]\n\nAll players should try to use the same Dolphin version and settings.\nDisable all memory cards or send them to all players before starting.\nWiimote support has not been implemented.\n\nYou must forward TCP port to host!!"), @@ -119,10 +116,10 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* m_host_port_text = new wxTextCtrl(host_tab, wxID_ANY, wxString::FromAscii(port.c_str())); wxButton* const host_btn = new wxButton(host_tab, wxID_ANY, _("Host")); - _connect_macro_(host_btn, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_BUTTON_CLICKED, this); + host_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnHost, this); m_game_lbox = new wxListBox(host_tab, wxID_ANY); - _connect_macro_(m_game_lbox, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, this); + m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &NetPlaySetupDiag::OnHost, this); std::istringstream ss(game_list->GetGameNames()); std::string game; @@ -143,7 +140,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* // bottom row wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit")); - _connect_macro_(quit_btn, NetPlaySetupDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); + quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnQuit, this); // main sizer wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); @@ -257,7 +254,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game wxDefaultPosition, wxDefaultSize, wxBU_LEFT); if (is_hosting) - _connect_macro_(m_game_btn, NetPlayDiag::OnChangeGame, wxEVT_COMMAND_BUTTON_CLICKED, this); + m_game_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChangeGame, this); else m_game_btn->Disable(); @@ -269,10 +266,10 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game m_chat_msg_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString , wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - _connect_macro_(m_chat_msg_text, NetPlayDiag::OnChat, wxEVT_COMMAND_TEXT_ENTER, this); + m_chat_msg_text->Bind(wxEVT_COMMAND_TEXT_ENTER, &NetPlayDiag::OnChat, this); wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send")); - _connect_macro_(chat_msg_btn, NetPlayDiag::OnChat, wxEVT_COMMAND_BUTTON_CLICKED, this); + chat_msg_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChat, this); wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL); chat_msg_szr->Add(m_chat_msg_text, 1); @@ -290,7 +287,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game if (is_hosting) { wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads")); - _connect_macro_(player_config_btn, NetPlayDiag::OnConfigPads, wxEVT_COMMAND_BUTTON_CLICKED, this); + player_config_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnConfigPads, this); player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5); } @@ -300,23 +297,23 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game // bottom crap wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit")); - _connect_macro_(quit_btn, NetPlayDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); + quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnQuit, this); wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL); if (is_hosting) { wxButton* const start_btn = new wxButton(panel, wxID_ANY, _("Start")); - _connect_macro_(start_btn, NetPlayDiag::OnStart, wxEVT_COMMAND_BUTTON_CLICKED, this); + start_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnStart, this); bottom_szr->Add(start_btn); wxButton* const stop_btn = new wxButton(panel, wxID_ANY, _("Stop")); - _connect_macro_(stop_btn, NetPlayDiag::OnStop, wxEVT_COMMAND_BUTTON_CLICKED, this); + stop_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnStop, this); bottom_szr->Add(stop_btn); bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 ); wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20") , wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20); - _connect_macro_(padbuf_spin, NetPlayDiag::OnAdjustBuffer, wxEVT_COMMAND_SPINCTRL_UPDATED, this); + padbuf_spin->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &NetPlayDiag::OnAdjustBuffer, this); wxButton* const padbuf_btn = new wxButton(panel, wxID_ANY, wxT("?"), wxDefaultPosition, wxSize(22, -1)); - _connect_macro_(padbuf_btn, NetPlayDiag::OnPadBuffHelp, wxEVT_COMMAND_BUTTON_CLICKED, this); + padbuf_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnPadBuffHelp, this); bottom_szr->Add(padbuf_spin, 0, wxCENTER); bottom_szr->Add(padbuf_btn); } @@ -550,7 +547,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons , m_game_name(game_name) { m_game_lbox = new wxListBox(this, wxID_ANY); - _connect_macro_(m_game_lbox, ChangeGameDiag::OnPick, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, this); + m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &ChangeGameDiag::OnPick, this); // fill list with games std::istringstream ss(game_list->GetGameNames()); @@ -559,7 +556,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons m_game_lbox->Append(wxString(game.c_str(), *wxConvCurrent)); wxButton* const ok_btn = new wxButton(this, wxID_OK, _("Change")); - _connect_macro_(ok_btn, ChangeGameDiag::OnPick, wxEVT_COMMAND_BUTTON_CLICKED, this); + ok_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ChangeGameDiag::OnPick, this); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 5); @@ -604,7 +601,7 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, pad_names); pad_cbox->Select(m_mapping[i] + 1); - _connect_macro_(pad_cbox, PadMapDiag::OnAdjust, wxEVT_COMMAND_CHOICE_SELECTED, this); + pad_cbox->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &PadMapDiag::OnAdjust, this); wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); v_szr->Add(new wxStaticText(this,wxID_ANY, pad_names[i + 1]), 1, wxALIGN_CENTER_HORIZONTAL); diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index e566068ff1..493fade776 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -54,8 +54,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const main_stick_box = new wxBoxSizer(wxVERTICAL); static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); - static_bitmap_main->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpL), NULL, this); - static_bitmap_main->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpR), NULL, this); + static_bitmap_main->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this); + static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); wx_mainX_s->SetMinSize(wxSize(120,-1)); wx_mainX_t = new wxTextCtrl(this, ID_MAIN_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); @@ -80,8 +80,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const c_stick_box = new wxBoxSizer(wxVERTICAL); static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); - static_bitmap_c->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpL), NULL, this); - static_bitmap_c->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpR), NULL, this); + static_bitmap_c->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this); + static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); wx_cX_s->SetMinSize(wxSize(120,-1)); wx_cX_t = new wxTextCtrl(this, ID_C_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); @@ -120,29 +120,29 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxGridSizer* const buttons_grid = new wxGridSizer(4); wx_a_button = new wxCheckBox(this,ID_A,_T("A"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_a_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_a_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_a_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_a_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_b_button = new wxCheckBox(this,ID_B,_T("B"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_b_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_b_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_b_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_b_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_x_button = new wxCheckBox(this,ID_X,_T("X"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_x_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_x_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_x_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_x_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_y_button = new wxCheckBox(this,ID_Y,_T("Y"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_y_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_y_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_y_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_y_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_l_button = new wxCheckBox(this,ID_L,_T("L"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_l_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_l_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_l_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_l_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_r_button = new wxCheckBox(this,ID_R,_T("R"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_r_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_r_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_r_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_r_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_z_button = new wxCheckBox(this,ID_Z,_T("Z"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_z_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_z_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_z_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_z_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_start_button = new wxCheckBox(this,ID_START,_T("Start"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_start_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_start_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_start_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_start_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); buttons_grid->Add(wx_a_button,false); buttons_grid->Add(wx_b_button,false); @@ -157,17 +157,17 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxGridSizer* const buttons_dpad = new wxGridSizer(3); wx_up_button = new wxCheckBox(this,ID_UP,_T("Up"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_up_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_up_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_up_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_up_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_right_button = new wxCheckBox(this,ID_RIGHT,_T("Right"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_right_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_right_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_right_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_right_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_down_button = new wxCheckBox(this,ID_DOWN,_T("Down"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_down_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_down_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_down_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_down_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_left_button = new wxCheckBox(this,ID_LEFT,_T("Left"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_left_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_left_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_left_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_left_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); buttons_dpad->AddSpacer(20); buttons_dpad->Add(wx_up_button,false); @@ -751,7 +751,6 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event) return; } - wxPoint ptM(event.GetPosition()); *x = 128; *y = 128; @@ -1100,8 +1099,8 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y) y = y/2; wxMemoryDC memDC; - wxBitmap bitmap(127, 127); - memDC.SelectObject(bitmap); + wxBitmap stick_bitmap(127, 127); + memDC.SelectObject(stick_bitmap); memDC.SetBackground(*wxLIGHT_GREY_BRUSH); memDC.Clear(); memDC.SetBrush(*wxWHITE_BRUSH); @@ -1117,5 +1116,5 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y) memDC.SetBrush(*wxBLUE_BRUSH); memDC.DrawCircle(x,y,5); memDC.SelectObject(wxNullBitmap); - return bitmap; + return stick_bitmap; } diff --git a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp b/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp index d66e6c1fc5..2f31311495 100644 --- a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp @@ -6,8 +6,6 @@ #include "IniFile.h" #include -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), wrp(_wrp) @@ -31,13 +29,13 @@ UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : port_tbox = new wxTextCtrl(this, wxID_ANY, wxString::FromUTF8(wrp->port.c_str())); port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND, 5); - _connect_macro_(enable, UDPConfigDiag::ChangeState, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(butt, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(accel, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(point, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(nun, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(nunaccel, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(port_tbox, UDPConfigDiag::ChangeState, wxEVT_COMMAND_TEXT_UPDATED, this); + enable->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeState, this); + butt->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + accel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + point->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + nun->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + nunaccel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + port_tbox->Bind(wxEVT_COMMAND_TEXT_UPDATED, &UDPConfigDiag::ChangeState, this); enable->SetValue(wrp->udpEn); butt->SetValue(wrp->updButt); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index f5a488a7e8..0ca4715c3d 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -11,8 +11,6 @@ #include #endif -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - extern CFrame* main_frame; // template instantiation @@ -27,7 +25,7 @@ SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, const wxSt { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - _connect_macro_(this, SettingCheckBox::UpdateValue, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &SettingCheckBox::UpdateValue, this); } template <> @@ -38,7 +36,7 @@ SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, const w { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - _connect_macro_(this, SettingRadioButton::UpdateValue, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); + Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &SettingRadioButton::UpdateValue, this); } SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num, const wxString choices[], long style) @@ -47,7 +45,7 @@ SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& too { SetToolTip(tooltip); Select(m_setting); - _connect_macro_(this, SettingChoice::UpdateValue, wxEVT_COMMAND_CHOICE_SELECTED, this); + Bind(wxEVT_COMMAND_CHOICE_SELECTED, &SettingChoice::UpdateValue, this); } void SettingChoice::UpdateValue(wxCommandEvent& ev) @@ -84,7 +82,6 @@ wxString af_desc = wxTRANSLATE("Enable anisotropic filtering.\nEnhances visual q wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky.\nHeavily decreases emulation speed and sometimes causes issues.\n\nIf unsure, select None."); wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked."); wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked."); -wxString pixel_depth_desc = wxTRANSLATE("Calculate depth values of 3D graphics per-pixel rather than per vertex.\nIn contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n\nIf unsure, leave this checked."); wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked."); wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked."); wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528."); @@ -98,6 +95,7 @@ wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf un wxString disable_fog_desc = wxTRANSLATE("Improves performance but causes glitches in most games which rely on proper fog emulation.\n\nIf unsure, leave this unchecked."); wxString disable_alphapass_desc = wxTRANSLATE("Skip the destination alpha pass used in many games for various graphical effects.\n\nIf unsure, leave this unchecked."); wxString show_fps_desc = wxTRANSLATE("Show the number of frames rendered per second as a measure of emulation speed.\n\nIf unsure, leave this unchecked."); +wxString log_fps_to_file_desc = wxTRANSLATE("Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n\nIf unsure, leave this unchecked."); wxString show_input_display_desc = wxTRANSLATE("Display the inputs read by the emulator.\n\nIf unsure, leave this unchecked."); wxString show_stats_desc = wxTRANSLATE("Show various statistics.\n\nIf unsure, leave this unchecked."); wxString texfmt_desc = wxTRANSLATE("Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n\nIf unsure, leave this unchecked."); @@ -112,12 +110,12 @@ wxString dump_frames_desc = wxTRANSLATE("Dump all rendered frames to an AVI file #if !defined WIN32 && defined HAVE_LIBAV wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nHold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); +wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); wxString opencl_desc = wxTRANSLATE("[EXPERIMENTAL]\nAims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\nHowever, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n\nIf unsure, leave this unchecked."); wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked."); wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked."); -wxString hotkeys_desc = wxTRANSLATE("Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n\nIf unsure, leave this unchecked."); +wxString hotkeys_desc = wxTRANSLATE("Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n\nIf unsure, leave this unchecked."); wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off)."); wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked."); wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, an error message is displayed.\nHowever, one may skip the popups to allow interruption free gameplay by checking this option.\n\nIf unsure, leave this unchecked."); @@ -190,7 +188,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con { vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str()); - Connect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(VideoConfigDiag::OnUpdateUI), NULL, this); + Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this); wxNotebook* const notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize); @@ -217,7 +215,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con choice_backend->AppendString(wxGetTranslation(wxString::FromAscii((*it)->GetName().c_str()))); choice_backend->SetStringSelection(wxGetTranslation(wxString::FromAscii(g_video_backend->GetName().c_str()))); - _connect_macro_(choice_backend, VideoConfigDiag::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_basic->Add(choice_backend, 1, 0, 0); @@ -259,7 +257,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxStaticText* const label_display_resolution = new wxStaticText(page_general, wxID_ANY, _("Fullscreen resolution:")); choice_display_resolution = new wxChoice(page_general, wxID_ANY, wxDefaultPosition, wxDefaultSize, res_list); RegisterControl(choice_display_resolution, wxGetTranslation(display_res_desc)); - _connect_macro_(choice_display_resolution, VideoConfigDiag::Event_DisplayResolution, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_display_resolution->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_DisplayResolution, this); choice_display_resolution->SetStringSelection(wxString::FromAscii(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str())); @@ -296,6 +294,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con { SettingCheckBox* render_to_main_cb; szr_other->Add(CreateCheckBox(page_general, _("Show FPS"), wxGetTranslation(show_fps_desc), vconfig.bShowFPS)); + szr_other->Add(CreateCheckBox(page_general, _("Log FPS to file"), wxGetTranslation(log_fps_to_file_desc), vconfig.bLogFPSToFile)); szr_other->Add(CreateCheckBox(page_general, _("Auto adjust Window Size"), wxGetTranslation(auto_window_size_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)); szr_other->Add(CreateCheckBox(page_general, _("Keep window on top"), wxGetTranslation(keep_window_on_top_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)); szr_other->Add(CreateCheckBox(page_general, _("Hide Mouse Cursor"), wxGetTranslation(hide_mouse_cursor_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)); @@ -388,7 +387,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con else choice_ppshader->SetStringSelection(wxString::FromAscii(vconfig.sPostProcessingShader.c_str())); - _connect_macro_(choice_ppshader, VideoConfigDiag::Event_PPShader, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_ppshader->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_PPShader, this); szr_enh->Add(new wxStaticText(page_enh, -1, _("Post-Processing Effect:")), 1, wxALIGN_CENTER_VERTICAL, 0); szr_enh->Add(choice_ppshader); @@ -403,6 +402,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con _3d_vision = CreateCheckBox(page_enh, _("3D Vision"), wxGetTranslation(_3d_vision_desc), vconfig.b3DVision); _3d_vision->Show(vconfig.backend_info.bSupports3DVision); szr_enh->Add(_3d_vision); + szr_enh->Add(CreateCheckBox(page_enh, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack)); // TODO: Add anaglyph 3d here wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_enh, _("Enhancements")); @@ -453,7 +453,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // TODO: Use wxSL_MIN_MAX_LABELS or wxSL_VALUE_LABEL with wx 2.9.1 wxSlider* const stc_slider = new wxSlider(page_hacks, wxID_ANY, 0, 0, 2, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_BOTTOM); - _connect_macro_(stc_slider, VideoConfigDiag::Event_Stc, wxEVT_COMMAND_SLIDER_UPDATED, this); + stc_slider->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &VideoConfigDiag::Event_Stc, this); RegisterControl(stc_slider, wxGetTranslation(stc_desc)); if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0); @@ -490,7 +490,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable)); szr_other->Add(CreateCheckBox(page_hacks, _("Disable Fog"), wxGetTranslation(disable_fog_desc), vconfig.bDisableFog)); - szr_other->Add(CreateCheckBox(page_hacks, _("Disable Per-Pixel Depth"), wxGetTranslation(pixel_depth_desc), vconfig.bEnablePerPixelDepth, true)); szr_other->Add(CreateCheckBox(page_hacks, _("Skip Dest. Alpha Pass"), wxGetTranslation(disable_alphapass_desc), vconfig.bDstAlphaPass)); szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL)); szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder)); @@ -551,13 +550,11 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_misc->Add(CreateCheckBox(page_advanced, _("Crop"), wxGetTranslation(crop_desc), vconfig.bCrop)); szr_misc->Add(CreateCheckBox(page_advanced, _("Enable Hotkeys"), wxGetTranslation(hotkeys_desc), vconfig.bOSDHotKey)); - szr_misc->Add(CreateCheckBox(page_advanced, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack)); - // Progressive Scan { wxCheckBox* const cb_prog_scan = new wxCheckBox(page_advanced, wxID_ANY, _("Enable Progressive Scan")); RegisterControl(cb_prog_scan, wxGetTranslation(prog_scan_desc)); - _connect_macro_(cb_prog_scan, VideoConfigDiag::Event_ProgressiveScan, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + cb_prog_scan->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &VideoConfigDiag::Event_ProgressiveScan, this); if (Core::GetState() != Core::CORE_UNINITIALIZED) cb_prog_scan->Disable(); @@ -580,9 +577,9 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con } wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition); - _connect_macro_(btn_close, VideoConfigDiag::Event_ClickClose, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_close->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &VideoConfigDiag::Event_ClickClose, this); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VideoConfigDiag::Event_Close), (wxObject*)0, this); + Bind(wxEVT_CLOSE_WINDOW, &VideoConfigDiag::Event_Close, this); wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL); szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5); @@ -630,8 +627,8 @@ SettingRadioButton* VideoConfigDiag::CreateRadioButton(wxWindow* parent, const w wxControl* VideoConfigDiag::RegisterControl(wxControl* const control, const wxString& description) { ctrl_descs.insert(std::pair(control, description)); - control->Connect(wxID_ANY, wxEVT_ENTER_WINDOW, wxMouseEventHandler(VideoConfigDiag::Evt_EnterControl), NULL, this); - control->Connect(wxID_ANY, wxEVT_LEAVE_WINDOW, wxMouseEventHandler(VideoConfigDiag::Evt_LeaveControl), NULL, this); + control->Bind(wxEVT_ENTER_WINDOW, &VideoConfigDiag::Evt_EnterControl, this); + control->Bind(wxEVT_LEAVE_WINDOW, &VideoConfigDiag::Evt_LeaveControl, this); return control; } diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h index e6b13a4092..c7a19c6cb8 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h @@ -112,7 +112,7 @@ protected: void Event_ProgressiveScan(wxCommandEvent &ev) { SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", ev.GetInt()); - SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.GetInt(); + SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.IsChecked(); ev.Skip(); } diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index b232bf6461..475718ed2e 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -4,15 +4,6 @@ #include "HW/WiimoteReal/WiimoteReal.h" #include "Frame.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - -const wxString& ConnectedWiimotesString() -{ - static wxString str; - str.Printf(_("%i connected"), WiimoteReal::Initialize()); - return str; -} - WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) , m_plugin(plugin) @@ -42,9 +33,9 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin wiimote_label[i] = new wxStaticText(this, wxID_ANY, str); wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices); - _connect_macro_(wiimote_source_ch[i], WiimoteConfigDiag::SelectSource, wxEVT_COMMAND_CHOICE_SELECTED, this); + wiimote_source_ch[i]->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::SelectSource, this); wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure")); - _connect_macro_(wiimote_configure_bt[i], WiimoteConfigDiag::ConfigEmulatedWiimote, wxEVT_COMMAND_BUTTON_CLICKED, this); + wiimote_configure_bt[i]->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::ConfigEmulatedWiimote, this); m_orig_wiimote_sources[i] = g_wiimote_sources[i]; wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]); @@ -66,27 +57,31 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin // "Real wiimotes" controls - connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString()); - wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition); - _connect_macro_(refresh_btn, WiimoteConfigDiag::RefreshRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, this); + refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); -#ifdef _WIN32 - wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition); - _connect_macro_(pairup_btn, WiimoteConfigDiag::PairUpRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, this); -#endif + wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes")); + + wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL); + + if (!WiimoteReal::g_wiimote_scanner.IsReady()) + real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n" + "You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5); + + wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning")); + continuous_scanning->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnContinuousScanning, this); + continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning); + auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data")); + wiimote_speaker->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnEnableSpeaker, this); + wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker); + + real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL); + real_wiimotes_sizer->AddStretchSpacer(1); + real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5); - // "Real wiimotes" layout - wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Real Wiimotes")); - wxFlexGridSizer* const real_wiimotes_sizer = new wxFlexGridSizer(3, 5, 5); - real_wiimotes_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER_VERTICAL); -#ifdef _WIN32 - real_wiimotes_sizer->Add(pairup_btn); -#endif - real_wiimotes_sizer->Add(refresh_btn); - real_wiimotes_group->Add(real_wiimotes_sizer, 1, wxALL, 5); - + real_wiimotes_group->Add(wiimote_speaker, 0); + real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND); // "General Settings" controls const wxString str[] = { _("Bottom"), _("Top") }; @@ -133,11 +128,11 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData("BT.MOT")); WiimoteReconnectOnLoad->SetValue(SConfig::GetInstance().m_WiimoteReconnectOnLoad); - _connect_macro_(WiiSensBarPos, WiimoteConfigDiag::OnSensorBarPos, wxEVT_COMMAND_CHOICE_SELECTED, this); - _connect_macro_(WiiSensBarSens, WiimoteConfigDiag::OnSensorBarSensitivity, wxEVT_COMMAND_SLIDER_UPDATED, this); - _connect_macro_(WiimoteSpkVolume, WiimoteConfigDiag::OnSpeakerVolume, wxEVT_COMMAND_SLIDER_UPDATED, this); - _connect_macro_(WiimoteMotor, WiimoteConfigDiag::OnMotor, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(WiimoteReconnectOnLoad, WiimoteConfigDiag::OnReconnectOnLoad, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + WiiSensBarPos->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::OnSensorBarPos, this); + WiiSensBarSens->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSensorBarSensitivity, this); + WiimoteSpkVolume->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSpeakerVolume, this); + WiimoteMotor->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnMotor, this); + WiimoteReconnectOnLoad->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnReconnectOnLoad, this); // "General Settings" layout @@ -175,8 +170,8 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin main_sizer->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(WiimoteConfigDiag::Save)); - Connect(wxID_CANCEL, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(WiimoteConfigDiag::Cancel)); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Save, this, wxID_OK); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Cancel, this, wxID_CANCEL); SetSizerAndFit(main_sizer); Center(); @@ -190,32 +185,9 @@ void WiimoteConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev) m_emu_config_diag->Destroy(); } -void WiimoteConfigDiag::UpdateGUI() -{ - connected_wiimotes_txt->SetLabel(ConnectedWiimotesString()); -} - -#ifdef _WIN32 -void WiimoteConfigDiag::PairUpRealWiimotes(wxCommandEvent&) -{ - const int paired = WiimoteReal::PairUp(); - - if (paired > 0) - { - // TODO: Maybe add a label of newly paired up wiimotes? - WiimoteReal::Refresh(); - UpdateGUI(); - } - else if (paired < 0) - PanicAlertT("A supported bluetooth device was not found!\n" - "(Only the Microsoft bluetooth stack is supported.)"); -} -#endif - void WiimoteConfigDiag::RefreshRealWiimotes(wxCommandEvent&) { WiimoteReal::Refresh(); - UpdateGUI(); } void WiimoteConfigDiag::SelectSource(wxCommandEvent& event) @@ -223,30 +195,15 @@ void WiimoteConfigDiag::SelectSource(wxCommandEvent& event) // This needs to be changed now in order for refresh to work right. // Revert if the dialog is canceled. int index = m_wiimote_index_from_ctrl_id[event.GetId()]; - g_wiimote_sources[index] = event.GetInt(); + + WiimoteReal::ChangeWiimoteSource(index, event.GetInt()); + if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID) wiimote_configure_bt[index]->Disable(); else wiimote_configure_bt[index]->Enable(); } -void WiimoteConfigDiag::UpdateWiimoteStatus() -{ - for (int index = 0; index < 4; ++index) - { - if (m_orig_wiimote_sources[index] != g_wiimote_sources[index]) - { - // Disconnect first, otherwise the new source doesn't seem to work - CFrame::ConnectWiimote(index, false); - // Connect wiimotes - if (WIIMOTE_SRC_EMU & g_wiimote_sources[index]) - CFrame::ConnectWiimote(index, true); - else if (WIIMOTE_SRC_REAL & g_wiimote_sources[index] && WiimoteReal::g_wiimotes[index]) - CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsConnected()); - } - } -} - void WiimoteConfigDiag::RevertSource() { for (int i = 0; i < 4; ++i) @@ -268,7 +225,6 @@ void WiimoteConfigDiag::Save(wxCommandEvent& event) sec.Set("Source", (int)g_wiimote_sources[i]); } - UpdateWiimoteStatus(); inifile.Save(ini_filename); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index faa17dff2e..4c33661ca2 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -24,20 +24,13 @@ class WiimoteConfigDiag : public wxDialog public: WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin); -#ifdef _WIN32 - void PairUpRealWiimotes(wxCommandEvent& event); -#endif void RefreshRealWiimotes(wxCommandEvent& event); - void SelectSource(wxCommandEvent& event); - void UpdateWiimoteStatus(); void RevertSource(); - void ConfigEmulatedWiimote(wxCommandEvent& event); void Save(wxCommandEvent& event); - void UpdateGUI(); void OnSensorBarPos(wxCommandEvent& event) { @@ -61,7 +54,18 @@ public: } void OnReconnectOnLoad(wxCommandEvent& event) { - SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.GetInt(); + SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.IsChecked(); + event.Skip(); + } + void OnContinuousScanning(wxCommandEvent& event) + { + SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked(); + WiimoteReal::Initialize(); + event.Skip(); + } + void OnEnableSpeaker(wxCommandEvent& event) + { + SConfig::GetInstance().m_WiimoteEnableSpeaker = event.IsChecked(); event.Skip(); } @@ -76,8 +80,6 @@ private: wxButton* wiimote_configure_bt[4]; std::map m_wiimote_index_from_conf_bt_id; - - wxStaticText* connected_wiimotes_txt; }; diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp index fe4cd70829..f032f81e96 100644 --- a/Source/Core/DolphinWX/Src/X11Utils.cpp +++ b/Source/Core/DolphinWX/Src/X11Utils.cpp @@ -124,12 +124,12 @@ void EWMH_Fullscreen(Display *dpy, int action) #if defined(HAVE_WX) && HAVE_WX Window XWindowFromHandle(void *Handle) { - return GDK_WINDOW_XID(GTK_WIDGET(Handle)->window); + return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle))); } Display *XDisplayFromHandle(void *Handle) { - return GDK_WINDOW_XDISPLAY(GTK_WIDGET(Handle)->window); + return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle))); } #endif @@ -225,7 +225,7 @@ void XRRConfiguration::Update() } else sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(), - "%a[^:]: %ux%u", &output_name, &fullWidth, &fullHeight); + "%m[^:]: %ux%u", &output_name, &fullWidth, &fullHeight); for (int i = 0; i < screenResources->noutput; i++) { diff --git a/Source/Core/DolphinWX/resources/Boomy.h b/Source/Core/DolphinWX/resources/Boomy.h deleted file mode 100644 index f2060ebba7..0000000000 --- a/Source/Core/DolphinWX/resources/Boomy.h +++ /dev/null @@ -1,312 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_0_H_ -#define _WXINCLUDE_MYHEADER_0_H_ - -static const unsigned char Toolbar_Log_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0xC0, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x56, 0x79, 0x6C, 0x14, 0x75, 0x14, -0xFE, 0x66, 0xF6, 0xE8, 0x5E, 0xED, 0x1E, 0x6D, 0x77, 0xDB, -0xED, 0x1E, 0x3D, 0x96, 0x5E, 0x58, 0x5A, 0xDA, 0xD2, 0x42, -0xA5, 0x35, 0x6D, 0x38, 0x24, 0xB6, 0x85, 0x42, 0x29, 0x06, -0xAD, 0x78, 0x80, 0x5A, 0xA2, 0x26, 0x42, 0x62, 0x48, 0x10, -0x83, 0x09, 0x68, 0x8C, 0x4D, 0x4A, 0x0C, 0x12, 0x45, 0x12, -0x30, 0x2A, 0x04, 0xFF, 0x30, 0x8A, 0x04, 0x08, 0x06, 0x91, -0x48, 0xC2, 0x65, 0x15, 0xA5, 0x45, 0x10, 0x28, 0x45, 0xE9, -0x96, 0x76, 0xDB, 0xED, 0x76, 0x69, 0xF7, 0x9A, 0x99, 0x1D, -0xDF, 0x0C, 0x52, 0xA9, 0x85, 0xF8, 0x8F, 0xFE, 0x92, 0x97, -0xDF, 0xCC, 0xFC, 0x66, 0xBE, 0xF7, 0xDE, 0xF7, 0xBE, 0xF7, -0x76, 0x81, 0xFF, 0x79, 0x29, 0x1E, 0x74, 0xF0, 0x7D, 0x3B, -0xD8, 0xD6, 0x1A, 0x68, 0x1F, 0xAF, 0x41, 0xC6, 0x8A, 0xB9, -0x28, 0x6D, 0xAE, 0xC2, 0xFC, 0xE6, 0xB9, 0x58, 0xD5, 0x34, -0x1B, 0xF5, 0x8D, 0x15, 0xA8, 0xAF, 0x2F, 0xC7, 0x63, 0x0D, -0x95, 0xC8, 0x6F, 0xAC, 0x82, 0x50, 0x3F, 0x0B, 0x03, 0x07, -0xCF, 0x22, 0x7E, 0x3F, 0x1C, 0xF6, 0x9F, 0x0F, 0x7E, 0xDC, -0x05, 0xC5, 0xD9, 0x1D, 0xC8, 0x65, 0x95, 0x78, 0x95, 0x51, -0x33, 0xFB, 0x35, 0x49, 0xAA, 0xD3, 0x46, 0x9B, 0xF6, 0x98, -0x35, 0x2B, 0xF9, 0x43, 0x6B, 0x66, 0xF2, 0xCB, 0x36, 0x97, -0x69, 0xAD, 0xCD, 0x95, 0xD4, 0x96, 0xEE, 0x32, 0xB4, 0xE9, -0x0D, 0xCA, 0xF6, 0x38, 0x8F, 0x13, 0xA2, 0x88, 0x77, 0xB6, -0xBF, 0x08, 0xFD, 0xBF, 0x66, 0x70, 0x66, 0x27, 0x98, 0x78, -0x0C, 0xAB, 0xE8, 0x72, 0x4F, 0x82, 0xD1, 0xD4, 0x9C, 0x9A, -0x5F, 0x99, 0x9B, 0x51, 0xD2, 0x68, 0x70, 0x96, 0xAC, 0x80, -0xBB, 0x74, 0x99, 0x6C, 0xAE, 0xE2, 0x7A, 0x64, 0xCE, 0x5C, -0x00, 0x77, 0x51, 0x05, 0x12, 0x8D, 0x2C, 0xFA, 0x7B, 0xAE, -0x29, 0xA3, 0x51, 0x71, 0x8E, 0x08, 0xE4, 0x2E, 0x2C, 0xC5, -0xA1, 0x23, 0x9D, 0xE0, 0x1E, 0x98, 0x01, 0x17, 0x85, 0x9B, -0xE3, 0xD0, 0x9E, 0xE8, 0x9C, 0xE6, 0xC8, 0x6B, 0x78, 0x0F, -0x9E, 0xBA, 0x03, 0xB0, 0x15, 0x6E, 0x81, 0xDE, 0x3A, 0x1F, -0x50, 0xA7, 0x22, 0x16, 0x19, 0x05, 0x17, 0x19, 0x02, 0x37, -0xDE, 0x8B, 0x38, 0x1F, 0x40, 0xB2, 0x23, 0x1B, 0x6A, 0x8D, -0x06, 0xE2, 0x1D, 0x72, 0x9A, 0x29, 0x93, 0x8E, 0xF6, 0xA7, -0xA1, 0xBA, 0x17, 0x53, 0x79, 0xEF, 0x8D, 0xC0, 0xE1, 0x51, -0x85, 0x4A, 0x61, 0x71, 0xCE, 0x5E, 0x07, 0x9D, 0xB9, 0x15, -0xC1, 0xC1, 0x93, 0xB8, 0xDE, 0xF9, 0x11, 0x46, 0xFB, 0x4F, -0x93, 0x73, 0x3F, 0x44, 0x21, 0x0E, 0x96, 0xB8, 0xD3, 0xEA, -0x75, 0x30, 0x5B, 0x53, 0xA0, 0xD2, 0x6A, 0x11, 0x8B, 0xF1, -0x88, 0x93, 0x03, 0x81, 0x52, 0xA0, 0x7D, 0x8D, 0x08, 0xE6, -0xCC, 0xD6, 0x95, 0xE2, 0x9E, 0x8D, 0x7B, 0x21, 0x4C, 0xCA, -0xE0, 0xC8, 0x5B, 0x60, 0x29, 0x83, 0x6A, 0xBD, 0xD5, 0x01, -0x7D, 0x6A, 0x3D, 0xC6, 0x03, 0x9D, 0x38, 0xB5, 0xBF, 0x01, -0x17, 0x8E, 0xEE, 0x85, 0xAF, 0x77, 0x18, 0xB1, 0x28, 0x8B, -0xB8, 0xA0, 0x42, 0x34, 0x22, 0xC0, 0xD7, 0x37, 0x8C, 0xEB, -0x17, 0x7B, 0x10, 0x1A, 0x8F, 0x41, 0xA3, 0xD3, 0x41, 0xA9, -0x52, 0x41, 0xA5, 0x56, 0x42, 0xA1, 0x60, 0x40, 0x7E, 0xB6, -0x12, 0x5C, 0xDA, 0x14, 0x8A, 0x14, 0x2A, 0x18, 0x63, 0x31, -0x94, 0x19, 0x6C, 0xB9, 0x60, 0x60, 0x06, 0x17, 0x3E, 0x8D, -0x9C, 0xB2, 0x2A, 0x34, 0xBC, 0xB6, 0x1E, 0x8B, 0x37, 0xAC, -0xC3, 0xBC, 0x67, 0xDB, 0x50, 0xBD, 0xB2, 0x15, 0xD5, 0x2D, -0x2D, 0x64, 0x4B, 0x51, 0x5C, 0x57, 0x8B, 0x14, 0x67, 0x16, -0x8A, 0xAA, 0x2B, 0x51, 0x51, 0x37, 0x13, 0xE5, 0x55, 0x39, -0x30, 0x99, 0xB5, 0x10, 0x04, 0x91, 0x23, 0xAA, 0xC4, 0x29, -0x45, 0x7E, 0xA2, 0x0E, 0x56, 0xA2, 0x68, 0x63, 0xC6, 0x8C, -0x79, 0x2A, 0x63, 0xFA, 0x2C, 0xA8, 0x54, 0x97, 0xA0, 0x37, -0x25, 0xC1, 0xEF, 0xED, 0x43, 0xDF, 0xAF, 0x5D, 0x18, 0xB8, -0x72, 0x89, 0x32, 0xE9, 0xC1, 0x60, 0x6F, 0x2F, 0x3D, 0xF3, -0x82, 0xE7, 0x62, 0x14, 0xB9, 0x06, 0xA9, 0x0E, 0x3B, 0x2C, -0xE9, 0x16, 0xE8, 0x35, 0x3C, 0x2E, 0x77, 0x7B, 0x31, 0x16, -0xE4, 0xBE, 0x7D, 0x7D, 0x1F, 0x76, 0xDD, 0xC5, 0x65, 0xEE, -0x5E, 0x7C, 0xB9, 0x09, 0x0F, 0xAB, 0x13, 0x70, 0xB2, 0xA4, -0x69, 0x03, 0xD2, 0xF2, 0x9F, 0xC4, 0x85, 0x23, 0x2F, 0xE0, -0xF2, 0xA9, 0x73, 0x08, 0x07, 0x63, 0x60, 0x29, 0x0C, 0x25, -0x55, 0x8B, 0xE8, 0x87, 0x42, 0xA9, 0x90, 0x3F, 0x63, 0x88, -0x0E, 0xA9, 0x1E, 0x46, 0x5B, 0x1A, 0xB2, 0x4B, 0x1E, 0x42, -0x68, 0xB8, 0x1F, 0xDF, 0x7C, 0xFD, 0x93, 0x18, 0x0C, 0x08, -0x9B, 0x36, 0xED, 0x93, 0x69, 0x9A, 0x9C, 0x41, 0x4B, 0x35, -0x6A, 0x59, 0x15, 0x9A, 0xEC, 0x05, 0x73, 0xA0, 0xD1, 0x9B, -0x70, 0xE9, 0xC4, 0x6E, 0xA8, 0xB5, 0x66, 0x38, 0x0B, 0x33, -0xE1, 0x29, 0x2B, 0x86, 0x7B, 0x7A, 0x1E, 0x9C, 0x05, 0xB9, -0xC8, 0x2A, 0x2A, 0xA0, 0x3D, 0x1F, 0x69, 0x59, 0xD3, 0xA0, -0x33, 0x9A, 0x21, 0xB1, 0x91, 0x98, 0xA4, 0xC5, 0xF0, 0xAD, -0x21, 0xF4, 0x5E, 0xF5, 0x89, 0x3C, 0x87, 0x9D, 0xC7, 0xBB, -0xD0, 0x3D, 0xC5, 0xC1, 0xF2, 0x1A, 0xCC, 0x20, 0xE2, 0x9A, -0xEC, 0x79, 0x95, 0xD0, 0x9B, 0x2D, 0xA4, 0xF1, 0x30, 0x3C, -0x14, 0x99, 0x39, 0x3D, 0x8D, 0x0A, 0xA8, 0xA2, 0x02, 0x82, -0xE4, 0xC8, 0x43, 0x14, 0x49, 0x1C, 0xF4, 0xA2, 0x96, 0xC0, -0xD3, 0x3C, 0x79, 0x70, 0x14, 0x4C, 0x87, 0x42, 0x8C, 0xE2, -0x5A, 0xD7, 0x55, 0xDC, 0xBC, 0x31, 0x1A, 0x27, 0xFE, 0x3F, -0x25, 0x07, 0xBF, 0x4D, 0x91, 0x69, 0x5C, 0xB8, 0x23, 0x2B, -0x46, 0xA9, 0x25, 0x2A, 0x18, 0x84, 0x03, 0xC3, 0xE8, 0xE9, -0xFC, 0x19, 0xC3, 0xDE, 0x01, 0x84, 0xC7, 0x23, 0x04, 0x1E, -0x27, 0x13, 0x26, 0x48, 0x4D, 0xD0, 0x69, 0x60, 0xB2, 0xDA, -0x60, 0xCD, 0xCA, 0x41, 0xAA, 0x4D, 0x8F, 0x70, 0x58, 0xA0, -0xBA, 0x40, 0x64, 0xD8, 0xC9, 0xBD, 0x35, 0x91, 0x41, 0x53, -0x15, 0x8A, 0xE8, 0x70, 0x99, 0x3D, 0xB7, 0x00, 0x1A, 0x83, -0x11, 0xE7, 0xBE, 0xDA, 0x83, 0xBE, 0x6B, 0x03, 0x60, 0x18, -0x1E, 0xBA, 0x44, 0x03, 0x0C, 0xA6, 0x44, 0x24, 0x59, 0x92, -0x64, 0xFD, 0x27, 0xA6, 0x58, 0xA0, 0x35, 0x18, 0xC8, 0xF1, -0x18, 0xC9, 0xD9, 0x4F, 0xD9, 0xEA, 0xE0, 0xBB, 0x35, 0x02, -0x6F, 0xDF, 0x6D, 0x49, 0x3D, 0x9F, 0x7D, 0xD7, 0x85, 0x2B, -0x53, 0x1C, 0x2C, 0xAE, 0x42, 0x09, 0x05, 0xD7, 0x94, 0xEE, -0xC9, 0x96, 0xB9, 0x8D, 0xF8, 0xAF, 0xC0, 0x55, 0x98, 0x8D, -0x9C, 0xE2, 0x42, 0x38, 0x72, 0xB3, 0x90, 0x96, 0x99, 0x81, -0x14, 0x07, 0x45, 0xEC, 0x76, 0xC2, 0xEE, 0xC9, 0x81, 0xA3, -0x70, 0x06, 0x5C, 0x25, 0x15, 0xF4, 0x2C, 0x13, 0x52, 0xDD, -0x47, 0x7D, 0x3E, 0x78, 0x6F, 0x8E, 0x30, 0x1C, 0x8F, 0x63, -0x27, 0xBA, 0x71, 0x7E, 0x0A, 0x45, 0xC4, 0x2B, 0x1F, 0x8D, -0x00, 0xD1, 0x31, 0x3F, 0xF1, 0xCD, 0x13, 0xA0, 0x83, 0x64, -0x93, 0x00, 0xFF, 0xA0, 0x1F, 0x63, 0x23, 0x41, 0x70, 0xD4, -0x24, 0x02, 0x59, 0x9C, 0x62, 0x54, 0x25, 0x68, 0xA0, 0xD4, -0xE8, 0x69, 0x54, 0xB8, 0x61, 0xC9, 0xC8, 0x84, 0x36, 0xD9, -0x0E, 0x9B, 0xFD, 0x06, 0xD5, 0xEA, 0x0F, 0x26, 0x1C, 0xE2, -0x2A, 0x09, 0x6D, 0xF7, 0x14, 0x99, 0x7E, 0xBC, 0x1E, 0x65, -0x34, 0x87, 0x7E, 0x98, 0x5E, 0xEE, 0x41, 0x45, 0xF3, 0x1A, -0x5C, 0x3C, 0xFA, 0x09, 0x7A, 0xBA, 0x7B, 0x30, 0x16, 0x08, -0xC9, 0x45, 0x65, 0x64, 0xA9, 0xB2, 0x44, 0x5F, 0xA2, 0xFC, -0xBE, 0x20, 0x08, 0x34, 0x97, 0x42, 0xD4, 0xC9, 0x66, 0xD8, -0x49, 0x5D, 0x0E, 0x97, 0x19, 0x07, 0xF6, 0x9E, 0xC4, 0xEF, -0xBD, 0xC1, 0xAB, 0x24, 0x88, 0xCA, 0x37, 0x3F, 0x87, 0x5F, -0x7A, 0x6F, 0xA2, 0x20, 0x14, 0x9C, 0x8F, 0xB6, 0xC8, 0x50, -0x1F, 0x35, 0x51, 0x6C, 0x0C, 0x42, 0x9C, 0x81, 0x92, 0x1A, -0x23, 0xBB, 0x38, 0x1F, 0x45, 0x35, 0x95, 0x98, 0xD3, 0x30, -0x9F, 0x6C, 0x21, 0xCA, 0x17, 0xD4, 0x62, 0xD6, 0x22, 0xBA, -0x5E, 0xB2, 0x04, 0x55, 0x2D, 0xAD, 0xC8, 0x9B, 0xFB, 0x08, -0xF5, 0x42, 0x3A, 0x05, 0xA0, 0x86, 0xCB, 0x65, 0xA0, 0xDE, -0x60, 0xB2, 0x09, 0xA7, 0xEE, 0x2E, 0xEE, 0x84, 0x03, 0x12, -0xC9, 0x30, 0x05, 0x7A, 0xDE, 0x37, 0x18, 0x42, 0x7F, 0xF7, -0x59, 0x64, 0x78, 0x3C, 0x28, 0x9C, 0x99, 0x05, 0xB7, 0x27, -0x05, 0x46, 0x93, 0x02, 0x91, 0xE0, 0x08, 0x82, 0x43, 0x03, -0x08, 0xDC, 0xBA, 0x29, 0x5B, 0xC8, 0xEF, 0x85, 0x96, 0x1D, -0x43, 0xBA, 0x83, 0xA8, 0x4A, 0x4E, 0x80, 0xC8, 0x85, 0x60, -0xB3, 0x4A, 0x72, 0x66, 0x58, 0xA2, 0xA5, 0x6D, 0xF3, 0x8A, -0x3B, 0x53, 0x75, 0x82, 0x22, 0x69, 0x7D, 0xF0, 0x12, 0xDE, -0x27, 0x47, 0x6B, 0x1D, 0x6E, 0x13, 0xF2, 0x8B, 0x5C, 0x08, -0x0C, 0x0C, 0x60, 0xD0, 0xC7, 0xE1, 0xF6, 0xED, 0x18, 0x22, -0x61, 0x0E, 0x3C, 0x8D, 0x4C, 0x51, 0x9A, 0x9A, 0x22, 0x75, -0x31, 0xF1, 0xA0, 0x54, 0xAB, 0x61, 0xB6, 0xE8, 0x61, 0x49, -0xD6, 0xC0, 0x9C, 0x24, 0x22, 0xE0, 0x1B, 0xA1, 0x0A, 0x07, -0x08, 0x54, 0xE4, 0x09, 0xAE, 0x71, 0xF3, 0x7E, 0x1C, 0x9E, -0xE4, 0x60, 0x47, 0x1B, 0x16, 0xD1, 0xF7, 0x87, 0x24, 0xB7, -0x4A, 0x92, 0x46, 0x9C, 0x2A, 0xCA, 0xF3, 0x71, 0xA9, 0x47, -0x64, 0x60, 0x9A, 0xD6, 0xF2, 0xEC, 0xE7, 0xFF, 0xDA, 0xA5, -0x7B, 0xD9, 0x19, 0x2B, 0x39, 0x64, 0xA4, 0x41, 0x07, 0x81, -0x17, 0x65, 0xC5, 0xD0, 0x6A, 0x20, 0x07, 0x07, 0x27, 0xFD, -0x1E, 0xF0, 0x02, 0x8E, 0x33, 0x0C, 0xBE, 0x20, 0xB0, 0xA5, -0x3C, 0x27, 0x48, 0xAF, 0xF5, 0x92, 0xB3, 0xC3, 0x74, 0xF4, -0x0B, 0xF9, 0xF2, 0xD2, 0x1E, 0x26, 0x3C, 0x29, 0x28, 0x03, -0x9D, 0x25, 0xD3, 0x5E, 0x40, 0xA0, 0xA5, 0x04, 0x5A, 0x44, -0xD7, 0x16, 0xE9, 0x84, 0x91, 0x27, 0xB6, 0x3C, 0x8B, 0x8E, -0xE2, 0x7E, 0xAB, 0x63, 0x35, 0x52, 0xC9, 0xB6, 0x6D, 0x5B, -0x8D, 0x57, 0x3A, 0x9E, 0x83, 0xB3, 0xE3, 0x79, 0x28, 0x3B, -0xD6, 0x80, 0x7D, 0xF7, 0x99, 0xBF, 0xE9, 0x7C, 0xBB, 0x15, -0xCC, 0xD6, 0xA7, 0xC0, 0x6E, 0x59, 0x09, 0xE5, 0x1B, 0xCB, -0x61, 0x22, 0xBE, 0xB3, 0xC9, 0x6A, 0xC9, 0x5A, 0xC9, 0x4A, -0xC8, 0x1E, 0xF8, 0x67, 0xE2, 0x3F, 0x5F, 0x7F, 0x02, 0x1C, -0xAC, 0x2A, 0x6C, 0xAB, 0x0A, 0x12, 0x89, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Zoom_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x1C, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x95, 0x6B, 0x6C, 0x14, 0x55, 0x18, -0x86, 0x9F, 0x99, 0x9D, 0x9D, 0xBD, 0x74, 0x77, 0xBB, 0xDB, -0x42, 0x8B, 0xF4, 0x4A, 0x57, 0x28, 0x2D, 0xA4, 0x14, 0xB0, -0x96, 0x0A, 0x04, 0xA1, 0x5C, 0x02, 0x96, 0x4B, 0x81, 0x6A, -0x55, 0xAE, 0x82, 0xA0, 0x09, 0xC4, 0x00, 0x11, 0x03, 0x14, -0x02, 0x05, 0x6F, 0x44, 0x40, 0x91, 0x10, 0xF1, 0x8F, 0x11, -0x83, 0x31, 0x11, 0x0D, 0x04, 0x7E, 0x48, 0x10, 0x2C, 0x06, -0x68, 0x2B, 0x77, 0xCB, 0x45, 0x2A, 0x45, 0xB1, 0xD4, 0x2D, -0xDB, 0xB2, 0xD0, 0x6E, 0x69, 0x77, 0xBB, 0x97, 0xF1, 0x2C, -0x0A, 0x88, 0x52, 0x08, 0x18, 0xDF, 0xE4, 0xCC, 0xEC, 0x9C, -0xB3, 0xF9, 0x9E, 0xF3, 0x7D, 0xDF, 0x7B, 0x66, 0xE0, 0x7F, -0x96, 0xAE, 0xC3, 0x95, 0xA5, 0x7B, 0x65, 0x06, 0x3C, 0x97, -0x44, 0xCE, 0xE4, 0x71, 0xE4, 0x14, 0x2E, 0xA2, 0xFF, 0xB8, -0xC5, 0xF4, 0x1B, 0x5B, 0x48, 0xDF, 0x31, 0x09, 0xF4, 0x1D, -0xDD, 0x42, 0xF6, 0x48, 0x0F, 0x27, 0xBF, 0x09, 0x3F, 0x08, -0x20, 0xDF, 0x73, 0xB6, 0xF4, 0x60, 0x8C, 0x58, 0x5A, 0x20, -0x85, 0xE5, 0xC3, 0x06, 0x83, 0x69, 0x6B, 0x54, 0xB4, 0x63, -0x9A, 0x2D, 0x36, 0x2E, 0xCF, 0x6C, 0xB5, 0x3F, 0xA3, 0xC8, -0xCA, 0x5A, 0x42, 0xDA, 0x31, 0x34, 0x79, 0x0B, 0xD3, 0xD6, -0xA7, 0x32, 0x73, 0xB3, 0xF4, 0x70, 0x80, 0xD2, 0xF2, 0x24, -0x82, 0xDA, 0x97, 0x66, 0xA3, 0xF1, 0xBD, 0xFC, 0xAC, 0xB4, -0x84, 0x35, 0xE3, 0x9F, 0x64, 0x4B, 0xF1, 0x20, 0xD6, 0x4D, -0x1A, 0xC2, 0xA2, 0x82, 0x7C, 0x46, 0x3D, 0x3D, 0x8C, 0xCE, -0x89, 0x69, 0x8A, 0x4E, 0x92, 0x66, 0x12, 0x0E, 0x95, 0xE1, -0xF7, 0x0E, 0x66, 0xFA, 0x86, 0x0E, 0x21, 0x77, 0x03, 0x56, -0x57, 0xD8, 0x09, 0x6B, 0x5B, 0x1C, 0x16, 0xCB, 0xB0, 0x95, -0xC3, 0x33, 0xD9, 0x33, 0x35, 0x9D, 0x57, 0x72, 0x62, 0x68, -0xBE, 0xD1, 0xC6, 0x96, 0x7D, 0x95, 0x54, 0xD4, 0x5C, 0xA2, -0x57, 0x42, 0x02, 0xE3, 0x87, 0xE6, 0x93, 0xDC, 0x3B, 0x17, -0xD9, 0x10, 0x95, 0x82, 0x16, 0xFE, 0x9C, 0xB6, 0x1B, 0xD9, -0x0F, 0x06, 0xAC, 0xA9, 0x90, 0x68, 0xF7, 0x4F, 0x32, 0xC8, -0xD2, 0xE8, 0x79, 0xB9, 0x29, 0xBC, 0x9E, 0x67, 0xA7, 0xB1, -0x0D, 0x36, 0x1E, 0xF1, 0xB3, 0x6A, 0xCF, 0x39, 0x8E, 0x1E, -0x3B, 0xC7, 0x81, 0xD3, 0xE7, 0xD9, 0x75, 0xB6, 0x86, 0x93, -0xEE, 0x6B, 0x58, 0x92, 0xD3, 0xE8, 0x94, 0xD9, 0x0F, 0xBD, -0xC9, 0x94, 0x20, 0x32, 0x59, 0xCE, 0xB8, 0x92, 0xE8, 0xFB, -0x03, 0x9A, 0xAF, 0x5B, 0xA5, 0x80, 0x7F, 0x4E, 0x66, 0xBC, -0x8D, 0x59, 0xD9, 0x0E, 0x7E, 0x69, 0x82, 0x4D, 0xC7, 0x42, -0xE2, 0x1E, 0xC4, 0x6A, 0x10, 0xEB, 0x26, 0x15, 0x55, 0xD5, -0xA3, 0x97, 0x25, 0x7C, 0xC1, 0x20, 0x61, 0x25, 0x84, 0xA3, -0xBB, 0x13, 0x5B, 0x62, 0x0A, 0x92, 0x2C, 0x15, 0xA2, 0x85, -0xEE, 0x99, 0xC5, 0x9D, 0xDA, 0x2D, 0xDC, 0x99, 0xA7, 0xE8, -0xD5, 0xC3, 0xAF, 0x0E, 0xC9, 0x66, 0xE1, 0xC0, 0x78, 0x36, -0x1C, 0x6A, 0xE4, 0xD0, 0xC5, 0x06, 0x11, 0x34, 0x4C, 0x75, -0x6D, 0x1D, 0x57, 0xAF, 0xB8, 0x50, 0x4D, 0x26, 0xEC, 0xB1, -0x9D, 0xD1, 0x24, 0x0D, 0x4B, 0xAC, 0x8D, 0x4E, 0xE9, 0x3D, -0x68, 0xAC, 0xA9, 0xA1, 0xB6, 0x6C, 0x0F, 0x41, 0x6F, 0xF3, -0x2A, 0x11, 0xEE, 0x2D, 0x76, 0xBD, 0xDD, 0xFE, 0x77, 0x80, -0x72, 0xFB, 0x57, 0x28, 0x90, 0xA9, 0xE8, 0x14, 0x3A, 0x99, -0x55, 0x4E, 0xB8, 0xFC, 0x6C, 0xDC, 0x7F, 0x04, 0x3C, 0x0D, -0xA0, 0x0A, 0x27, 0x2B, 0x62, 0x18, 0x55, 0xDA, 0x7D, 0xAD, -0xB8, 0x6B, 0xCE, 0x40, 0x4B, 0x33, 0x0D, 0xED, 0xED, 0x58, -0xE3, 0x67, 0x10, 0xE5, 0x70, 0xA0, 0xD3, 0xE9, 0x08, 0x42, -0x26, 0xB2, 0x2E, 0x92, 0xEB, 0x5D, 0x80, 0x3B, 0x25, 0x0A, -0xF9, 0xD1, 0x82, 0x7E, 0x9A, 0xFC, 0x41, 0x5C, 0x2D, 0x22, -0x9E, 0x4E, 0x42, 0x31, 0x1B, 0xD0, 0xEB, 0x15, 0x24, 0x4D, -0x83, 0x40, 0x00, 0xD1, 0x50, 0x51, 0x0E, 0x3D, 0x18, 0xCC, -0x98, 0x6C, 0x16, 0x8C, 0x46, 0x3D, 0x9A, 0x16, 0x12, 0xD3, -0x62, 0x5D, 0x92, 0xA2, 0xC4, 0xF8, 0x97, 0x2B, 0xEF, 0x4C, -0x84, 0x83, 0xEE, 0xA0, 0xBF, 0x95, 0x73, 0xEE, 0x66, 0x51, -0x5F, 0x23, 0xBD, 0x7B, 0x74, 0x27, 0x3D, 0xBD, 0x27, 0xCE, -0xB4, 0xEE, 0x58, 0xCC, 0xA6, 0x9B, 0xBB, 0x56, 0xC4, 0x4E, -0xE3, 0xD2, 0x33, 0x48, 0x1F, 0x36, 0x84, 0x01, 0x33, 0x8B, -0x70, 0x24, 0x74, 0xA1, 0xB5, 0xD1, 0x4D, 0x28, 0x18, 0x88, -0x00, 0xAA, 0xFF, 0xB9, 0xFB, 0x88, 0xEE, 0x9C, 0xE4, 0xAC, -0xD1, 0xCD, 0x9A, 0x14, 0x9E, 0xD1, 0x26, 0xF6, 0x9D, 0x9A, -0x94, 0x48, 0xAB, 0xA2, 0x60, 0x16, 0xE9, 0x47, 0xEA, 0x7E, -0xB5, 0xFE, 0x77, 0x7C, 0xF5, 0x97, 0x51, 0xAC, 0x56, 0x32, -0x9E, 0xEA, 0x4F, 0xD6, 0xA0, 0x9E, 0xD8, 0xE2, 0xED, 0xB8, -0x5C, 0xAD, 0xD4, 0x55, 0x1E, 0xA4, 0xD5, 0xED, 0x85, 0xB6, -0x2E, 0xCB, 0x38, 0x5E, 0x78, 0x81, 0x96, 0x0F, 0x3B, 0x68, -0xF2, 0xF3, 0xEB, 0x74, 0x44, 0x45, 0x6D, 0x96, 0x8D, 0xC6, -0x39, 0x39, 0x39, 0xB9, 0x24, 0x39, 0xBB, 0xE1, 0x11, 0x25, -0x93, 0x45, 0x09, 0x7E, 0xDC, 0x5F, 0x86, 0xFB, 0xDB, 0xEF, -0x30, 0x67, 0x65, 0x30, 0x62, 0xD6, 0xB3, 0x38, 0x12, 0x63, -0xB9, 0x54, 0x17, 0xE4, 0x42, 0x65, 0x39, 0x75, 0x07, 0x2A, -0xB1, 0xF8, 0x7F, 0x63, 0xAC, 0xE3, 0x68, 0xBF, 0x6D, 0x9F, -0x96, 0x9F, 0xE8, 0xD8, 0x45, 0x11, 0x4D, 0xDF, 0xD8, 0x07, -0x59, 0x2A, 0x37, 0xD8, 0x1D, 0xA6, 0x9E, 0xFD, 0xFB, 0x13, -0x9D, 0x9A, 0x8C, 0xCD, 0x66, 0xC2, 0x73, 0xB9, 0x96, 0xFA, -0x53, 0x55, 0xD8, 0x53, 0x13, 0x49, 0xCA, 0xCE, 0xE2, 0xDA, -0x75, 0x1F, 0xBF, 0x1E, 0x3F, 0x8E, 0xEB, 0xF0, 0x0F, 0x04, -0x3C, 0x7A, 0x66, 0x24, 0x7F, 0xC4, 0x84, 0xE8, 0x33, 0x15, -0xAA, 0x89, 0x97, 0xC6, 0xAC, 0xE2, 0x5C, 0xC7, 0x80, 0x88, -0xA6, 0xAC, 0x9F, 0x2F, 0x1A, 0xB2, 0x51, 0x1F, 0x6D, 0x25, -0x3E, 0xAD, 0x07, 0xD1, 0x09, 0x89, 0x44, 0x75, 0x72, 0xA0, -0x18, 0x0D, 0x04, 0xDB, 0x7C, 0x34, 0xB9, 0xEA, 0xB9, 0x7A, -0xF1, 0x3C, 0xD7, 0xCE, 0xFE, 0x4C, 0xA8, 0xDA, 0x4B, 0xFE, -0x58, 0x2B, 0x1F, 0xBF, 0x70, 0x84, 0x86, 0xEF, 0xBF, 0xC6, -0x5D, 0xC7, 0x01, 0xA2, 0x18, 0x33, 0xEE, 0x0D, 0x5A, 0x3B, -0x06, 0x30, 0x50, 0xA2, 0x78, 0xEC, 0x42, 0x71, 0x70, 0xDE, -0x95, 0x84, 0xFF, 0x54, 0x8B, 0x45, 0x98, 0xC6, 0x84, 0x22, -0xAC, 0x1A, 0xF0, 0xF9, 0xF1, 0x79, 0x5B, 0x08, 0xD4, 0xDF, -0x80, 0x1B, 0x32, 0xA3, 0x72, 0x3D, 0x7C, 0x30, 0x75, 0x27, -0xE9, 0x7D, 0x26, 0xE2, 0xBD, 0xE2, 0xE1, 0xC8, 0xB6, 0x4F, -0xF0, 0x36, 0x85, 0x97, 0x4C, 0x28, 0xE5, 0x9D, 0xFB, 0x00, -0xFE, 0xD2, 0xE4, 0xD5, 0x05, 0xC2, 0x59, 0xF3, 0xC5, 0x6B, -0x60, 0x24, 0x11, 0x9B, 0x12, 0x12, 0x36, 0x15, 0x9E, 0x68, -0x57, 0x48, 0x89, 0xF1, 0x33, 0x77, 0xB8, 0x9D, 0x19, 0x43, -0x9B, 0xE8, 0xA2, 0x6C, 0xA5, 0x45, 0x0E, 0x61, 0xED, 0xFA, -0x26, 0xD5, 0x7B, 0x37, 0x71, 0xBA, 0xEC, 0x64, 0x53, 0x5B, -0x50, 0x1B, 0x3C, 0x65, 0x2D, 0x55, 0x91, 0x30, 0x4A, 0x87, -0x80, 0xED, 0xCB, 0x77, 0x33, 0xA1, 0x44, 0xBC, 0x96, 0x49, -0x17, 0x16, 0xEC, 0x01, 0x71, 0xBA, 0xC7, 0xB4, 0xD3, 0xDD, -0x9E, 0x50, 0x0E, 0xCD, 0x1D, 0x9C, 0x6C, 0xB3, 0xBD, 0x9C, -0x37, 0x42, 0x9C, 0xEA, 0x38, 0x3C, 0xAE, 0x01, 0x22, 0xAB, -0xAF, 0xC4, 0xDF, 0x3E, 0xA3, 0xB3, 0xB3, 0x1F, 0x4A, 0xC5, -0xD9, 0x68, 0x9F, 0xDB, 0x3F, 0x4F, 0x44, 0x98, 0x7B, 0x7F, -0x40, 0x44, 0x3B, 0xD6, 0xB8, 0xC4, 0x35, 0x32, 0xCA, 0x22, -0x8F, 0xAF, 0x0D, 0xC7, 0x18, 0xB4, 0x10, 0xA3, 0xB8, 0xAD, -0xB3, 0xCE, 0x57, 0x25, 0xD1, 0xCB, 0x6C, 0x17, 0x87, 0x37, -0x4D, 0xF4, 0x26, 0x03, 0x4F, 0xF5, 0x29, 0xEC, 0x09, 0x71, -0xE8, 0x2D, 0x66, 0x7C, 0xB5, 0xFE, 0x89, 0xB7, 0x00, 0xF7, -0xFD, 0x58, 0xDC, 0x4B, 0x25, 0x05, 0xF4, 0x96, 0x54, 0x69, -0x47, 0x97, 0xD4, 0x14, 0x67, 0x7E, 0xC1, 0x30, 0xBA, 0x26, -0x77, 0xE5, 0xBA, 0xEB, 0x0C, 0x5E, 0xF7, 0x31, 0xE2, 0xBA, -0xA5, 0x51, 0xBE, 0xEF, 0x0C, 0x3F, 0x55, 0x35, 0xB0, 0x78, -0xEB, 0x9F, 0xB1, 0x1F, 0x1A, 0x70, 0x13, 0x52, 0xC8, 0x6C, -0x9D, 0x41, 0xDD, 0x94, 0xF2, 0xB8, 0xD3, 0x90, 0x93, 0x97, -0x81, 0xC3, 0xDA, 0x26, 0xAA, 0xD8, 0x4C, 0x93, 0xD7, 0x4F, -0xD9, 0xEE, 0x2A, 0x1A, 0x3D, 0xFE, 0xC0, 0x8A, 0x2F, 0x50, -0x1F, 0x19, 0xB0, 0x6C, 0x22, 0xAA, 0x2C, 0x53, 0xA2, 0xA8, -0xA6, 0x92, 0x98, 0xCE, 0x31, 0x52, 0x9A, 0xD3, 0x8E, 0x6A, -0x94, 0x38, 0x7F, 0xEA, 0x22, 0x0D, 0x57, 0x5A, 0x45, 0x3F, -0x58, 0x50, 0xBA, 0x9D, 0xF7, 0x1F, 0x25, 0xF6, 0x6D, 0xAD, -0x28, 0x42, 0x5D, 0x59, 0x24, 0xBD, 0x58, 0x5A, 0xAC, 0xBF, -0xB8, 0xAA, 0xD8, 0xA8, 0xAD, 0x28, 0x52, 0xB4, 0xE5, 0x93, -0xA8, 0x5B, 0x31, 0x89, 0xD9, 0xE2, 0xAE, 0xFE, 0xA7, 0xE0, -0xB7, 0x54, 0x3A, 0x19, 0x69, 0x49, 0x01, 0xCE, 0xA5, 0xE3, -0x99, 0xB2, 0xAC, 0x90, 0xA9, 0x25, 0x13, 0x71, 0xAE, 0x2C, -0xBA, 0xFB, 0x33, 0xFC, 0x07, 0x07, 0x66, 0xCF, 0x92, 0x85, -0x17, 0xB4, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png deleted file mode 100644 index c41352f36a..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Europe.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index def46811a6..3ab8534066 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,83 +1,95 @@ /* XPM */ -static const char *const Flag_Europe_xpm[] = { -"96 32 48 1", +static const char * Flag_Europe_xpm[] = { +"96 32 60 1", " c None", ". c #000000", -"+ c #0000FD", -"@ c #0000FF", -"# c #0808F7", -"$ c #5C5CA3", -"% c #1717E8", -"& c #767680", -"* c #EDED00", -"= c #A5A54D", -"- c #2E2EB9", -"; c #96961A", -"> c #4A4A8E", -", c #0000FB", -"' c #0000F4", -") c #0808EC", -"! c #5C5C9B", -"~ c #1717DD", -"{ c #0000EE", -"] c #767677", -"^ c #A5A547", -"/ c #0000DD", -"( c #2E2EA0", -"_ c #969616", -": c #4A4A7B", -"< c #0000D2", -"[ c #0000C6", -"} c #0808BF", -"| c #5C5C7E", -"1 c #1717B4", -"2 c #0000B9", -"3 c #76765C", -"4 c #A5A537", -"5 c #0808B3", -"6 c #5C5C76", -"7 c #1717A8", -"8 c #0000A9", -"9 c #2E2E7A", -"0 c #969611", -"a c #4A4A5E", -"b c #767654", -"c c #A5A533", -"d c #000097", -"e c #2E2E6D", -"f c #96960F", -"g c #4A4A54", -"h c #000081", -"i c #000077", -" ", +"+ c #003399", +"@ c #013498", +"# c #33527A", +"$ c #32527B", +"% c #103D90", +"& c #707555", +"* c #1B4389", +"= c #C9AC20", +"- c #C9AC21", +"; c #6F7556", +"> c #083994", +", c #E6BB0F", +"' c #4D606B", +") c #0B3A92", +"! c #4F616A", +"~ c #E5BB0F", +"{ c #16408C", +"] c #023597", +"^ c #737954", +"/ c #E7BE0F", +"( c #0D3A91", +"_ c #E8BE0E", +": c #727854", +"< c #2F4F7D", +"[ c #445B70", +"} c #455C6F", +"| c #2E4E7D", +"1 c #465D6F", +"2 c #CCAD1E", +"3 c #18418B", +"4 c #CBAD1E", +"5 c #2D4F7E", +"6 c #C0A626", +"7 c #C0A625", +"8 c #0E3B91", +"9 c #50636A", +"0 c #053696", +"a c #506369", +"b c #80804D", +"c c #E6BE0E", +"d c #083794", +"e c #E7BE0E", +"f c #7F7F4D", +"g c #103B8F", +"h c #17408B", +"i c #E5BB10", +"j c #485D6E", +"k c #0C3992", +"l c #0B3892", +"m c #495E6D", +"n c #E4BB10", +"o c #777B51", +"p c #264982", +"q c #C7AA21", +"r c #C6A923", +"s c #767A52", +"t c #3B5675", +"u c #3A5576", " ", " ", " ", " ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++++@#$@+++++++++++++. ", +".++++++++++%&*+=-+*;%++++++++++. ", +".++++++++++>,'+))+!~>++++++++++. ", +".+++++++++{+]]++++]]+{+++++++++. ", +".++++++++^/(++++++++(_:++++++++. ", +".++++++++<[++++++++++}|++++++++. ", +".++++++++]++++++++++++]++++++++. ", +".+++++++123++++++++++341+++++++. ", +".+++++++56++++++++++++75+++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++890++++++++0a8++++++++. ", +".++++++++bcd++++++++def++++++++. ", +".++++++++))+g++++++g+))++++++++. ", +".++++++++++hij+kl+mnh++++++++++. ", +".+++++++++++op@qr@ps+++++++++++. ", +".++++++++++++++tu++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png deleted file mode 100644 index 3390ee79c2..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_France.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 51cde44d8c..1d71b3430d 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,80 +1,40 @@ /* XPM */ -static const char *const Flag_France_xpm[] = { -"96 32 45 1", +static const char * Flag_France_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #0000FF", +"+ c #002395", "@ c #FFFFFF", -"# c #FF0000", -"$ c #0000FC", -"% c #0000F8", -"& c #FCFCFC", -"* c #FC0000", -"= c #0000F2", -"- c #F8F8F8", -"; c #F80000", -"> c #0000EC", -", c #F2F2F2", -"' c #F20000", -") c #0000E3", -"! c #ECECEC", -"~ c #EC0000", -"{ c #0000DB", -"] c #E3E3E3", -"^ c #E30000", -"/ c #0000D2", -"( c #DBDBDB", -"_ c #DB0000", -": c #0000C8", -"< c #D2D2D2", -"[ c #D20000", -"} c #0000BD", -"| c #C8C8C8", -"1 c #C80000", -"2 c #0000B1", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #0000A3", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #000093", -"9 c #A3A3A3", -"0 c #A30000", -"a c #000080", -"b c #939393", -"c c #930000", -"d c #000077", -"e c #808080", -"f c #800000", -" ", +"# c #ED2939", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm new file mode 100644 index 0000000000..e178b30edf --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -0,0 +1,41 @@ +/* XPM */ +static const char * Flag_Germany_xpm[] = { +"96 32 6 1", +" c None", +". c #000000", +"+ c #4A0000", +"@ c #DD0000", +"# c #F48A00", +"$ c #FFCE00", +" ", +" ", +" ", +" ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".##############################. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png deleted file mode 100644 index aa0ea79d31..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Italy.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index c47c87791a..d0832f2d8a 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,80 +1,40 @@ /* XPM */ -static const char *const Flag_Italy_xpm[] = { -"96 32 45 1", +static const char * Flag_Italy_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #006F00", +"+ c #009246", "@ c #FFFFFF", -"# c #FF0000", -"$ c #006C00", -"% c #006800", -"& c #FCFCFC", -"* c #FC0000", -"= c #006200", -"- c #F8F8F8", -"; c #F80000", -"> c #005C00", -", c #F2F2F2", -"' c #F20000", -") c #005300", -"! c #ECECEC", -"~ c #EC0000", -"{ c #004B00", -"] c #E3E3E3", -"^ c #E30000", -"/ c #004200", -"( c #DBDBDB", -"_ c #DB0000", -": c #003800", -"< c #D2D2D2", -"[ c #D20000", -"} c #002D00", -"| c #C8C8C8", -"1 c #C80000", -"2 c #002100", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #001C00", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #001500", -"9 c #A3A3A3", -"0 c #A30000", -"a c #001200", -"b c #939393", -"c c #930000", -"d c #000F00", -"e c #808080", -"f c #800000", -" ", +"# c #CE2B37", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png deleted file mode 100644 index 183275cd85..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Japan.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index 47be025c6b..bdd86a6882 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,74 +1,34 @@ /* XPM */ -static const char * const Flag_Japan_xpm[] = { -"96 32 67 1", +static const char * Flag_Japan_xpm[] = { +"96 32 28 1", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #FECACA", -"# c #FD8080", -"$ c #FD6161", -"% c #FD7676", -"& c #FEB6B6", -"* c #FEFEFE", -"= c #FFEDED", -"- c #FF4C4C", -"; c #FF0000", -"> c #FF2F2F", -", c #FFD7D7", -"' c #FEF5F5", -") c #FE2E2E", -"! c #FE1313", -"~ c #FEDDDD", -"{ c #F9F9F9", -"] c #FC7777", -"^ c #FD4545", -"/ c #F4F4F4", -"( c #F4F3F3", -"_ c #FA1313", -": c #FB0000", -"< c #FA0000", -"[ c #F4D4D4", -"} c #EFEFEF", -"| c #EFCFCF", -"1 c #F10000", -"2 c #EF9F9F", -"3 c #E4E4E4", -"4 c #E2BEBE", -"5 c #DD0000", -"6 c #E19090", -"7 c #D9D9D9", -"8 c #D8D0D0", -"9 c #CA0404", -"0 c #CA0000", -"a c #D5A9A9", -"b c #D0D0D0", -"c c #BC4242", -"d c #B40000", -"e c #B71A1A", -"f c #CFCFCF", -"g c #C6C6C6", -"h c #BEA7A7", -"i c #990808", -"j c #980000", -"k c #B78787", -"l c #BBBBBB", -"m c #A88989", -"n c #7B0B0B", -"o c #770000", -"p c #780202", -"q c #9E6B6B", -"r c #AEAEAE", -"s c #A89C9C", -"t c #8F4E4E", -"u c #7F1B1B", -"v c #7A0A0A", -"w c #7D1515", -"x c #8B4242", -"y c #A48F8F", -"z c #A0A0A0", -"A c #8F8F8F", -"B c #7C7C7C", -" ", +"@ c #FDF9FA", +"# c #E497A9", +"$ c #CA3458", +"% c #C0113B", +"& c #CA3559", +"* c #E498AA", +"= c #FEFAFB", +"- c #F8E4E9", +"; c #C93155", +"> c #BC002D", +", c #C93256", +"' c #F8E5EA", +") c #FDF7F8", +"! c #C82E53", +"~ c #C93055", +"{ c #FDF8F9", +"] c #E18EA2", +"^ c #E290A4", +"/ c #CA375A", +"( c #BF0B36", +"_ c #BF0D38", +": c #CB385B", +"< c #E394A7", +"[ c #E396A9", +"} c #BE0733", " ", " ", " ", @@ -77,26 +37,27 @@ static const char * const Flag_Japan_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++@#$%&*++++++++++++. ", -".++++++++++=-;;;;;>,+++++++++++. ", -".*********');;;;;;;!~**********. ", -".{{{{{{{{{];;;;;;;;;^{{{{{{{{{{. ", -".////////(_:::::::::<[/////////. ", -".}}}}}}}}|111111111112}}}}}}}}}. ", -".333333334555555555556333333333. ", -".77777777890000000000a777777777. ", -".bbbbbbbbbcdddddddddefbbbbbbbbb. ", -".ggggggggghijjjjjjjjkgggggggggg. ", -".llllllllllmnooooopqlllllllllll. ", -".rrrrrrrrrrrstuvwxyrrrrrrrrrrrr. ", -".zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz. ", -".AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA. ", -".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@#$%%&*=+++++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++)!>>>>>>>>~{+++++++++. ", +".+++++++++]>>>>>>>>>>^+++++++++. ", +".+++++++++$>>>>>>>>>>/+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++&>>>>>>>>>>:+++++++++. ", +".+++++++++<>>>>>>>>>>[+++++++++. ", +".+++++++++{!>>>>>>>>~@+++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++++@#$}}&*=+++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 7b51bc78ef..26ebd9fa24 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,248 +1,134 @@ /* XPM */ -static const char *const Flag_Korea_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 210 2", -". c Black", -"p c #CACACA", -"= c #D9D9D9", -"a c #EED0D6", -">. c #770730", -"e c #F7F7F7", -"^ c #4B4B4B", -"}. c #5A5A5A", -"OX c #A0A4A8", -"k. c #878787", -"P c #D38494", -"u. c #161951", -"@ c #E1E1E1", -"{. c #353535", -"X c #FFFFFF", -"-. c #71163F", -"g c #E3A3AE", -"0 c #444444", -"t c #535353", -"%X c #626262", -"g. c #011F5A", -"x. c #3D557C", -"P. c #475D7F", -"C. c #8F8F8F", -"B c #B80020", -"$. c #949CB0", -"# c #9E9E9E", -".. c #B60323", -"N c #B6001A", -"C c #B6001B", -"k c #5B5B5B", -"`. c #6A6A6A", -"/ c #797979", -"*. c #AD0B2A", -"6 c #888888", -"2X c #979797", -"f c #D5667A", -"w. c #843656", -"Q c #BD2D47", -"y. c #16396E", -"+. c #D3D3D3", -"9. c #002F6C", -"$ c #E2E2E2", -"s. c #002C65", -"` c #D0C6CD", -"x c #F1F1F1", -"S. c #363636", -"=. c #B20927", -"F c #454545", -"W. c #959DA6", -"n. c #00295F", -"l c #545454", -"v. c #002962", -",. c #C0344C", -"J. c #00265A", -"2. c #7394AE", -"Z c #C53851", -"Q. c #3E5375", -";X c #9F9F9F", -"H. c #002358", -"z. c #C2C4C6", -"j c #AEAEAE", -"V. c #BDBDBD", -"e. c #D7B8BA", -"( c #CCCCCC", -"U c #B2001E", -"$X c #2F2F2F", -"; c #F9F9F9", -"! c #E1C0C6", -"v c #4D4D4D", -"@X c #6B6B6B", -"< c #7A7A7A", -"3. c #412554", -"c. c #001D59", -"q c #898989", -" c #656565", -"6X c #838383", -"1X c #929292", -"F. c #223A67", -"B. c #747D96", -"i. c #471E4A", -"Z. c #A1A1A1", -"N. c #0E275D", -"n c #B0B0B0", -"8. c #072C66", -"| c #B90928", -"!. c #072657", -"'. c #313131", -"b. c #002B62", -":X c #404040", -"y c #4F4F4F", -"2 c #6D6D6D", -"R c #B70C2D", -"3X c #8B8B8A", -"q. c #151C56", -"{ c #B00B2B", -"w c #C7C7C7", -"4. c #930326", -"z c #D6D6D6", -"^. c #001F53", -", c #484848", -"D. c #939CA9", -"% c #575757", -"p. c #302152", -"s c #DC8696", -"V c #B7001E", -"X. c #B7001F", -"d c #D35C72", -"H c #B1B1B1", -"#. c #DEDEDE", -"G. c #00164F", -"R. c #323232", -"1 c #FCFCFC", -"<. c #DBCBCE", -" . c #B80A29", -"D c #9B9B9B", -"T. c #B9B9B9", -"a. c #062A62", -"W c #B30018", -"O. c #E1E2E2", -"m c #D88695", -"1. c #D7D7D7", -"XX c #808A97", -"A c #E4BAC2", -"oX c #858E99", -"]. c #3A3A3A", -"+X c #585858", -"r c #949494", -" X c #ADAEAE", -"o. c #C66174", -"~ c #C1C1C1", -"L c #DADBDB", -"8 c #D0D0D0", -"t. c #92A0B1", -"=X c #333333", -"- c #FDFDFD", -"*X c #424242", -"u c #515151", -"#X c #606060", -"6. c #B40723", -"K c #7E7E7E", -"* c #8D8D8D", -"h. c #5A4F73", -"Y. c #BABABA", -"0. c #00306C", -"@. c #D8D8D8", -"S c #E7E7E7", -"|. c #2C2C2C", -">X c #3B3B3B", -"m. c #002A60", -"[ c #B20A2B", -"d. c #002A62", -"f. c #002A63", -"/. c #16315F", -"M c #BC1231", -"4 c #595959", -".X c #959BA2", -"] c #AD001C", -"h c #F3E6E9", -"7X c #959594", -"4X c #959595", -"Y c #B70B2E", -"o c #B3B3B3", -"A. c #C2C2C2", -"E c #B7082A", -"I c #B50E29", -"r. c #D1D1D1", -"U. c #252525", -"M. c #00215A", -"~. c #001E52", -"K. c #001E55", -"9 c #525252", -"G c #616161", -"[. c #7F7F7F", -"&X c #8E8E8E", -"j. c #D1C8C7", -"(. c #5F7088", -/* pixels */ -" ", +static const char * Flag_Korea_xpm[] = { +"96 32 99 2", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #FDFDFD", +"# c #E2E2E2", +"$ c #313131", +"% c #BABABA", +"& c #BBBBBB", +"* c #505050", +"= c #777777", +"- c #3F3F3F", +"; c #868686", +"> c #F9F9F9", +", c #3E3E3E", +"' c #5B5B5B", +") c #A1A1A1", +"! c #545454", +"~ c #2E2E2E", +"{ c #7D7D7D", +"] c #5F5F5F", +"^ c #5E5E5E", +"/ c #7E7E7E", +"( c #434343", +"_ c #9C9C9C", +": c #A5A5A5", +"< c #E4E4E4", +"[ c #292929", +"} c #636363", +"| c #717171", +"1 c #2B2B2B", +"2 c #F0F0F0", +"3 c #EEB6C0", +"4 c #D44964", +"5 c #C81537", +"6 c #C81638", +"7 c #D54C66", +"8 c #EEB7C1", +"9 c #F1F1F1", +"0 c #8D8D8D", +"a c #626262", +"b c #E8E8E8", +"c c #A0A0A0", +"d c #4B4B4B", +"e c #B0B0B0", +"f c #E17E91", +"g c #C60C30", +"h c #E28395", +"i c #B2B2B2", +"j c #C9C9C9", +"k c #E4B0BD", +"l c #707070", +"m c #A54367", +"n c #C10D32", +"o c #BD0D34", +"p c #D54D67", +"q c #52285E", +"r c #6A1E52", +"s c #093374", +"t c #023378", +"u c #50245B", +"v c #C7193C", +"w c #0A3275", +"x c #761C4D", +"y c #602155", +"z c #003478", +"A c #812351", +"B c #353973", +"C c #653E6F", +"D c #A38BA8", +"E c #B196B0", +"F c #323232", +"G c #555555", +"H c #6D5985", +"I c #6C5885", +"J c #565656", +"K c #ECECEC", +"L c #282828", +"M c #666666", +"N c #939393", +"O c #A68FAA", +"P c #373A73", +"Q c #0E3274", +"R c #0D3374", +"S c #363A73", +"T c #A891AC", +"U c #E9E9E9", +"V c #949494", +"W c #676767", +"X c #B1B1B1", +"Y c #646464", +"Z c #808080", +"` c #4F4F4F", +" . c #A6A6A6", +".. c #B7B7B7", +"+. c #787878", +"@. c #333333", +"#. c #EBEBEB", +"$. c #444444", +"%. c #CECECE", " ", " ", " ", " ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X . ", -". X X X X X X o O + X X X X X X X X X X X X @ # $ X X X X X X . ", -". X X X X X @ % & * = - X X X X X X X X ; : > , < X X X X X X . ", -". 1 1 1 1 1 2 3 4 5 6 7 1 1 1 1 1 1 1 1 8 9 0 3 q w 1 1 1 1 1 . ", -". e e e e r t y u i p e e a s d f g h e + j k 2 3 l z e e e e . ", -". x x x x c v l b n x x m M N B V C Z A x S D F & G H x x x x . ", -". 7 7 7 7 7 O J K L 7 P I U Y T R E W Q ! 7 ~ ^ / ( 7 7 7 7 7 . ", -". ) ) ) ) ) ) ( _ ) ` ' ] [ { } | ...X.o.) O.+.@.) ) ) ) ) ) . ", -". #.#.#.#.#.#.#.#.#.$.%.&.*.=.=.-.;.:.>.,.<.#.#.#.#.#.#.#.#.#.. ", -". 1.1.1.1.1.1.1.1.1.2.3.4.5.6.7.8.9.0.q.w.e.1.1.1.1.1.1.1.1.1.. ", -". r.r.r.r.r.r.r.r.r.t.y.u.i.p.a.s.d.f.g.h.j.r.r.r.r.r.r.r.r.r.. ", -". p p p p p p k.l.p z.x.c.v.b.n.n.m.M.N.B.p V.C.Z.p p p p p p . ", -". A.A.A.A.H 2 S.& l.A.D.F.G.H.J.J.K.L.P.I.A.C.U.y k.Y.A.A.A.A.. ", -". T.T.T.T.9 5 , R.2 E.T.W.Q.!.~.^./.(.).T._.`.u '.].[.T.T.T.T.. ", -". n n n n C.{.}.4 |./ n n X.XXXoXOXn n Z.+Xb @X#Xv n n n n n . ", -". l.l.l.l.l.G 5 $X'.%XD l.l.l.l.l.l.l.l.&X*X$X=X9 -Xl.l.l.l.l.. ", -". ;X;X;X;X;X;X:X>X,X + + + + + + + + > ; , = ' + + + + + + . ", +". + + + + + ) ! ~ { ] + + + + + + + + + + ^ / ( _ : + + + + + . ", +". + + + + < [ } | 1 2 + + 3 4 5 6 7 8 + + 9 0 | a [ < + + + + . ", +". + + + + b c - d e + + f g g g g g g h + + i d - c b + + + + . ", +". + + + + + + j | + + k g g g g g g g g 8 + + l j + + + + + + . ", +". + + + + + + + + + + m g g g g g n o g p + + + + + + + + + + . ", +". + + + + + + + + + + q g g g g r s t u v + + + + + + + + + + . ", +". + + + + + + + + + + w x n o y z z z z A + + + + + + + + + + . ", +". + + + + + + + + + + B z z z z z z z z C + + + + + + + + + + . ", +". + + + + + + j | + + D z z z z z z z z E + + l j + + + + + + . ", +". + + + + b c F G e + + H z z z z z z I + + i J $ c b + + + + . ", +". + + + + K L M N F b + + O P Q R S T + + U 0 V W [ K + + + + . ", +". + + + + + X M Y Z ` + + + + + + + + + + ` Z a ...+ + + + + . ", +". + + + + + + * +.@.0 > + + + + + + + + > 0 @.= ' + + + + + + . ", +". + + + + + + #.$.%.+ + + + + + + + + + + + %.$.#.+ + + + + + . ", +". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", +". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", " ", " ", " ", " ", " ", -" ", -" " -}; +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_SDK.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm new file mode 100644 index 0000000000..169caacdcc --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_SDK.xpm @@ -0,0 +1,114 @@ +/* XPM */ +static const char * Flag_SDK_xpm[] = { +"96 32 79 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E9E9FE", +"# c #5959FE", +"$ c #1515FE", +"% c #0505FE", +"& c #1313FE", +"* c #3232FE", +"= c #0000FF", +"- c #0202FE", +"; c #0C0CFE", +"> c #2B2BFE", +", c #7676FE", +"' c #EEEEFE", +") c #D4D4FE", +"! c #1C1CFE", +"~ c #0303FE", +"{ c #9292FE", +"] c #5151FE", +"^ c #B1B1FE", +"/ c #F8F8FE", +"( c #CCCCFE", +"_ c #E5E5FE", +": c #9393FE", +"< c #0A0AFE", +"[ c #2424FE", +"} c #EAEAFE", +"| c #C2C2FE", +"1 c #1010FE", +"2 c #0D0DFE", +"3 c #B6B6FE", +"4 c #0F0FFE", +"5 c #8989FE", +"6 c #6767FE", +"7 c #ACACFE", +"8 c #0808FE", +"9 c #1E1EFE", +"0 c #D2D2FE", +"a c #5F5FFE", +"b c #9C9CFE", +"c c #E8E8FE", +"d c #DDDDFE", +"e c #1A1AFE", +"f c #9494FE", +"g c #3636FE", +"h c #E7E7FE", +"i c #B7B7FE", +"j c #0707FE", +"k c #A4A4FE", +"l c #F7F7FE", +"m c #B0B0FE", +"n c #FCFCFE", +"o c #C4C4FE", +"p c #8181FE", +"q c #2020FE", +"r c #1B1BFE", +"s c #0101FE", +"t c #0606FE", +"u c #AEAEFE", +"v c #E2E2FE", +"w c #8787FE", +"x c #0404FE", +"y c #A2A2FE", +"z c #3E3EFE", +"A c #A8A8FE", +"B c #F9F9FE", +"C c #5656FE", +"D c #E6E6FE", +"E c #B4B4FE", +"F c #0909FE", +"G c #9696FE", +"H c #4D4DFE", +"I c #2222FE", +"J c #1D1DFE", +"K c #6969FE", +"L c #0E0EFE", +"M c #2D2DFE", +"N c #7575FE", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@#$%&*+++==-;>,'+++==+++)!~{+. ", +".+]=^/(]+++==+_:<[}++==++|123++. ", +".+4=_++++++==+++5=6++==+7890+++. ", +".+9=&abc+++==+++d=e++==f-gh++++. ", +".+ie===jk++==+++l=%++====m+++++. ", +".++nopq=!++==+++d=r++==:stu++++. ", +".+++++v=1++==+++w=6++==+kx~y+++. ", +".+zAcB7=C++==+D:<[}++==++EFsG++. ", +".+HI;%JK'++==~LMN'+++==+++|4=w+. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png deleted file mode 100644 index c71920f92c..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Taiwan.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index f0670e4bc4..19aa7cc4f6 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,124 +1,67 @@ /* XPM */ -static const char *const Flag_Taiwan_xpm[] = { -"96 32 89 1", +static const char * Flag_Taiwan_xpm[] = { +"96 32 32 1", " c None", ". c #000000", -"# c #000099", -"$ c #000098", -"% c #03039A", -"& c #000094", -"' c #05059B", -"( c #050095", -") c #DC0014", -"* c #FF0000", -"+ c #FD0001", -", c #04049B", -"- c #000096", -"! c #020299", -"0 c #2424A7", -"1 c #04049A", -"2 c #000097", -"3 c #000093", -"4 c #6262BF", -"5 c #2828A8", -"6 c #6C6CC1", -"7 c #3E3EB1", -"8 c #3B3BB0", -"9 c #00008F", -": c #01019A", -"; c #1919A3", -"< c #4040B0", -"= c #6363C0", -"> c #D6D6EE", -"? c #D9D9ED", -"@ c #C5C5E7", -"A c #3F3FB0", -"B c #3D3DAF", -"C c #020297", -"D c #010199", -"E c #5E5EBE", -"F c #DFDFF2", -"G c white", -"H c #BFBFE5", -"I c #2626A7", -"J c #4242B0", -"K c #7D7DCA", -"L c #FAFAFD", -"M c #FBFBFD", -"N c #FCFCFD", -"O c #FCFCFE", -"P c #DADAF0", -"Q c #6A6AC2", -"R c #1B1BA3", -"S c #000199", -"T c #0E0E9B", -"U c #5858BC", -"V c #D3D3ED", -"W c #2727A6", -"X c #060699", -"Y c #1212A0", -"Z c #6464C0", -"[ c #8080CC", -"] c #F4F4FA", -"^ c #F8F8FB", -"_ c #7070C4", -"` c #4949B5", -"a c #000095", -"b c #040499", -"c c #000092", -"d c #6767C2", -"e c #8686CA", -"f c #7070C5", -"g c #2B2BA9", -"h c #00009A", -"i c #01049C", -"j c #1619A4", -"k c #393CB3", -"l c #00029A", -"m c #1619A5", -"n c #020096", -"o c #DB0014", -"p c #FC0001", -"q c #0A0092", -"r c #060090", -"s c #0B0092", -"t c #0F008E", -"u c #DD0013", -"v c #FD0000", -"w c #E5000F", -"x c #E6010F", -"y c #E60110", -"z c #FB0002", -"{ c #FE0000", -" ", +"+ c #000095", +"@ c #FE0000", +"# c #050597", +"$ c #2727A5", +"% c #2A2AA6", +"& c #6A6AC1", +"* c #A4A4D9", +"= c #6B6BC1", +"- c #2929A6", +"; c #3636AB", +"> c #8181CA", +", c #9595D3", +"' c #D4D4ED", +") c #9494D2", +"! c #8282CB", +"~ c #3535AB", +"{ c #2B2BA7", +"] c #7F7FC9", +"^ c #FFFFFF", +"/ c #7E7ECA", +"( c #040497", +"_ c #3C3CAE", +": c #8080C9", +"< c #7F7FCA", +"[ c #9494D3", +"} c #2C2CA7", +"| c #5454B8", +"1 c #9F9FD7", +"2 c #5555B8", +"3 c #2828A6", " ", " ", " ", " ", "................................ ", -".#####$%#&'$$$##()*+***********. ", -".###$$,-!0&1!$##()*+***********. ", -".##$#23456789:$#()*+***********. ", -".###2;<=>?@ABCD#()*+***********. ", -".###$CEFGGGHI&D$()*+***********. ", -".##D-JKLMNOPQR-S()*+***********. ", -".###$TUGGNGVWX$#()*+***********. ", -".###2YZ[]^P_`aD$()*+***********. ", -".###$bcdEefg3D$#()*+***********. ", -".hhhhhijiklm#hhhno*p***********. ", -".qqqqqqrsrqrqqqqtu*v***********. ", -".wwwwwwxwywxwwwwwz*{***********. ", -".******************************. ", -".{{{{{{{{{{{{{{{{{*{***********. ", -".******************************. ", -".******************************. ", -".******************************. ", -".******************************. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".+++++#+$+#+++++@@@@@@@@@@@@@@@. ", +".+++++%&*=-+++++@@@@@@@@@@@@@@@. ", +".++++;>,')!~++++@@@@@@@@@@@@@@@. ", +".++++{]^^^/{++++@@@@@@@@@@@@@@@. ", +".+++(_:^^^<_(+++@@@@@@@@@@@@@@@. ", +".++++;>[')!~++++@@@@@@@@@@@@@@@. ", +".+++++}|12{+++++@@@@@@@@@@@@@@@. ", +".+++++#+3+#+++++@@@@@@@@@@@@@@@. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png deleted file mode 100644 index 2803a73a3d..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_USA.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 0a991bd02e..2b1d466240 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,65 +1,128 @@ /* XPM */ static const char * Flag_USA_xpm[] = { -"96 32 30 1", -" c None", -". c #000000", -"+ c #0000FF", -"@ c #CE7070", -"# c #B0BF99", -"$ c #F1F1F1", -"% c #FFFFFF", -"& c #0000FD", -"* c #CF8484", -"= c #DA9090", -"- c #0000F3", -"; c #B0BF96", -"> c #0000DF", -", c #0000CB", -"' c #B0BF8C", -") c #D98E8E", -"! c #0000B5", -"~ c #CA6C6C", -"{ c #000098", -"] c #B0BF80", -"^ c #000077", -"/ c #C26464", -"( c #DBDBDB", -"_ c #C17676", -": c #B55757", -"< c #BBBBBB", -"[ c #AC6161", -"} c #A34545", -"| c #8B8B8B", -"1 c #8E4343", -" ", -" ", -" ", -" ", -" ", -"................................ ", -".++++++++++++++@@@@@@@@@@@@@@@@. ", -".+#+#+#+#+#+#++$%%%%%%%%%%%%%%%. ", -".&&&&&&&&&&&&&&*===============. ", -".-;-;-;-;-;-;--@@@@@@@@@@@@@@@@. ", -".>>>>>>>>>>>>>>$%%%%%%%%%%%%%%%. ", -".,',',',',',',,*))))))))))))))). ", -".!!!!!!!!!!!!!!@~~~~~~~~~~~~~~~. ", -".{]{]{]{]{]{]{{$$$$$$$$$$$$$$$$. ", -".^^^^^^^^^^^^^^****************. ", -".^^^^^^^^^^^^^^@///////////////. ", -".((((((((((((((((((((((((((((((. ", -".______________________________. ", -".::::::::::::::::::::::::::::::. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[. ", -".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".||||||||||||||||||||||||||||||. ", -".111111111111111111111111111111. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +"96 32 93 2", +" c None", +". c #000000", +"+ c #4C4B79", +"@ c #54537F", +"# c #4E4E7C", +"$ c #52517E", +"% c #4F4E7C", +"& c #504F7D", +"* c #51517E", +"= c #4F4E7D", +"- c #51517F", +"; c #4D4C7C", +"> c #52527F", +", c #4B4A79", +"' c #B22234", +") c #53527F", +"! c #5F5E89", +"~ c #616089", +"{ c #60608A", +"] c #616088", +"^ c #606088", +"/ c #605F87", +"( c #52517F", +"_ c #D58791", +": c #3E3D70", +"< c #62618A", +"[ c #65658C", +"} c #64638A", +"| c #62628B", +"1 c #63638B", +"2 c #63628A", +"3 c #61608A", +"4 c #64648B", +"5 c #605F89", +"6 c #3E3D6F", +"7 c #FFFFFF", +"8 c #6D6D92", +"9 c #68678E", +"0 c #6B6A91", +"a c #696890", +"b c #6A698F", +"c c #68688F", +"d c #66658F", +"e c #6E6D95", +"f c #63628B", +"g c #B83243", +"h c #3D3C6F", +"i c #68678D", +"j c #6F6E93", +"k c #69688F", +"l c #6C6C92", +"m c #6B6A92", +"n c #6C6B91", +"o c #6D6C91", +"p c #696990", +"q c #6F6F93", +"r c #CF7681", +"s c #66658C", +"t c #6F6E94", +"u c #6A6990", +"v c #6E6D92", +"w c #6B6B8F", +"x c #6D6D91", +"y c #6D6C92", +"z c #6E6D94", +"A c #676690", +"B c #6F6E95", +"C c #65648D", +"D c #3C3B6E", +"E c #6A6991", +"F c #66658B", +"G c #66658E", +"H c #66668E", +"I c #67668E", +"J c #BD4352", +"K c #6C6C93", +"L c #6C6B90", +"M c #6A6A91", +"N c #68678F", +"O c #6F6E96", +"P c #64638C", +"Q c #CA6672", +"R c #65648B", +"S c #6C6C91", +"T c #6B6B91", +"U c #62628A", +"V c #66658D", +"W c #67668F", +"X c #64638D", +"Y c #6E6E95", +"Z c #C45462", +"` c #5E456E", +" . c #5F456E", +" ", +" ", +" ", +" ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". + @ # $ % & * = - ; > , ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". ) ! ~ { ] ^ / ] ~ ~ ~ ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". : < [ } | } 1 2 3 4 5 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". } 8 9 0 a b a c 0 d e f g g g g g g g g g g g g g g g g g g . ", +". h i j k l m n o p q 9 h r r r r r r r r r r r r r r r r r r . ", +". s t u v w x y k z A B C 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". D } E F 9 G H I [ 0 2 D J J J J J J J J J J J J J J J J J J . ", +". F B 9 K k L M N v H O P Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". D R z N S p b T G t C D 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". U t V m W u T W 8 X Y 3 Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". ` ` ` .` ` ` ` ` .` ` Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". J J J J J J J J J J J J J J J J J J J J J J J J J J J J J J . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". r r r r r r r r r r r r r r r r r r r r r r r r r r r r r r . ", +". g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.png b/Source/Core/DolphinWX/resources/Flag_Unknown.png deleted file mode 100644 index 44cd41bafb..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Unknown.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 3d95beb102..d67ac42ee0 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,47 +1,91 @@ -/* XPM */ -static const char *const Flag_Unknown_xpm[] = { -"96 32 15 1", +/* XPM */ +static const char * Flag_Unknown_xpm[] = { +"96 32 59 1", " c None", -"! c black", -"# c #360000", -"$ c #D60000", -"% c #1B0000", -"& c #6B0000", -"' c #510000", -"( c #280000", -") c #BB0000", -"* c #780000", -"+ c #A00000", -", c #0D0000", -"- c #C90000", -". c #AE0000", -"0 c #430000", +". c #000000", +"+ c #FFFFFF", +"@ c #FF0000", +"# c #FE3434", +"$ c #FED4D4", +"% c #FE1C1C", +"& c #FE0303", +"* c #FE9292", +"= c #FEB3B3", +"- c #FEC2C2", +"; c #FE1010", +"> c #FE0D0D", +", c #FEB6B6", +"' c #FE3333", +") c #FEACAC", +"! c #FE0808", +"~ c #FE1E1E", +"{ c #FED2D2", +"] c #FEB8B8", +"^ c #FEB1B1", +"/ c #FE9494", +"( c #FE0202", +"_ c #FE3636", +": c #FEE7E7", +"< c #FE3D3D", +"[ c #FE3131", +"} c #FEB0B0", +"| c #FE0101", +"1 c #FEAFAF", +"2 c #FE9393", +"3 c #FE0606", +"4 c #FEAEAE", +"5 c #FE1F1F", +"6 c #FEE9E9", +"7 c #FEE8E8", +"8 c #FE2020", +"9 c #FE4747", +"0 c #FE2F2F", +"a c #FEA4A4", +"b c #FE0404", +"c c #FEA2A2", +"d c #FE7A7A", +"e c #FE6868", +"f c #FEEDED", +"g c #FE6767", +"h c #FE7C7C", +"i c #FECBCB", +"j c #FEB4B4", +"k c #FE0909", +"l c #FE9696", +"m c #FEFBFB", +"n c #FE8080", +"o c #FE2727", +"p c #FE8282", +"q c #FEFCFC", +"r c #FE5151", +"s c #FE0F0F", +"t c #FE8787", " ", " ", " ", " ", -" ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!####!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!#$$#!###! ", -"!!!%&'!!!!%&'!()$$$$$*!#$$##$$#! ", -"!!!#$+!!!!#$+,-$$$$$$$&#$$#))$#! ", -"!!!#$+!!!!#$+#$.!!!!0$+#$$)))#!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$)))#!! ", -"!!!#$.!!!!0$+#$+!!!!#$+#))#))$#! ", -"!!!,-$$$$$$$&#$+!!!!#$+#$$!#$$#! ", -"!!!!()$$$$$*!%&'!!!!%&'!##!!##!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@@++++@@++@@#+++@@++@@+++$%&*. ", +".+@@++++@@++@@@=++@@++@@++-;>,+. ", +".+@@++++@@++@@#'++@@++@@+)!~{++. ", +".+@@++++@@++@@]@^+@@++@@/(_:+++. ", +".+@@++++@@++@@+<[+@@++@@@@}++++. ", +".+@@++++@|++@@+-@1@@++@@2|34+++. ", +".+5@6++7@8++@@++90@@++@@+ab&c++. ", +".+d@effg@h++@@++i@@@++@@++jk|l+. ", +".+mno33opq++@@+++r@@++@@+++-s@t. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", " ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/KDE.h b/Source/Core/DolphinWX/resources/KDE.h deleted file mode 100644 index 64d350fd2b..0000000000 --- a/Source/Core/DolphinWX/resources/KDE.h +++ /dev/null @@ -1,3771 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_3_H_ -#define _WXINCLUDE_MYHEADER_3_H_ - -static const unsigned char Toolbar_Browse3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE5, 0xDB, -0xC0, 0x00, 0xAF, 0x92, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x06, -0x24, 0x26, 0x16, 0x57, 0xF6, 0xF6, 0xF9, 0xEB, 0xE7, 0xE5, -0xF1, 0xBC, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x6E, 0xBF, 0x00, -0x1C, 0x25, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x03, 0x23, 0x40, -0x57, 0x90, 0x94, 0xF5, 0xEE, 0xE1, 0xEA, 0xA9, 0x97, 0x79, -0x3D, 0x19, 0x22, 0x3D, 0xE9, 0x4E, 0x6B, 0xB9, 0xFF, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xE2, 0xE7, 0xE2, 0x00, 0xFE, 0x05, 0x08, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x09, 0x2D, 0x32, 0x36, 0x6B, 0x08, 0x0B, -0x14, 0x0E, 0x13, 0x1C, 0x35, 0x23, 0x22, 0x23, 0x1F, 0x58, -0xEF, 0xE9, 0xD8, 0x05, 0xFE, 0xFD, 0xFB, 0x00, 0x04, 0x05, -0x09, 0x00, 0x04, 0x05, 0x09, 0x00, 0x04, 0x05, 0x09, 0x00, -0x02, 0x04, 0x06, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, -0x06, 0x03, 0x20, 0x2E, 0x3C, 0x59, 0x5B, 0x01, 0xFA, 0xE7, -0x00, 0x01, 0xFB, 0xEA, 0x01, 0x33, 0x3F, 0x5D, 0x6B, 0xF8, -0xF5, 0xEB, 0x14, 0xD6, 0xC7, 0x9E, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, -0x03, 0x03, 0x00, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x09, 0x2C, 0x2E, -0x32, 0x66, 0x0A, 0x0C, 0x0E, 0x10, 0x00, 0xFC, 0xF7, 0x00, -0x00, 0xFC, 0xF5, 0x00, 0x15, 0x1B, 0x2C, 0x23, 0x20, 0x1E, -0x1D, 0x53, 0xC8, 0xB4, 0x7C, 0x06, 0xF8, 0xF5, 0xEE, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x17, -0x1E, 0x00, 0x1C, 0x16, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x02, 0x06, 0x05, 0x02, 0x1E, 0x30, 0x38, 0x47, -0x5D, 0x01, 0xF8, 0xE8, 0x00, 0x00, 0xFB, 0xF4, 0x00, 0x00, -0xFB, 0xF4, 0x00, 0x01, 0xFA, 0xEB, 0x01, 0x34, 0x3B, 0x4F, -0x6C, 0xFD, 0xFA, 0xF5, 0x12, 0xCB, 0xB9, 0x83, 0x01, 0xF4, -0xF0, 0xE5, 0x00, 0xFC, 0xFB, 0xF8, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0xDD, 0xD0, 0xAE, 0x00, 0xE4, 0xDB, -0xBF, 0x01, 0xF0, 0xE9, 0xD8, 0x02, 0xFF, 0xFF, 0x00, 0x02, -0x00, 0x00, 0x00, 0x01, 0x04, 0x03, 0x01, 0x0E, 0x0B, 0x09, -0x05, 0x22, 0x29, 0x2A, 0x2C, 0x6B, 0x0A, 0x09, 0x03, 0x11, -0x00, 0xFB, 0xF4, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xFF, -0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x16, 0x19, 0x22, 0x25, -0x29, 0x23, 0x1F, 0x6E, 0xDD, 0xC7, 0x95, 0xA9, 0xD4, 0xC1, -0x93, 0xE1, 0x0D, 0x14, 0x23, 0xF5, 0x0C, 0x10, 0x1D, 0xFE, -0x0A, 0x0E, 0x18, 0xFE, 0x0B, 0x0E, 0x18, 0xFF, 0x1E, 0x2A, -0x49, 0xFF, 0x01, 0xA4, 0x7A, 0x0E, 0x31, 0x1A, 0x17, 0x14, -0x45, 0x0F, 0x10, 0x13, 0x24, 0x10, 0x12, 0x14, 0x23, 0x10, -0x12, 0x14, 0x23, 0x0C, 0x0E, 0x10, 0x17, 0x04, 0x08, 0x0D, -0x07, 0x01, 0x01, 0xFF, 0x01, 0x01, 0xFC, 0xF1, 0x00, 0x00, -0x01, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, 0x04, -0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0xFF, -0x04, 0x11, 0x00, 0xFF, 0xFB, 0xFA, 0xFF, 0xFA, 0xF5, 0xEF, -0xF7, 0xF3, 0xF0, 0xEB, 0xE6, 0xF0, 0xED, 0xE8, 0xDD, 0xF0, -0xEE, 0xE7, 0xDC, 0xF3, 0xF4, 0xF2, 0xDC, 0xDF, 0xE6, 0xE1, -0xB3, 0x01, 0xC7, 0x95, 0x24, 0xA0, 0x35, 0x39, 0x41, 0x5E, -0x03, 0x03, 0xFC, 0x01, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00, -0xFC, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0x01, 0xFF, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, -0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, -0x02, 0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFE, 0x01, 0x00, 0x00, 0xFE, 0x00, 0x00, 0xFF, 0xFE, -0x00, 0x00, 0xFD, 0xF6, 0xF4, 0xFF, 0xBD, 0xC3, 0xAC, 0x82, -0x04, 0xCE, 0xD8, 0xDC, 0xA5, 0x08, 0x00, 0xFF, 0x2F, 0x28, -0x2C, 0x30, 0x2F, 0x07, 0x09, 0xFE, 0x01, 0x01, 0xFF, 0xFB, -0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFD, -0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, -0xFF, 0x01, 0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x04, -0x00, 0x00, 0xFE, 0x01, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, -0xFD, 0x00, 0x00, 0xFF, 0x01, 0x08, 0x00, 0xF8, 0xF5, 0xFF, -0xFF, 0xCC, 0xD5, 0xC7, 0xBE, 0xDB, 0xEB, 0xEC, 0xBC, 0x03, -0x49, 0x36, 0x00, 0xF5, 0xE3, 0xEC, 0xEF, 0xDE, 0x08, 0xFB, -0xF5, 0x26, 0x12, 0x0F, 0x18, 0x19, 0x03, 0x02, 0xFC, 0x00, -0x01, 0xF9, 0xEC, 0x00, 0x00, 0xF8, 0xEE, 0x00, 0x00, 0xF9, -0xED, 0x00, 0x00, 0xF9, 0xF2, 0x00, 0x00, 0xFA, 0xF2, 0x00, -0x00, 0xFA, 0xF4, 0x00, 0x00, 0xF9, 0xF3, 0x00, 0x00, 0xFA, -0xF2, 0x00, 0x00, 0xF8, 0xF1, 0x00, 0xD8, 0xEB, 0xF7, 0x00, -0x98, 0xD4, 0xFB, 0x00, 0xBB, 0xDC, 0xF6, 0x00, 0xE1, 0xF5, -0x14, 0x00, 0x24, 0x06, 0xF7, 0xFF, 0xCC, 0xD6, 0xC9, 0xBB, -0xD2, 0xE9, 0xEA, 0x8D, 0x00, 0x00, 0x00, 0xD3, 0x03, 0x76, -0x73, 0x69, 0xF7, 0xEA, 0xE2, 0xCC, 0xEE, 0xE4, 0xEE, 0xF1, -0xDE, 0x07, 0xF9, 0xF0, 0x23, 0x14, 0x0B, 0x06, 0x1B, 0x02, -0xFE, 0xF7, 0x00, 0x01, 0xFD, 0xFB, 0x00, 0x00, 0xFE, 0xFF, -0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, -0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, -0x00, 0x00, 0xFD, 0x00, 0x00, 0xC2, 0xE9, 0xF4, 0x00, 0xEB, -0x38, 0x54, 0x00, 0x02, 0x16, 0x21, 0x00, 0xDD, 0xEF, 0xF7, -0xFF, 0x0A, 0xDF, 0xBB, 0xB7, 0xD6, 0xEC, 0xEF, 0x8D, 0x01, -0x01, 0x01, 0xCC, 0x2E, 0x3F, 0x6E, 0xF0, 0x03, 0x9C, 0xA6, -0xC3, 0xFF, 0xF5, 0xF1, 0xE7, 0xF7, 0xEB, 0xE4, 0xCF, 0xEE, -0xE4, 0xF0, 0xF5, 0xE0, 0x04, 0xFB, 0xF9, 0x20, 0x18, 0x0F, -0x0B, 0x1C, 0x02, 0xFF, 0xFD, 0x00, 0x00, 0xFD, 0xFF, 0x00, -0x00, 0xFE, 0xFE, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, -0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, -0x00, 0xFD, 0xFF, 0x00, 0xD6, 0xFB, 0xFE, 0x00, 0xF0, 0x2B, -0x33, 0x00, 0xF3, 0xF9, 0xF1, 0x00, 0xEA, 0xE6, 0xEE, 0xF8, -0x04, 0xE5, 0xCF, 0x72, 0x03, 0x02, 0x01, 0xCC, 0x35, 0x48, -0x7C, 0xF0, 0x3B, 0x50, 0x8A, 0xFF, 0x02, 0x04, 0x05, 0x08, -0x00, 0x42, 0x59, 0x9B, 0xFE, 0x22, 0x2E, 0x51, 0xEC, 0x00, -0x00, 0x00, 0xC8, 0xC9, 0xE2, 0xEC, 0x8C, 0xE9, 0xEA, 0xF1, -0xE8, 0x00, 0xFA, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, -0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, -0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, -0xFB, 0xFE, 0x00, 0x00, 0x08, 0x03, 0x00, 0x08, 0x0F, 0x06, -0x00, 0xFB, 0x0B, 0xF9, 0x00, 0xF8, 0x03, 0xFA, 0xFC, 0xFE, -0xFF, 0x00, 0xD0, 0x2F, 0x44, 0x76, 0xF0, 0x37, 0x4B, 0x82, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x01, 0x02, 0x02, 0x00, 0x2F, 0x40, 0x6E, 0xFD, 0xDE, 0xD2, -0xAF, 0xEC, 0x00, 0x00, 0x00, 0xDB, 0x0C, 0x03, 0x01, 0x0B, -0x00, 0xFB, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xD1, 0xF5, 0x11, 0x00, -0xBE, 0xF6, 0xF6, 0x00, 0x03, 0x0D, 0x03, 0x00, 0x08, 0x0B, -0x07, 0x00, 0xE9, 0x10, 0x0C, 0x00, 0x09, 0x02, 0xFB, 0x00, -0xF4, 0xFD, 0xF4, 0x00, 0x19, 0x1C, 0x19, 0x06, 0xB6, 0xD6, -0x26, 0x7F, 0xCB, 0xCD, 0xDD, 0xFA, 0xA5, 0xCC, 0x67, 0x00, -0x18, 0x0C, 0x18, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x07, 0x02, 0x02, 0x12, 0x0A, 0x02, 0x02, 0x0C, 0x00, -0xFB, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0xBC, 0xDB, 0xEC, 0x00, 0x97, -0x2B, 0xF8, 0x00, 0x28, 0x2E, 0x27, 0x00, 0x29, 0x1C, 0x2A, -0x00, 0x0A, 0x03, 0x0B, 0x00, 0xDE, 0xE9, 0xDC, 0x00, 0xEA, -0xEC, 0xEA, 0x00, 0x09, 0xF2, 0x0C, 0x07, 0x21, 0x43, 0x36, -0x69, 0x09, 0x06, 0x08, 0x00, 0x07, 0x01, 0x07, 0x00, 0xD4, -0xCD, 0xD1, 0xFC, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, -0x10, 0x04, 0x04, 0x28, 0x03, 0xFE, 0xFF, 0x01, 0x00, 0xFE, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFD, 0xF6, 0xFE, 0x00, 0xEE, 0xD8, -0xEF, 0x00, 0xC9, 0xFC, 0xC8, 0x00, 0xD9, 0xE7, 0xD7, 0x00, -0x07, 0x02, 0x08, 0x00, 0x03, 0xEF, 0x05, 0x00, 0x0E, 0xF2, -0x10, 0x00, 0x0F, 0x19, 0xFB, 0x00, 0x03, 0x12, 0xFF, 0x00, -0x02, 0x05, 0xFF, 0x00, 0xFC, 0xFB, 0xFA, 0x00, 0xF4, 0x0B, -0xF1, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x12, -0x06, 0x04, 0x27, 0x01, 0xFB, 0xFE, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x00, 0xFF, 0x02, 0x04, 0x00, 0xF9, -0xF7, 0xFB, 0xFF, 0x12, 0x0A, 0x13, 0xEF, 0x26, 0x04, 0x04, -0x05, 0x01, 0xE5, 0xFB, 0x0C, 0x04, 0xF0, 0x03, 0x01, 0x02, -0x0E, 0x09, 0x00, 0xE8, 0x04, 0xFB, 0x00, 0xE9, 0x08, 0xD7, -0x00, 0x3D, 0x13, 0x40, 0x00, 0x0D, 0xE6, 0xEF, 0xBA, 0x1F, -0x25, 0x34, 0xFA, 0xFF, 0x00, 0xFF, 0x00, 0x1F, 0x2D, 0x25, -0xFE, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xF7, 0xF5, 0xED, 0x00, 0xFF, 0x00, 0x00, 0x06, 0x12, 0x05, -0x03, 0x25, 0x00, 0xFB, 0xFF, 0x00, 0xFF, 0x07, 0x0F, 0x00, -0xF8, 0xFA, 0x01, 0xFF, 0xDE, 0xE9, 0xEA, 0xDF, 0xD0, 0xF2, -0xEF, 0xB2, 0xF7, 0xFD, 0xE3, 0xCA, 0x5C, 0xF7, 0x00, 0x05, -0x17, 0x03, 0x05, 0x3E, 0x30, 0xFB, 0x12, 0x4A, 0xC5, 0xED, -0x05, 0x18, 0x8E, 0x35, 0x07, 0x01, 0x11, 0x0A, 0x10, 0x00, -0xEF, 0xF9, 0xEF, 0x00, 0x3F, 0xC9, 0xD4, 0x5D, 0x5D, 0x40, -0x9C, 0xEA, 0x0F, 0x15, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, -0xEC, 0xDD, 0x01, 0x00, 0x00, 0x00, 0x09, 0x12, 0x02, 0x04, -0x22, 0xFD, 0x01, 0x0E, 0xFF, 0xE0, 0xE7, 0xEF, 0xE5, 0xCD, -0xEF, 0xEC, 0xB4, 0xEA, 0xFD, 0xFB, 0xBC, 0x00, 0x00, 0x00, -0xD7, 0x01, 0x01, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x02, 0xE9, -0xFD, 0xFB, 0xD2, 0xB9, 0xF0, 0xE9, 0xBE, 0xDA, 0xF2, 0xF4, -0x63, 0x02, 0x3B, 0x1F, 0x42, 0x0A, 0x0A, 0x0A, 0x00, 0x06, -0xFE, 0x06, 0x00, 0xFC, 0xFB, 0xF7, 0x05, 0xEA, 0xE3, 0xCD, -0x00, 0x0F, 0x15, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xEC, -0xDE, 0x00, 0x00, 0x00, 0x00, 0x02, 0xDC, 0xF4, 0xF8, 0xCA, -0xCE, 0xF0, 0xDD, 0xC6, 0xE5, 0xFD, 0xFA, 0xBB, 0x00, 0x00, -0x00, 0xD7, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0xF3, -0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, -0x00, 0xF1, 0x00, 0x00, 0x00, 0xE4, 0xF5, 0xF9, 0xFE, 0x24, -0xFF, 0xFB, 0xFF, 0x42, 0xFB, 0xFB, 0xFB, 0x00, 0xFD, 0xFA, -0xFD, 0x00, 0x00, 0xFF, 0x00, 0x02, 0xF7, 0xF3, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x27, 0x44, -0xFF, 0xD5, 0xC5, 0x99, 0xF0, 0xD7, 0xF9, 0xF7, 0x8A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, -0xF2, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0xFB, 0x09, 0x0C, 0x15, 0xED, 0x22, 0x08, 0x1A, 0xD7, 0xDD, -0xC2, 0xF5, 0xD5, 0xF5, 0x08, 0xF7, 0x02, 0x12, 0x17, 0xFE, -0x00, 0x05, 0x05, 0x08, 0xF5, 0x1F, 0x2B, 0x4A, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xBB, 0x68, -0x3E, 0x68, 0xFE, 0x55, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x02, 0x3E, 0x3E, -0x3E, 0x47, 0x2F, 0x2F, 0x2F, 0x4A, 0x2A, 0x2A, 0x2A, 0x23, -0x07, 0x07, 0x07, 0xFF, 0xCB, 0xCB, 0xCB, 0xDE, 0xC4, 0xC4, -0xC4, 0xB5, 0xD0, 0xD0, 0xD0, 0xBA, 0xFC, 0xFC, 0xFC, 0xFE, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, -0x1A, 0x1A, 0x12, 0x83, 0x83, 0x83, 0xB0, 0x0E, 0x0E, 0x0E, -0x3C, 0xFA, 0xFA, 0xFA, 0x01, 0x11, 0x11, 0x11, 0x00, 0x0C, -0x0C, 0x0C, 0x00, 0xF8, 0xF8, 0xF8, 0x00, 0xFB, 0xFB, 0xFB, -0xFF, 0xD3, 0xD3, 0xD3, 0xC1, 0x86, 0x86, 0x86, 0x54, 0xF2, -0xF2, 0xF2, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x09, 0x73, 0x73, -0x73, 0x9C, 0x20, 0x20, 0x20, 0x4A, 0x06, 0x06, 0x06, 0x01, -0x1B, 0x1B, 0x1B, 0x00, 0x2B, 0x2B, 0x2B, 0x00, 0x1F, 0x1F, -0x1F, 0x00, 0x10, 0x10, 0x10, 0x00, 0x07, 0x07, 0x07, 0x01, -0x15, 0x15, 0x15, 0x20, 0x12, 0x12, 0x12, 0x1F, 0xD1, 0xD1, -0xD1, 0xB7, 0xF9, 0xF9, 0xF9, 0xFB, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, -0x3B, 0x3B, 0x43, 0xA7, 0xA7, 0xA7, 0xDC, 0xCA, 0xCA, 0xCA, -0xFF, 0xE6, 0xE6, 0xE6, 0xFF, 0xEF, 0xEF, 0xEF, 0xFF, 0xEB, -0xEB, 0xEB, 0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xE8, 0xE8, 0xE8, -0xFF, 0xEB, 0xEB, 0xEB, 0xFF, 0xF1, 0xF1, 0xF1, 0xFF, 0xED, -0xED, 0xED, 0xFF, 0xD5, 0xD5, 0xD5, 0xFF, 0xAD, 0xAD, 0xAD, -0xE0, 0x3F, 0x3F, 0x3F, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x4A, 0x4A, 0x4A, 0x56, 0x72, 0x72, -0x72, 0xA3, 0x2B, 0x2B, 0x2B, 0x06, 0x00, 0x00, 0x00, 0x00, -0xDC, 0xDC, 0xDC, 0x00, 0xD2, 0xD2, 0xD2, 0x00, 0xE1, 0xE1, -0xE1, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, -0x10, 0x10, 0x10, 0x00, 0x20, 0x20, 0x20, 0x00, 0x2E, 0x2E, -0x2E, 0x00, 0x23, 0x23, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, -0xD6, 0xD6, 0xD6, 0xFB, 0x8C, 0x8C, 0x8C, 0x61, 0xB5, 0xB5, -0xB5, 0xA5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x21, -0x21, 0x21, 0x21, 0x9A, 0x9A, 0x9A, 0xD1, 0x28, 0x28, 0x28, -0x0D, 0xE0, 0xE0, 0xE0, 0x00, 0xBE, 0xBE, 0xBE, 0x00, 0xC9, -0xC9, 0xC9, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x1E, 0x1E, 0x1E, -0x00, 0x1C, 0x1C, 0x1C, 0x00, 0x01, 0x01, 0x01, 0x00, 0xE4, -0xE4, 0xE4, 0x00, 0xE1, 0xE1, 0xE1, 0x00, 0x06, 0x06, 0x06, -0x00, 0x38, 0x38, 0x38, 0x00, 0x41, 0x41, 0x41, 0x00, 0x20, -0x20, 0x20, 0x00, 0xD1, 0xD1, 0xD1, 0xF5, 0x65, 0x65, 0x65, -0x33, 0xE4, 0xE4, 0xE4, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x5D, -0x5D, 0x7B, 0x43, 0x43, 0x43, 0x41, 0xD6, 0xD6, 0xD6, 0x00, -0xBA, 0xBA, 0xBA, 0x00, 0xCC, 0xCC, 0xCC, 0x00, 0x13, 0x13, -0x13, 0x00, 0x48, 0x48, 0x48, 0x00, 0x48, 0x48, 0x48, 0x00, -0x30, 0x30, 0x30, 0x00, 0x29, 0x29, 0x29, 0x00, 0x29, 0x29, -0x29, 0x00, 0x13, 0x13, 0x13, 0x00, 0xE9, 0xE9, 0xE9, 0x00, -0xD8, 0xD8, 0xD8, 0x00, 0xF4, 0xF4, 0xF4, 0x00, 0x05, 0x05, -0x05, 0x00, 0x23, 0x23, 0x23, 0x06, 0xEC, 0xEC, 0xEC, 0x02, -0xCD, 0xCD, 0xCD, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x2B, 0x2B, -0x34, 0xDE, 0xDE, 0xDE, 0x00, 0xE7, 0xE7, 0xE7, 0x00, 0xD8, -0xD8, 0xD8, 0x00, 0x17, 0x17, 0x17, 0x00, 0x18, 0x18, 0x18, -0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0x0B, -0x0B, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF4, 0xF4, -0x00, 0xF9, 0xF9, 0xF9, 0x00, 0x23, 0x23, 0x23, 0x00, 0x03, -0x03, 0x03, 0x00, 0xD5, 0xD5, 0xD5, 0x00, 0x24, 0x24, 0x24, -0x00, 0x05, 0x05, 0x05, 0x00, 0x2D, 0x2D, 0x2D, 0x34, 0x00, -0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, -0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x05, -0xDC, 0xDC, 0xDC, 0x00, 0x01, 0x01, 0x01, 0x00, 0x12, 0x12, -0x12, 0x00, 0x15, 0x15, 0x15, 0x00, 0xF5, 0xF5, 0xF5, 0x00, -0xF8, 0xF8, 0xF8, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFC, 0xFC, -0xFC, 0x00, 0x01, 0x01, 0x01, 0x00, 0x04, 0x04, 0x04, 0x00, -0x04, 0x04, 0x04, 0x00, 0x17, 0x17, 0x17, 0x00, 0xF7, 0xF7, -0xF7, 0x00, 0x02, 0x02, 0x02, 0x00, 0xF8, 0xF8, 0xF8, 0x00, -0xDA, 0xDB, 0xDA, 0x00, 0x07, 0x0E, 0x07, 0x0F, 0x01, 0x1A, -0x00, 0x2C, 0x00, 0xF7, 0x00, 0xE8, 0xFF, 0xEF, 0x00, 0xE6, -0x04, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF4, 0xF4, 0xF6, 0xF6, -0xF6, 0xF6, 0x00, 0x1D, 0x1D, 0x1D, 0x00, 0x13, 0x13, 0x13, -0x00, 0x15, 0x15, 0x15, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0x0C, -0x0C, 0x0C, 0x00, 0x26, 0x26, 0x26, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0x02, 0x02, 0x02, 0x00, 0x05, 0x05, 0x05, 0x00, 0x03, -0x11, 0x02, 0x00, 0xC6, 0xDA, 0xC6, 0x00, 0xE8, 0x18, 0xE7, -0x00, 0xFD, 0x1B, 0xFD, 0x00, 0xD9, 0x16, 0xD7, 0x00, 0xFD, -0x06, 0xFD, 0x00, 0x0B, 0x0F, 0x0C, 0x27, 0x86, 0xB2, 0x86, -0xCD, 0xC9, 0xDB, 0xC8, 0xED, 0xB0, 0x60, 0xB2, 0x25, 0x04, -0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xBE, 0x38, 0x38, -0x38, 0x45, 0xF8, 0xF8, 0xF8, 0x00, 0x24, 0x24, 0x24, 0x00, -0x06, 0x06, 0x06, 0x00, 0x18, 0x18, 0x18, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xE8, 0xE8, 0xE8, 0x00, 0x12, 0x12, 0x12, 0x00, -0x02, 0x02, 0x02, 0x00, 0xAD, 0xEA, 0xAB, 0x00, 0x28, 0x1E, -0x29, 0x00, 0x4C, 0x28, 0x4D, 0x00, 0x0A, 0x04, 0x0A, 0x00, -0xF0, 0xFA, 0xF0, 0x00, 0xF0, 0xF9, 0xF0, 0x00, 0xEE, 0xF9, -0xEE, 0x00, 0xEC, 0xF7, 0xEC, 0x00, 0xE8, 0xF7, 0xE9, 0x00, -0xD4, 0xF1, 0xD4, 0x0F, 0x00, 0x02, 0x00, 0x15, 0x04, 0x00, -0x00, 0x00, 0x00, 0xB5, 0xB5, 0xB5, 0x9F, 0x35, 0x35, 0x35, -0x64, 0xDA, 0xDA, 0xDA, 0x23, 0x34, 0x34, 0x34, 0x00, 0x16, -0x16, 0x16, 0x00, 0x07, 0x07, 0x07, 0x00, 0x0C, 0x0C, 0x0C, -0x00, 0x07, 0x07, 0x07, 0x00, 0x05, 0x05, 0x05, 0x00, 0xFB, -0xFD, 0xFB, 0x00, 0x0D, 0xFE, 0x0E, 0x00, 0xFE, 0x01, 0xFF, -0x00, 0xC7, 0xE9, 0xC7, 0x00, 0xEA, 0xF7, 0xEA, 0x00, 0xF1, -0xFA, 0xF0, 0x00, 0xF1, 0xF9, 0xF1, 0x00, 0xF0, 0xFA, 0xF1, -0x00, 0xF0, 0xF9, 0xF0, 0x00, 0xE6, 0xF6, 0xE6, 0x00, 0xE7, -0xE9, 0xE5, 0xF7, 0x00, 0xF7, 0x00, 0xF1, 0x03, 0x00, 0x00, -0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF5, 0xD2, 0xD2, 0xD2, 0xCC, -0x39, 0x39, 0x39, 0x45, 0xDC, 0xDC, 0xDC, 0x0F, 0xFB, 0xFB, -0xFB, 0x00, 0x18, 0x18, 0x18, 0x00, 0x17, 0x17, 0x17, 0x00, -0x09, 0x09, 0x09, 0x00, 0x08, 0x08, 0x08, 0x00, 0x09, 0x08, -0x09, 0x00, 0xBA, 0xE6, 0xB9, 0x00, 0xC9, 0xEE, 0xC9, 0x00, -0xD8, 0xF1, 0xD2, 0x00, 0xE0, 0xF5, 0xD8, 0x00, 0xE0, 0xF3, -0xD7, 0x00, 0xE1, 0xF1, 0xDA, 0x00, 0xE1, 0xEC, 0xDE, 0xFF, -0xE3, 0xE1, 0xE4, 0xF4, 0x3D, 0x1A, 0x3D, 0x02, 0xDE, 0xDE, -0xDE, 0xE9, 0xFD, 0xC6, 0xFE, 0x95, 0x04, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xEA, 0xEA, 0xEA, 0xC7, 0x8E, -0x8E, 0x8E, 0x4C, 0x4B, 0x4B, 0x4B, 0x7E, 0x05, 0x05, 0x05, -0x4C, 0xDA, 0xDA, 0xDA, 0x08, 0x05, 0x05, 0x05, 0x00, 0x20, -0x20, 0x20, 0x00, 0x0D, 0x0D, 0x0D, 0x00, 0x00, 0x00, 0x00, -0x00, 0xDD, 0x0D, 0xD9, 0x00, 0xD6, 0xF5, 0xCF, 0x00, 0x0F, -0xF4, 0x0D, 0x00, 0x10, 0xFA, 0x11, 0xF7, 0xE3, 0xC6, 0xF5, -0xC0, 0xE6, 0xD2, 0xEC, 0xC7, 0xFC, 0xEA, 0x00, 0xD9, 0xFF, -0xF4, 0x00, 0xE4, 0x07, 0x9E, 0x05, 0xA7, 0xFE, 0xF0, 0xFC, -0xEB, 0x00, 0x00, 0x00, 0xFA, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF5, 0xF5, -0xF5, 0xD3, 0xAA, 0xAA, 0xAA, 0x63, 0x0F, 0x0F, 0x0F, 0x32, -0x2E, 0x2E, 0x2E, 0x4F, 0x1A, 0x1A, 0x1A, 0x33, 0xF1, 0xF1, -0xF1, 0x1C, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x01, 0x01, 0x00, -0xF1, 0x2C, 0xE7, 0x0E, 0x0A, 0xF5, 0x02, 0xF9, 0x08, 0xAC, -0x17, 0xA3, 0xC9, 0xD1, 0xD1, 0xB7, 0xF2, 0xF2, 0xF2, 0xCE, -0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, -0x00, 0x01, 0xE8, 0xFC, 0xE8, 0x05, 0x01, 0xEF, 0x01, 0xE9, -0x00, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, -0x22, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x2D, 0x24, -0x80, 0x09, 0xC5, 0x27, 0x8C, 0x05, 0xDE, 0x00, 0x00, 0x00, -0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, -0x05, 0x27, 0x98, 0x22, 0xEE, 0x07, 0x46, 0x01, 0x9A, 0x00, -0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFA, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0xEC, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xEF, -0xF9, 0xE3, 0x0C, 0x16, 0x00, 0x1E, 0x00, 0x00, 0x00, 0xFA, -0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x08, 0x19, -0x02, 0x1B, 0x0F, 0x1B, 0x0C, 0x30, 0x01, 0x05, 0xFF, 0x02, -0xEA, 0xFD, 0xE9, 0x07, 0x02, 0xF1, 0x01, 0xE6, 0x00, 0x00, -0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x00, 0x00, 0x23, 0x43, 0x19, 0x51, 0x4E, -0x55, 0x4F, 0x61, 0x0E, 0x0F, 0x10, 0x1B, 0xDA, 0x05, 0xCA, -0x17, 0xDC, 0xF0, 0xC1, 0x06, 0x00, 0x00, 0x00, 0x01, 0x04, -0x0C, 0x01, 0x0A, 0x52, 0x7B, 0x46, 0x97, 0x5C, 0x55, 0x66, -0x5B, 0x09, 0x08, 0x0B, 0x03, 0xDC, 0xF1, 0xD9, 0x00, 0x90, -0xD2, 0x88, 0x00, 0xE7, 0xF4, 0xF8, 0xE5, 0xF7, 0x00, 0x00, -0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x19, 0x46, 0x0C, 0x5E, 0x7D, 0x90, 0x85, 0x9F, 0xF6, 0xFE, -0xF5, 0x02, 0xE4, 0xF6, 0xDC, 0x00, 0xF8, 0xF0, 0x00, 0x00, -0xEA, 0xE5, 0x04, 0xF1, 0x01, 0x04, 0xFD, 0x05, 0x13, 0x4E, -0x05, 0x71, 0x19, 0x3F, 0x20, 0x5E, 0xBF, 0xF0, 0xAA, 0x00, -0xF7, 0x00, 0xE6, 0x00, 0xE9, 0xF9, 0xE0, 0x00, 0x14, 0x0B, -0xF9, 0xFF, 0xE6, 0xF4, 0x00, 0xE7, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, -0x17, 0xF9, 0x3A, 0x96, 0xDB, 0x84, 0x02, 0x1E, 0x13, 0x04, -0x00, 0x15, 0x0C, 0x05, 0x00, 0x11, 0x13, 0xF9, 0x00, 0x2C, -0x0F, 0x16, 0xF1, 0xE2, 0xFE, 0xE3, 0x02, 0x07, 0x02, 0xFF, -0x09, 0xD3, 0xF7, 0xAF, 0x00, 0x2C, 0x0F, 0x13, 0x00, 0x2B, -0x12, 0x18, 0x00, 0x2D, 0xFD, 0x2D, 0xFF, 0xA9, 0xAD, 0xCB, -0xB8, 0xF3, 0xE1, 0xFD, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xED, -0x01, 0xED, 0x2C, 0x3E, 0x0A, 0x47, 0x38, 0x2A, 0x1D, 0x0B, -0x2E, 0x15, 0x1B, 0xFF, 0xF5, 0xD8, 0x01, 0xE4, 0xAF, 0x77, -0xD8, 0x81, 0xF7, 0xEE, 0xFF, 0xCA, 0xF4, 0xD8, 0xFE, 0xD2, -0x0D, 0xF9, 0x03, 0x0F, 0x11, 0xFB, 0x13, 0xFC, 0xE2, 0xC7, -0xF1, 0xD7, 0xA6, 0x80, 0xCE, 0x9E, 0xD2, 0xAE, 0xF2, 0x8B, -0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x02, 0x00, 0x23, 0x09, 0x0F, 0x02, 0x24, 0xFF, -0xFF, 0x00, 0x01, 0xF7, 0xF0, 0xFE, 0xE4, 0x00, 0x00, 0x00, -0xDA, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, -0xFE, 0x00, 0x00, 0x00, 0xF2, 0x00, 0x00, 0x00, 0xF9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x08, 0x4A, -0xE1, 0x2D, 0xE8, 0x27, 0x03, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Fullscreen3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xB3, 0xC9, 0xD3, 0x00, 0xF3, 0xF9, 0xFF, 0x00, 0x10, 0x0D, -0x0B, 0x00, 0x0D, 0x09, 0x07, 0x00, 0x08, 0x04, 0x03, 0x00, -0x00, 0xFE, 0xFD, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x01, 0xFE, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFE, 0xFD, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0xFD, 0xFE, 0xFF, 0x00, 0xF4, 0xF6, 0xF8, 0x00, -0xEE, 0xF0, 0xF5, 0x00, 0xF0, 0xF1, 0xF2, 0x00, 0xB6, 0xB6, -0xB6, 0x00, 0xE0, 0xDA, 0xD4, 0x00, 0x04, 0x0F, 0x17, 0x00, -0x06, 0x24, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xF0, -0xF4, 0xF7, 0x00, 0xF0, 0xF8, 0xFE, 0x00, 0x02, 0x04, 0x04, -0x00, 0x02, 0x01, 0x02, 0x00, 0xFF, 0x06, 0xFE, 0x00, 0x00, -0xFE, 0xFD, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x01, 0xFD, 0x01, -0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0xFE, 0xFE, 0xFD, 0x00, 0xFE, 0xFD, 0xFE, -0x00, 0xFC, 0xFD, 0xFE, 0x00, 0xF3, 0xF5, 0xF9, 0x00, 0xEF, -0xF1, 0xF6, 0x00, 0xEB, 0xED, 0xF3, 0x00, 0xDA, 0xDE, 0xE1, -0x00, 0xD9, 0xD4, 0xD6, 0x00, 0x0A, 0x0D, 0xE3, 0x00, 0x8A, -0x7C, 0x79, 0x00, 0x0A, 0x0D, 0x0D, 0x00, 0x04, 0x0A, 0x05, -0x04, 0x39, 0xF0, 0xF9, 0xFB, 0x89, 0xF4, 0xF8, 0xFB, 0x01, -0xFB, 0xFE, 0xFF, 0x00, 0x04, 0x01, 0x01, 0x00, 0xFF, 0xFD, -0xFB, 0x00, 0xFC, 0xFB, 0xFD, 0x00, 0xFC, 0xFA, 0xFD, 0x00, -0xFE, 0xFD, 0xFE, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFD, 0xFD, 0xFD, 0x00, -0xFE, 0xFD, 0xFF, 0x00, 0xFB, 0xFB, 0xFC, 0x00, 0xF7, 0xF7, -0xFA, 0x00, 0xFE, 0x01, 0x00, 0x00, 0x0D, 0x0C, 0x0C, 0xA2, -0x05, 0x06, 0x06, 0x9B, 0xFB, 0xF9, 0xF9, 0x00, 0xB3, 0xB1, -0xB1, 0x00, 0x2D, 0x44, 0x46, 0x00, 0x04, 0x0A, 0x06, 0x04, -0x28, 0xFF, 0x03, 0xFE, 0x3D, 0xF5, 0xF9, 0xFA, 0x00, 0xF4, -0xF8, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFB, 0xFB, -0x00, 0xF7, 0xF6, 0xF9, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFC, -0xFA, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFD, 0xFE, -0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xFF, -0xFD, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xF8, 0xF7, 0xF8, -0x00, 0xDA, 0xDC, 0xDE, 0x00, 0xED, 0xF2, 0xF4, 0xD9, 0x0B, -0x0C, 0x0F, 0x9B, 0x05, 0x0B, 0x0F, 0x00, 0xDA, 0xE0, 0xFA, -0x00, 0x02, 0xC5, 0xCD, 0x00, 0x04, 0xF9, 0xFB, 0xFC, 0x00, -0xE9, 0xEF, 0xF3, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, -0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFD, 0xFB, 0xFD, 0x00, -0xFA, 0xF8, 0xF9, 0x00, 0xFE, 0xFC, 0xFD, 0x00, 0xFD, 0xFB, -0xFB, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFE, 0xFD, 0x00, -0xFF, 0xFD, 0xFE, 0x00, 0xFE, 0xFC, 0xFE, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xEB, 0xED, 0xF0, 0x00, 0xEA, 0xEA, 0xEB, 0x00, -0xFB, 0xF8, 0xF7, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x06, 0x0B, -0x0F, 0x00, 0x1E, 0x38, 0x51, 0x00, 0xDC, 0xE6, 0xEC, 0x00, -0xE3, 0xDB, 0xE2, 0x00, 0x04, 0xFC, 0xFE, 0xFF, 0x00, 0xF3, -0xF9, 0xFA, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, -0x00, 0xFA, 0xFC, 0xFD, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x00, 0xFA, 0xFB, 0xFC, 0x00, 0xFB, 0xF9, 0xFB, -0x00, 0xFB, 0xF7, 0xF7, 0x00, 0xFC, 0xF9, 0xFB, 0x00, 0xFF, -0xFC, 0xFD, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0xF0, 0xF2, 0xF2, -0x00, 0xFD, 0xFB, 0xFB, 0x00, 0xFC, 0xF9, 0xF9, 0x00, 0xFC, -0xF7, 0xF8, 0x00, 0x09, 0x09, 0x0D, 0x06, 0x28, 0x39, 0x4C, -0x13, 0xF1, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xF4, 0xE9, -0xEF, 0xF8, 0xF9, 0x04, 0xFC, 0xFE, 0xFD, 0x00, 0xF4, 0xFA, -0xFA, 0x00, 0x01, 0x02, 0x02, 0x00, 0xF6, 0xFC, 0xFE, 0x00, -0x22, 0x37, 0x32, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x01, -0x01, 0x00, 0x03, 0xFE, 0xFF, 0x00, 0x02, 0xFD, 0xFA, 0x00, -0xFB, 0xF8, 0xFB, 0x00, 0xF8, 0xF6, 0xFB, 0x00, 0xFC, 0xFA, -0xFC, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x00, -0xFF, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, 0xFF, 0xFB, -0xFD, 0x00, 0x00, 0xFF, 0x00, 0x5C, 0x00, 0xFF, 0x01, 0x5A, -0x02, 0xFD, 0xFB, 0x00, 0xF6, 0xFC, 0xF4, 0xC2, 0xD1, 0xDE, -0xE5, 0x42, 0x04, 0xFE, 0xFF, 0x00, 0xFF, 0xF6, 0xFA, 0xFC, -0x00, 0x00, 0x00, 0xFF, 0x00, 0xF5, 0xFE, 0xFE, 0x00, 0xF8, -0x02, 0x05, 0x00, 0xF9, 0xFA, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, -0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFB, 0xF9, 0xFF, 0x00, 0xF7, -0xF4, 0xFC, 0x00, 0xF9, 0xF5, 0xFA, 0x00, 0xFD, 0xF9, 0xFA, -0x00, 0xFE, 0xFD, 0xFE, 0x00, 0xFF, 0xFC, 0xFC, 0x00, 0xFE, -0xFC, 0xFC, 0x00, 0xFF, 0xFB, 0xFE, 0x00, 0xFF, 0xFC, 0xFE, -0x00, 0x01, 0x00, 0x00, 0x01, 0xEF, 0xE9, 0xEF, 0x03, 0xD3, -0xD7, 0xDF, 0x00, 0xF2, 0xF8, 0xF3, 0x0D, 0x00, 0x07, 0x08, -0x00, 0x04, 0xF8, 0xF4, 0xF6, 0x00, 0xEE, 0xE3, 0xE7, 0x00, -0x00, 0x00, 0x00, 0x00, 0xF8, 0x05, 0x05, 0x00, 0xDE, 0xEB, -0xF5, 0x00, 0xF5, 0xF7, 0xFB, 0x00, 0xFF, 0xFE, 0xFF, 0x00, -0xFE, 0xFC, 0xFE, 0x00, 0xFE, 0xFB, 0xFE, 0x00, 0xFD, 0xFC, -0xFE, 0x00, 0xFE, 0xFA, 0xFD, 0x00, 0xFF, 0xFA, 0xFD, 0x00, -0x00, 0xFB, 0xFB, 0x00, 0xFF, 0xFB, 0xF9, 0x00, 0xFF, 0xFE, -0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0xFB, 0xF8, 0xFC, 0x00, -0xE2, 0xE4, 0xEC, 0x00, 0xEB, 0xEE, 0xF1, 0x00, 0xFF, 0xFB, -0xFC, 0x00, 0x00, 0xFC, 0xFC, 0x00, 0x00, 0x01, 0x03, 0x00, -0x04, 0xFE, 0xFC, 0xFC, 0xFF, 0xF8, 0xF0, 0xF2, 0x00, 0x00, -0x01, 0x00, 0x00, 0xF7, 0x08, 0x09, 0x00, 0xE9, 0xFE, 0x00, -0x00, 0xFC, 0x02, 0x03, 0x00, 0x02, 0x05, 0x04, 0x00, 0x00, -0x08, 0x01, 0x00, 0xFF, 0x02, 0x02, 0x00, 0xFE, 0xF8, 0xFB, -0x00, 0xFB, 0xF2, 0xF6, 0x00, 0xFB, 0xF8, 0xFA, 0x00, 0xFC, -0xF8, 0xFA, 0x00, 0xFE, 0xF8, 0xFA, 0x00, 0xFD, 0xF5, 0xF8, -0x00, 0xF3, 0xEE, 0xF5, 0x00, 0xEE, 0xEF, 0xF3, 0x00, 0xFE, -0xFB, 0xFA, 0x00, 0xFF, 0xF7, 0xF4, 0x00, 0x00, 0xF6, 0xF3, -0x00, 0x00, 0xFB, 0xF8, 0x00, 0x00, 0x01, 0x02, 0x00, 0x04, -0xFF, 0xFD, 0xFE, 0xFF, 0xFB, 0xF7, 0xF8, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xF9, 0xFF, 0x01, 0x00, 0xEE, 0xFA, 0xFD, 0x00, -0xFF, 0xFB, 0xFE, 0x00, 0x00, 0x01, 0xFD, 0x00, 0x01, 0x00, -0x02, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFE, 0xF9, 0xFD, 0x00, -0xFE, 0xF8, 0xFB, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xFC, 0xF8, -0xF9, 0x00, 0xF8, 0xEF, 0xF1, 0x00, 0xF5, 0xF4, 0xF8, 0x00, -0xFD, 0xF9, 0xFE, 0x00, 0xFF, 0x03, 0x01, 0x00, 0xFF, 0xF9, -0xFD, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, -0x00, 0xFF, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x04, 0xFF, -0xFE, 0xFF, 0xFF, 0xFC, 0xF9, 0xFA, 0x00, 0x01, 0x01, 0x01, -0x00, 0xFD, 0xF9, 0xFC, 0x00, 0xEE, 0xEF, 0xFA, 0x00, 0xFF, -0xFC, 0xFB, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0xFE, 0x00, -0x00, 0xFF, 0xFB, 0xFC, 0x00, 0xFD, 0xF2, 0xF7, 0x00, 0xFD, -0xF2, 0xF4, 0x00, 0xFE, 0xF7, 0xF4, 0x00, 0xFC, 0xF3, 0xF3, -0x00, 0xFD, 0xF6, 0xF8, 0x00, 0x00, 0xFA, 0xFE, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0xF4, 0xF6, 0x00, 0x00, 0xF9, 0xF5, -0x00, 0x00, 0xF8, 0xF4, 0x00, 0x00, 0xFC, 0xF8, 0x00, 0x00, -0xFE, 0xFB, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x04, 0x02, 0x03, -0x04, 0xFF, 0x03, 0x05, 0x05, 0x00, 0x01, 0x01, 0x01, 0x00, -0x01, 0xFB, 0xFC, 0x00, 0xF2, 0xD1, 0xDA, 0x00, 0x00, 0xFE, -0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, -0x01, 0xFF, 0x00, 0x00, 0xFF, 0xFC, 0xFE, 0x00, 0x00, 0xFA, -0xFA, 0x00, 0xFF, 0xFB, 0xF8, 0x00, 0xFF, 0xFB, 0xF9, 0x00, -0x00, 0x00, 0x02, 0x00, 0x01, 0x07, 0x07, 0x00, 0xFF, 0xFC, -0xFF, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xFC, 0xFC, 0x00, -0x00, 0xFE, 0xF3, 0x00, 0x00, 0xF8, 0xF4, 0x00, 0x00, 0xFA, -0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x02, -0x00, 0x06, 0x02, 0x03, 0x00, 0x02, 0x03, 0x03, 0x00, 0xFA, -0xFC, 0xFF, 0x00, 0xFF, 0xF0, 0xEF, 0x00, 0x00, 0xFF, 0xFD, -0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0x01, 0xFF, 0x00, 0xFF, -0xFF, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFC, 0xFC, -0x00, 0x00, 0xFC, 0xFB, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, -0x02, 0x04, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x01, 0xFE, 0xFF, -0x00, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0xFE, 0xFD, 0x00, 0x00, -0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFD, -0x00, 0x00, 0x00, 0xFE, 0x00, 0x04, 0x25, 0x21, 0x20, 0xEA, -0x4A, 0x41, 0x01, 0xF3, 0x01, 0x03, 0x03, 0x01, 0xE3, 0xEB, -0xEE, 0x02, 0xCE, 0xC8, 0xE0, 0x0A, 0xFF, 0x00, 0xFF, 0x00, -0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x02, -0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x00, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFC, 0xFD, 0x00, -0x00, 0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFD, 0x00, 0x00, 0xFF, -0xFD, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFE, 0xFD, 0xFF, -0x00, 0xFE, 0xFD, 0x00, 0x04, 0xFA, 0xF8, 0xF8, 0xBA, 0xFA, -0xF4, 0xF6, 0x0E, 0x00, 0x03, 0x02, 0x00, 0xC2, 0xD2, 0xDE, -0x34, 0xFF, 0xFE, 0x00, 0xCB, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0xFF, 0x00, -0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x01, 0x01, 0xFE, -0x00, 0xFF, 0xFD, 0xFB, 0x00, 0x00, 0xFA, 0xFA, 0x00, 0x00, -0xFA, 0xFA, 0x00, 0x00, 0xFB, 0xF8, 0x00, 0x00, 0xFC, 0xFB, -0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0xFD, 0xFC, 0x00, 0x00, -0xFD, 0xFE, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, -0xFF, 0x00, 0xAC, 0xD1, 0xE1, 0x00, 0xD4, 0xEA, 0xF9, 0x00, -0x01, 0x0F, 0x11, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x01, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x02, -0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x03, 0x03, 0x00, -0xFF, 0xFD, 0xFC, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x01, -0xFD, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x00, 0x03, 0x01, 0x00, -0x00, 0x04, 0x03, 0x00, 0x00, 0xFE, 0x07, 0x00, 0x00, 0x05, -0xFD, 0x00, 0x04, 0xFF, 0x01, 0x02, 0x00, 0xD7, 0xF0, 0x00, -0x00, 0x03, 0x05, 0x0D, 0x00, 0x30, 0x20, 0x0D, 0x00, 0x07, -0x07, 0x08, 0x00, 0x02, 0x05, 0x05, 0x00, 0x03, 0x04, 0x04, -0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, -0x05, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x03, -0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, -0xFC, 0xFA, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0xFE, 0xFA, 0xFA, -0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xFD, 0xF9, 0xF6, 0x00, 0xFE, -0xF7, 0xF1, 0x00, 0xFB, 0xF2, 0xED, 0x00, 0xF5, 0xEB, 0xEC, -0x00, 0x04, 0xF2, 0xE9, 0xDB, 0x00, 0xF9, 0xD1, 0xA2, 0x00, -0x21, 0x00, 0x00, 0x00, 0xFE, 0x08, 0x14, 0xE0, 0x32, 0x48, -0x60, 0xA1, 0xF8, 0xF9, 0xF7, 0x0C, 0xED, 0xF0, 0xEC, 0x0A, -0xFE, 0x03, 0x01, 0x08, 0x00, 0x02, 0xFF, 0x03, 0xFF, 0x01, -0xFF, 0x01, 0x00, 0xFD, 0xFF, 0x00, 0x01, 0xFE, 0xFF, 0x01, -0x00, 0xFD, 0xFE, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, -0xFF, 0x00, 0x01, 0x02, 0xFF, 0x00, 0x00, 0x05, 0xFE, 0xFE, -0x01, 0x02, 0xFE, 0xFB, 0x02, 0x07, 0x02, 0xF7, 0x1B, 0x27, -0x26, 0xF7, 0xF3, 0xF0, 0xEB, 0xC6, 0xC0, 0xAC, 0xB6, 0x00, -0x01, 0xFA, 0xFA, 0xFA, 0x00, 0x05, 0x05, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x01, 0x01, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, -0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, -0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFB, 0x00, -0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0xF9, 0x00, 0x00, 0x00, -0xFA, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0xFF, 0x04, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFE, -0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, -0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x78, 0x37, -0xB5, 0x40, 0x48, 0xBA, 0x99, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x0A, -0x0C, 0x0A, 0x11, 0x1B, 0x21, 0x34, 0xF9, 0xFA, 0xFC, 0x01, -0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, -0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, -0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFE, 0xFE, -0xFF, 0x00, 0xFF, 0xFF, 0xFE, 0x00, 0xFE, 0xFE, 0xFE, 0x00, -0xFF, 0xFE, 0xFF, 0x00, 0x0C, 0x09, 0x05, 0xF5, 0xE2, 0xDC, -0xD6, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0C, 0x1B, 0x26, -0x41, 0x33, 0x67, 0x84, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFE, -0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFF, -0xFD, 0xFD, 0x00, 0xFF, 0xFD, 0xFD, 0x00, 0xFF, 0xFD, 0xFD, -0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, 0xFA, -0xF7, 0xF6, 0x00, 0xEA, 0xD9, 0xDB, 0xF0, 0x02, 0xE0, 0xDE, -0x12, 0xFE, 0xFC, 0xF8, 0xFF, 0x04, 0xFD, 0xFD, 0xFD, 0x02, -0x10, 0x03, 0xFD, 0x00, 0x15, 0xF7, 0xE1, 0x00, 0xDD, 0x01, -0x1C, 0x00, 0xFD, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFE, 0xFF, 0x00, -0x00, 0xFE, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFE, 0xFD, -0xFD, 0x00, 0xFF, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, -0xFF, 0xFD, 0xFC, 0x00, 0xF1, 0xEB, 0xED, 0x00, 0xDC, 0xCF, -0xD4, 0x00, 0x00, 0xFB, 0xF9, 0x01, 0xFF, 0xFF, 0xFF, 0x01, -0x00, 0x00, 0x00, 0xFF, 0x02, 0x00, 0xFF, 0x00, 0x00, 0x0D, -0x05, 0x00, 0x00, 0x5B, 0x48, 0x3B, 0x00, 0x07, 0x02, 0x00, -0x00, 0xFE, 0xFC, 0xFB, 0x00, 0xFE, 0xFC, 0xFC, 0x00, 0xFE, -0xFC, 0xFC, 0x00, 0xFE, 0xFC, 0xFC, 0x00, 0xFF, 0xFD, 0xFD, -0x00, 0xFE, 0xFC, 0xFE, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x01, 0x03, 0x00, 0x01, 0x03, 0x06, 0x00, 0x02, 0x05, 0x09, -0x00, 0x03, 0x06, 0x08, 0x00, 0x03, 0x03, 0x04, 0x00, 0xED, -0xE4, 0xE6, 0x00, 0xE2, 0xD9, 0xDE, 0x00, 0x06, 0x07, 0x06, -0x00, 0x08, 0x0C, 0x0B, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, 0x00, 0xE1, 0xEE, -0xF7, 0x00, 0x88, 0xB6, 0xD9, 0x00, 0xF7, 0x01, 0x08, 0x00, -0x03, 0x03, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x04, 0x02, 0x01, 0x00, 0x00, 0xFE, 0xFC, 0x00, 0xF8, 0xF7, -0xF8, 0x00, 0xFE, 0xFB, 0xFA, 0x00, 0xFC, 0xFB, 0xF9, 0x00, -0xF9, 0xF4, 0xF7, 0x00, 0xE1, 0xD8, 0xDE, 0x00, 0xF3, 0xF0, -0xF2, 0x00, 0x10, 0x0C, 0x08, 0x00, 0x13, 0x11, 0x0A, 0x00, -0xF5, 0xF6, 0xF8, 0x00, 0xE9, 0xFF, 0xFF, 0x01, 0x00, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x07, 0x01, 0xFF, -0x00, 0x46, 0x34, 0x04, 0x00, 0xBC, 0xCC, 0xF1, 0x00, 0xEE, -0xF2, 0xFE, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, -0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x11, -0x0A, 0x04, 0x00, 0x00, 0x03, 0x05, 0x00, 0xF7, 0xFE, 0x01, -0x00, 0xFB, 0xFD, 0x02, 0x00, 0xF0, 0xEA, 0xF4, 0x00, 0xE4, -0xDF, 0xE5, 0x00, 0xFD, 0xFF, 0x06, 0x00, 0x0C, 0x11, 0x16, -0x00, 0x6A, 0x56, 0x30, 0x00, 0x5B, 0x51, 0x40, 0x00, 0xE7, -0xE7, 0xE9, 0x0C, 0x68, 0x67, 0xCE, 0x4B, 0xCC, 0xCC, 0xCC, -0xB2, 0x02, 0xFE, 0xFC, 0xF9, 0x00, 0xF7, 0xF4, 0xF3, 0x00, -0xF7, 0xF2, 0xDA, 0x00, 0xF9, 0xFC, 0x02, 0x00, 0x03, 0x06, -0x0B, 0x00, 0x03, 0x06, 0x0D, 0x00, 0x03, 0x06, 0x0C, 0x00, -0x03, 0x06, 0x0B, 0x00, 0x1B, 0x0F, 0x07, 0x00, 0x8E, 0x63, -0x3E, 0x00, 0x14, 0x05, 0xFA, 0x00, 0x12, 0x0F, 0x0C, 0x00, -0xF5, 0xED, 0xF1, 0x00, 0xEA, 0xE9, 0xEE, 0x00, 0x03, 0x04, -0x01, 0x00, 0x02, 0xFC, 0xF3, 0x00, 0x0B, 0xFE, 0xEA, 0x00, -0x50, 0x45, 0x35, 0x00, 0x01, 0x01, 0x03, 0x00, 0x5A, 0x6A, -0x86, 0xF6, 0xCC, 0xCE, 0xD0, 0xBE, 0x00, 0x00, 0x00, 0x00, -0x04, 0xFF, 0xFF, 0x00, 0x00, 0xF7, 0xF7, 0xFC, 0x00, 0xAE, -0xC5, 0x13, 0x00, 0x00, 0x00, 0xF6, 0x00, 0x00, 0xFF, 0xF5, -0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, -0x01, 0x01, 0x00, 0xE0, 0xED, 0xF9, 0x00, 0x98, 0xA6, 0xB4, -0x00, 0x4F, 0x32, 0x24, 0x00, 0x86, 0x9D, 0xBD, 0x00, 0x02, -0xFE, 0x06, 0x00, 0x05, 0xFF, 0xFC, 0x00, 0xF8, 0xFC, 0x00, -0x00, 0x08, 0x0C, 0x13, 0x00, 0x2F, 0x28, 0x0D, 0x00, 0xF8, -0xF8, 0xF7, 0x00, 0x05, 0x06, 0x05, 0x00, 0x31, 0x2F, 0x2A, -0xFF, 0x09, 0xFA, 0xDF, 0x32, 0xF3, 0xF1, 0xEF, 0xF5, 0x03, -0x07, 0x0C, 0x14, 0x28, 0x16, 0x24, 0x32, 0x59, 0xFF, 0xFE, -0xFF, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0xFF, 0xFE, 0x01, 0x00, -0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFF, 0xFF, -0x02, 0x00, 0xFD, 0x00, 0x05, 0x00, 0xCC, 0xD8, 0xEC, 0x00, -0xD4, 0xD6, 0xDB, 0x00, 0x83, 0x6C, 0x50, 0x00, 0xC8, 0xD3, -0xE1, 0x00, 0x11, 0x0E, 0x07, 0x00, 0x03, 0xFE, 0xF7, 0x00, -0x0C, 0xFF, 0xEF, 0x00, 0x35, 0x26, 0x11, 0x00, 0x05, 0x03, -0xFF, 0x00, 0xDC, 0xDD, 0xDC, 0x00, 0x32, 0x2A, 0x1D, 0x06, -0x3A, 0x39, 0x39, 0x5B, 0xAB, 0xAB, 0xAB, 0xA4, 0x04, 0x01, -0x02, 0x03, 0x00, 0x01, 0x04, 0x09, 0x00, 0xFF, 0x00, 0x01, -0x00, 0x00, 0x01, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, -0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF8, 0xF5, 0xF3, -0x00, 0xEB, 0xE7, 0xEB, 0x00, 0xFC, 0xFB, 0xFB, 0x00, 0xD9, -0xEF, 0xF9, 0x00, 0x7A, 0x8E, 0xA7, 0x00, 0x83, 0x6E, 0x54, -0x00, 0x8D, 0xA0, 0xBB, 0x00, 0x1A, 0x1A, 0x1B, 0x00, 0x12, -0x07, 0x13, 0x00, 0x53, 0x4D, 0x46, 0x00, 0xB0, 0xB2, 0xAF, -0x00, 0x06, 0x05, 0x06, 0x00, 0xE8, 0xEA, 0xEF, 0xFE, 0xC3, -0xC0, 0xBC, 0x8A, 0xF0, 0xF0, 0xF0, 0xCB, 0x01, 0x0D, 0x17, -0x23, 0x4E, 0x29, 0x45, 0x5E, 0xB1, 0x02, 0x02, 0x03, 0x00, -0x01, 0x02, 0x03, 0x00, 0xFF, 0x01, 0x02, 0x00, 0x00, 0x02, -0x05, 0x00, 0xF4, 0xF2, 0xF8, 0x00, 0xF2, 0xF3, 0xF8, 0x00, -0x02, 0x05, 0x06, 0x00, 0x02, 0x03, 0x05, 0x00, 0xFF, 0xFF, -0xFE, 0x00, 0xFE, 0xFA, 0xF8, 0x00, 0x23, 0x0F, 0xF6, 0x00, -0x80, 0x6D, 0x53, 0x00, 0xB0, 0xB7, 0xC2, 0x00, 0x07, 0xFF, -0xF0, 0x00, 0xF7, 0xF6, 0xF5, 0x00, 0xCF, 0xD7, 0xE6, 0x00, -0xD4, 0xE0, 0xF7, 0x00, 0xFF, 0x03, 0x0A, 0xF2, 0xEF, 0xD7, -0xAF, 0x16, 0xFF, 0xFE, 0xFB, 0xF9, 0x02, 0x00, 0x01, 0x03, -0x01, 0xFF, 0x00, 0x07, 0x00, 0xFD, 0xFE, 0x04, 0x00, 0xFC, -0xFC, 0x01, 0x00, 0xF7, 0xF4, 0xF9, 0x00, 0xE2, 0xD9, 0xDE, -0x00, 0xE7, 0xE1, 0xE3, 0x00, 0xF5, 0xF0, 0xEF, 0x00, 0xF5, -0xEF, 0xEE, 0x00, 0xF3, 0xEE, 0xEC, 0x00, 0xF5, 0xEF, 0xEF, -0x00, 0x04, 0xFE, 0xFB, 0x00, 0xEA, 0xF0, 0xFA, 0x00, 0x9E, -0xA4, 0xAF, 0x00, 0x4E, 0x44, 0x36, 0x00, 0xFF, 0xFD, 0xFE, -0x00, 0xF1, 0xEE, 0xDA, 0x00, 0x11, 0x10, 0xEB, 0x00, 0x0D, -0x0D, 0x06, 0x00, 0xFC, 0xFC, 0x00, 0xFF, 0xFF, 0x00, 0x01, -0xFB, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFE, 0xFC, 0xFC, 0x00, -0xFA, 0xF5, 0xF4, 0x00, 0x00, 0x01, 0x02, 0x00, 0xF3, 0xF2, -0xF5, 0x00, 0xF1, 0xEF, 0xF3, 0x00, 0x00, 0x02, 0x03, 0x00, -0x02, 0x03, 0x03, 0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x00, -0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x0C, 0x0A, 0x05, 0x00, -0x06, 0x00, 0xF7, 0x00, 0x38, 0x2A, 0x16, 0x00, 0x02, 0xF5, -0xE1, 0x00, 0x95, 0x96, 0x95, 0x00, 0x5F, 0x60, 0x61, 0x00, -0x03, 0xF1, 0xF1, 0x00, 0xCE, 0xCF, 0xC5, 0x00, 0x0C, 0x0C, -0x0F, 0x00, 0xCC, 0xD6, 0x00, 0x00, 0xF2, 0xDB, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0x01, 0x02, 0x00, 0x20, -0x1E, 0x1F, 0x00, 0x0C, 0x03, 0xFA, 0x00, 0xB9, 0xA8, 0x8F, -0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, -0x00, 0x01, 0x00, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x01, -0x00, 0x01, 0x01, 0x00, 0x00, 0xF7, 0x04, 0x03, 0x00, 0x53, -0x5A, 0x58, 0x00, 0xEA, 0xE7, 0xDB, 0x00, 0xE2, 0xE4, 0xE5, -0x00, 0x05, 0x06, 0x08, 0x00, 0xBC, 0xA2, 0x61, 0x00, 0x85, -0x69, 0xEC, 0x00, 0x20, 0x08, 0x09, 0x00, 0x8C, 0xAE, 0x03, -0x00, 0x22, 0x16, 0x15, 0x00, 0xD8, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0xFF, 0xFD, 0xFB, 0xE9, 0xDB, 0xCF, -0xC0, 0xBD, 0xFC, 0xF7, 0xF5, 0x01, 0xEF, 0xE9, 0xE0, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x00, -0x03, 0x03, 0x02, 0x05, 0x6C, 0x6B, 0x6A, 0x38, 0xE4, 0xE1, -0xD8, 0x05, 0xDF, 0xDF, 0xE0, 0x00, 0x24, 0x23, 0x24, 0xDE, -0xA5, 0xA6, 0xA8, 0xE1, 0xC2, 0x06, 0xFF, 0x00, 0xF5, 0xF2, -0xFF, 0x14, 0x8B, 0x84, 0xF5, 0x2C, 0x8B, 0x70, 0xF9, 0x01, -0x8C, 0x94, 0xD2, 0xF2, 0xB6, 0xFE, 0xFA, 0x05, 0x00, 0x00, -0x00, 0xF9, 0x01, 0x0F, 0x1D, 0x33, 0x08, 0x26, 0x39, 0x4B, -0x0C, 0xFF, 0xFF, 0x00, 0x00, 0xF2, 0xEF, 0xF3, 0x00, 0xF6, -0xF6, 0xF8, 0x00, 0x01, 0x02, 0x03, 0x00, 0x02, 0x03, 0x04, -0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0xFE, 0xF8, 0x05, 0x5D, -0x44, 0x21, 0x8D, 0x05, 0x01, 0xF8, 0x49, 0xB0, 0xB0, 0xAF, -0x10, 0x3E, 0x3E, 0x41, 0xD0, 0xA3, 0xB8, 0xD6, 0x5E, 0x0A, -0x14, 0x25, 0xE7, 0xFF, 0xFF, 0xFF, 0x00, 0xF6, 0xEE, 0xE3, -0x0C, 0x7E, 0x40, 0xB3, 0xAB, 0x5C, 0x5D, 0x0F, 0x34, 0x02, -0x06, 0x08, 0xFF, 0x8A, 0x8A, 0xE5, 0x8C, 0x89, 0xA9, 0x00, -0x79, 0x01, 0x06, 0x0B, 0x13, 0x00, 0x0C, 0x14, 0x1C, 0x01, -0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0xF8, 0xF8, -0xFA, 0x00, 0xFC, 0xFB, 0xFD, 0x00, 0x00, 0x01, 0x01, 0x00, -0x01, 0x02, 0x02, 0x00, 0x17, 0x0F, 0x05, 0x29, 0x39, 0x33, -0x28, 0x5D, 0xDF, 0xDE, 0xDF, 0xE1, 0x55, 0x55, 0x54, 0x73, -0x7F, 0x81, 0x83, 0x4F, 0xFC, 0x07, 0x19, 0xD8, 0x00, 0x01, -0x02, 0xFF, 0x00, 0xFF, 0xFE, 0x00, 0xFF, 0xFD, 0xFC, 0x01, -0x02, 0xF6, 0xE1, 0x23, 0x8B, 0x66, 0xFC, 0xA6, 0x58, 0x54, -0x09, 0x34, 0x06, 0x0E, 0x04, 0xFF, 0x80, 0x82, 0xF3, 0x81, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x0F, 0x67, 0x67, 0x67, -0xAA, 0x67, 0x67, 0x67, 0xB1, 0x0D, 0x0D, 0x0D, 0x32, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x05, 0x03, 0x00, 0x1F, 0x88, 0x65, 0x00, -0xC2, 0xE5, 0xB5, 0x02, 0xFC, 0x51, 0x3C, 0x00, 0x71, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, -0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x17, -0x1A, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x82, 0x49, -0x5F, 0x6E, 0x58, 0xCF, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB3, 0xB3, 0xB3, 0x00, 0x9C, 0x9C, -0x9C, 0x05, 0xB8, 0xB8, 0xB8, 0x10, 0x22, 0x22, 0x22, 0x28, -0x21, 0x21, 0x21, 0x21, 0x04, 0x04, 0x04, 0x08, 0xF6, 0xF6, -0xF6, 0xF0, 0xD6, 0xD6, 0xD6, 0xD9, 0xF8, 0xF8, 0xF8, 0xE0, -0x59, 0x59, 0x59, 0xF4, 0x6E, 0x6E, 0x6E, 0xFD, 0x27, 0x27, -0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xE7, 0xE7, 0xE7, 0x00, 0x49, -0x49, 0x49, 0x05, 0x1E, 0x1E, 0x1E, 0x34, 0x8D, 0x8D, 0x8D, -0x9F, 0xE1, 0xE1, 0xE1, 0xE9, 0xF3, 0xF3, 0xF3, 0xFE, 0xF1, -0xF1, 0xF1, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 0xF1, 0xF1, 0xF1, -0xFF, 0xF2, 0xF2, 0xF2, 0xFC, 0xCC, 0xCC, 0xCC, 0xD7, 0x6A, -0x6A, 0x6A, 0x7F, 0x13, 0x13, 0x13, 0x1C, 0x7E, 0x7E, 0x7E, -0x02, 0xF8, 0xF8, 0xF8, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0xD7, 0xD7, 0xD7, 0x00, 0x1C, 0x1C, 0x1C, 0x0E, 0x6E, 0x6E, -0x6E, 0x82, 0xEB, 0xEB, 0xEB, 0xF4, 0xEE, 0xEE, 0xEE, 0xFF, -0xE7, 0xE7, 0xE7, 0xFF, 0xE2, 0xE2, 0xE2, 0xFF, 0xE0, 0xE0, -0xE0, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, -0xE2, 0xE2, 0xE2, 0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xEF, 0xEF, -0xEF, 0xFE, 0xD4, 0xD4, 0xD4, 0xDF, 0x3A, 0x3A, 0x3A, 0x51, -0x4A, 0x4A, 0x4A, 0x06, 0xF6, 0xF6, 0xF6, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xDA, 0xDA, 0x00, 0x44, -0x44, 0x44, 0x11, 0x7A, 0x7A, 0x7A, 0x95, 0x5B, 0x5B, 0x5B, -0x58, 0xF5, 0xF5, 0xF5, 0x01, 0xF9, 0xF9, 0xF9, 0x00, 0xF7, -0xFA, 0xFD, 0x00, 0xCC, 0xE1, 0xF6, 0x00, 0xE3, 0xEE, 0xF8, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x08, 0x06, 0x03, 0x00, 0x2B, -0x1A, 0x0B, 0x00, 0x29, 0x1A, 0x0A, 0x00, 0x03, 0x02, 0x01, -0x00, 0x08, 0x08, 0x08, 0x00, 0x04, 0x04, 0x04, 0xF8, 0x67, -0x67, 0x67, 0x72, 0xF7, 0xF7, 0xF7, 0x9D, 0xAE, 0xAE, 0xAE, -0xFA, 0x07, 0x07, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0x3B, 0x3B, 0x3B, 0x08, 0x4D, 0x4D, -0x4D, 0x8B, 0x71, 0x71, 0x71, 0x6B, 0xF2, 0xF2, 0xF2, 0x01, -0xF9, 0xFA, 0xFB, 0x00, 0xB7, 0xD6, 0xF3, 0x00, 0xD4, 0xEA, -0xFF, 0x00, 0x1C, 0x16, 0x0E, 0x00, 0x0D, 0x07, 0x03, 0x00, -0xFE, 0xFD, 0xFE, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0xE7, 0xED, -0xF5, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0x4A, 0x2C, 0x0F, 0x00, -0x30, 0x1E, 0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x06, 0x06, -0x06, 0xF8, 0x4E, 0x4E, 0x4E, 0x5A, 0x44, 0x44, 0x44, 0xB1, -0x81, 0x81, 0x81, 0xFE, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x93, -0x93, 0x93, 0x01, 0xA6, 0xA6, 0xA6, 0x4D, 0xB9, 0xB9, 0xB9, -0xAD, 0xF5, 0xF5, 0xF5, 0x04, 0xF6, 0xF7, 0xF9, 0x00, 0x99, -0xC8, 0xF1, 0x00, 0x01, 0x09, 0x11, 0x00, 0x0B, 0x08, 0x05, -0x00, 0x1B, 0x09, 0xF9, 0x00, 0x2A, 0x18, 0x0A, 0x00, 0x0D, -0x08, 0x03, 0x00, 0xF2, 0xF7, 0xFC, 0x00, 0xC8, 0xDC, 0xEF, -0x00, 0xEA, 0xF6, 0x01, 0x00, 0xE5, 0xEA, 0xEF, 0x00, 0x3B, -0x1F, 0x05, 0x00, 0x48, 0x2E, 0x13, 0x00, 0x09, 0x09, 0x09, -0x00, 0xEB, 0xEB, 0xEB, 0xE0, 0x40, 0x40, 0x40, 0x3D, 0xC5, -0xC5, 0xC5, 0xE4, 0x01, 0xFA, 0xFA, 0xFA, 0x00, 0x2C, 0x2C, -0x2C, 0x0C, 0x92, 0x92, 0x92, 0xB9, 0x33, 0x33, 0x33, 0x3A, -0xF4, 0xF4, 0xF4, 0x00, 0xA6, 0xCE, 0xF4, 0x00, 0xE1, 0xFB, -0x0F, 0x00, 0x07, 0x07, 0x06, 0x00, 0xF8, 0xF6, 0xF7, 0x00, -0x74, 0x40, 0x12, 0x00, 0x26, 0x1A, 0x0E, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFC, 0xFE, 0x00, -0x7A, 0xA7, 0xD3, 0x00, 0xE9, 0xF6, 0x01, 0x00, 0xEC, 0xEC, -0xEE, 0x00, 0x66, 0x3C, 0x13, 0x00, 0x31, 0x20, 0x0E, 0x00, -0x0E, 0x0E, 0x0E, 0xFF, 0x7C, 0x7C, 0x7C, 0x81, 0x07, 0x07, -0x07, 0x84, 0x02, 0xCE, 0xCE, 0xCE, 0x00, 0xFF, 0xFF, 0xFF, -0x2E, 0x3A, 0x3A, 0x3A, 0x36, 0xF9, 0xF9, 0xF9, 0x00, 0xE4, -0xF1, 0xFC, 0x00, 0xC5, 0xE9, 0x05, 0x00, 0xF0, 0xFD, 0x06, -0x00, 0xE7, 0xF3, 0xFD, 0x00, 0xEC, 0xF8, 0x01, 0x00, 0x98, -0xC2, 0xE7, 0x00, 0x61, 0x9A, 0xD0, 0x00, 0x63, 0x98, 0xCB, -0x00, 0xF5, 0xF8, 0xFB, 0x00, 0x05, 0x04, 0x02, 0x00, 0x21, -0x15, 0x09, 0x00, 0xE5, 0xEF, 0xF9, 0x00, 0xF7, 0x00, 0x07, -0x00, 0x9A, 0xC0, 0xE6, 0x00, 0xFD, 0xFE, 0xFF, 0x00, 0xF8, -0xF8, 0xF8, 0x01, 0x60, 0x60, 0x60, 0x58, 0xA7, 0xA7, 0xA7, -0x0C, 0x04, 0xC6, 0xC6, 0xC6, 0x01, 0x40, 0x40, 0x40, 0x40, -0xFE, 0xFE, 0xFE, 0x04, 0xFC, 0xFC, 0xFC, 0x00, 0xBE, 0xDC, -0xF8, 0x00, 0xF4, 0x02, 0x11, 0x00, 0xF4, 0xF3, 0xFD, 0x00, -0xFD, 0xFC, 0xFC, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xE2, 0xED, -0x00, 0x00, 0xFA, 0xFB, 0x05, 0x00, 0x05, 0xF9, 0xF8, 0x00, -0xFE, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD4, 0xE4, -0xF3, 0x00, 0xE5, 0xEF, 0xF8, 0x00, 0xFD, 0xFD, 0xFD, 0x00, -0xF9, 0xF4, 0xFA, 0x00, 0xD6, 0xE5, 0xF4, 0x00, 0x2E, 0x1E, -0x02, 0x00, 0x25, 0x25, 0x25, 0x25, 0x01, 0x01, 0x01, 0x20, -0x04, 0xCE, 0xCE, 0xCE, 0x03, 0x35, 0x35, 0x35, 0x28, 0xFC, -0xFC, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xCC, 0xE7, 0xFE, -0x00, 0xEC, 0xFC, 0x01, 0x00, 0xFD, 0xFD, 0xFC, 0x00, 0xFC, -0xFB, 0xFC, 0x00, 0xFB, 0xFA, 0xFB, 0x00, 0xFB, 0xFB, 0xFC, -0x00, 0xFD, 0xFA, 0xF8, 0x00, 0x90, 0x4F, 0x1C, 0x00, 0x0D, -0x0A, 0x06, 0x00, 0xC9, 0xDA, 0xEB, 0x00, 0xA9, 0xCC, 0xED, -0x00, 0xFB, 0xFF, 0x03, 0x00, 0xFE, 0xFC, 0xFB, 0x00, 0xFD, -0xFA, 0xFE, 0x00, 0xC8, 0xDB, 0xEE, 0x00, 0x2C, 0x1C, 0x0C, -0x00, 0xFF, 0xFF, 0xFF, 0x03, 0x29, 0x29, 0x29, 0x27, 0x04, -0xFB, 0xFB, 0xFB, 0x01, 0x09, 0x09, 0x09, 0x0F, 0xFE, 0xFE, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xF4, 0xFC, 0x00, -0xFB, 0x06, 0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0xFD, 0xFE, -0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x3F, 0x20, 0x06, 0x00, 0x58, 0x39, 0x1B, 0x00, 0xE9, 0xF0, -0xF7, 0x00, 0x5D, 0x98, 0xD1, 0x00, 0xF9, 0x00, 0x05, 0x00, -0xFD, 0xFD, 0xFC, 0x00, 0xFD, 0xFD, 0xFF, 0x00, 0xFD, 0xFE, -0x00, 0x00, 0xEC, 0xF1, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x0A, 0x0A, 0x10, 0x02, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF8, 0x01, 0x01, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x07, 0x03, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x49, -0x2B, 0x10, 0x00, 0x01, 0x01, 0x01, 0x00, 0x9F, 0xC0, 0xDF, -0x00, 0xE8, 0xF9, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0x00, 0x0B, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF8, 0x04, 0x23, 0x23, -0x23, 0xFD, 0xE0, 0xE0, 0xE0, 0xE0, 0x02, 0x02, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x25, 0x12, 0x02, 0x00, 0xE0, 0xEB, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0xB9, 0xD3, -0xEB, 0x00, 0xDF, 0xE6, 0xEE, 0x00, 0xBF, 0xDB, 0xF5, 0x00, -0x01, 0x02, 0x02, 0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFD, 0x00, -0x2B, 0x1D, 0x0E, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, -0x02, 0xFF, 0xE0, 0xE0, 0xE0, 0xDF, 0x02, 0x3D, 0x3D, 0x3D, -0xFE, 0xC4, 0xC4, 0xC4, 0xC7, 0x05, 0x05, 0x05, 0xFF, 0x02, -0x02, 0x02, 0x00, 0x42, 0x22, 0x06, 0x00, 0xFD, 0xF9, 0xF7, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x08, -0x05, 0x01, 0x00, 0x0E, 0x0A, 0x02, 0x00, 0xF8, 0x02, 0x06, -0x00, 0x19, 0x16, 0x10, 0x00, 0x07, 0x09, 0x06, 0x00, 0x10, -0x0B, 0x02, 0x00, 0x09, 0x07, 0x02, 0x00, 0x03, 0x02, 0x01, -0x00, 0x00, 0x00, 0xFF, 0x00, 0x13, 0x08, 0xFE, 0x00, 0x3A, -0x26, 0x12, 0x00, 0x03, 0x03, 0x03, 0x00, 0xEE, 0xEE, 0xEE, -0xEB, 0xE5, 0xE5, 0xE5, 0xD8, 0x02, 0x38, 0x38, 0x38, 0x00, -0xD8, 0xD8, 0xD8, 0xC5, 0xE2, 0xE2, 0xE2, 0xE1, 0x06, 0x06, -0x06, 0x00, 0x33, 0x1D, 0x07, 0x00, 0x2F, 0x0F, 0xF6, 0x00, -0x00, 0xFE, 0xFC, 0x00, 0x0D, 0x09, 0x00, 0x00, 0x18, 0x10, -0x01, 0x00, 0x15, 0x0C, 0xFD, 0x00, 0x8C, 0x52, 0x1F, 0x00, -0x69, 0x42, 0x1F, 0x00, 0x86, 0x51, 0x21, 0x00, 0x17, 0x10, -0x02, 0x00, 0x1B, 0x14, 0x06, 0x00, 0x0F, 0x0C, 0x03, 0x00, -0x02, 0xFD, 0xFB, 0x00, 0x6D, 0x44, 0x1B, 0x00, 0x08, 0x05, -0x01, 0x00, 0x07, 0x07, 0x07, 0x00, 0xAE, 0xAE, 0xAE, 0xB6, -0x40, 0x40, 0x40, 0xF0, 0x02, 0x10, 0x10, 0x10, 0x00, 0x58, -0x58, 0x58, 0xEE, 0x8E, 0x8E, 0x8E, 0x97, 0x09, 0x09, 0x09, -0xFF, 0x03, 0x02, 0x02, 0x00, 0x7C, 0x42, 0x0E, 0x00, 0x13, -0xFE, 0xEF, 0x00, 0x02, 0xFF, 0xFD, 0x00, 0x04, 0x02, 0x00, -0x00, 0x02, 0x01, 0x00, 0x00, 0xD5, 0xE2, 0xEF, 0x00, 0xFE, -0xFF, 0xFF, 0x00, 0xD5, 0xE1, 0xED, 0x00, 0x03, 0x02, 0x01, -0x00, 0x04, 0x03, 0x01, 0x00, 0x03, 0xFF, 0xFC, 0x00, 0x4B, -0x2A, 0x0A, 0x00, 0x5C, 0x3C, 0x1B, 0x00, 0x04, 0x04, 0x04, -0x00, 0xFD, 0xFD, 0xFD, 0xF5, 0x93, 0x93, 0x93, 0x95, 0x6C, -0x6C, 0x6C, 0xFB, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xEB, 0xEB, -0xEB, 0x00, 0x28, 0x28, 0x28, 0x12, 0xA5, 0xA5, 0xA5, 0xB3, -0x35, 0x35, 0x35, 0x3A, 0xF4, 0xF4, 0xF4, 0x00, 0xEC, 0xF5, -0xFD, 0x00, 0x84, 0xBB, 0xED, 0x00, 0xD6, 0xF1, 0x04, 0x00, -0x08, 0x08, 0x05, 0x00, 0xFD, 0xF5, 0xF1, 0x00, 0x0D, 0xFF, -0xF7, 0x00, 0xEE, 0xFC, 0x04, 0x00, 0xFE, 0x01, 0x05, 0x00, -0xF8, 0xF2, 0xF3, 0x00, 0x54, 0x2E, 0x0C, 0x00, 0x6D, 0x44, -0x1C, 0x00, 0x04, 0x03, 0x02, 0x00, 0x0D, 0x0D, 0x0D, 0xFF, -0x7F, 0x7F, 0x7F, 0x85, 0xDC, 0xDC, 0xDC, 0x82, 0xB6, 0xB6, -0xB6, 0xFB, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x00, 0xAF, 0xAF, 0xAF, 0x00, 0x6B, 0x6B, 0x6B, 0x2A, 0xB5, -0xB5, 0xB5, 0xB0, 0x1D, 0x1D, 0x1D, 0x25, 0xF6, 0xF6, 0xF6, -0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xCA, 0xE1, 0xF6, 0x00, 0xBB, -0xD8, 0xF4, 0x00, 0xD8, 0xE8, 0xF8, 0x00, 0xF4, 0xF7, 0xF9, -0x00, 0x11, 0x0A, 0x03, 0x00, 0x32, 0x1C, 0x09, 0x00, 0x4F, -0x30, 0x13, 0x00, 0x1D, 0x12, 0x06, 0x00, 0x03, 0x03, 0x03, -0x00, 0x0B, 0x0B, 0x0B, 0xFF, 0xA8, 0xA8, 0xA8, 0xA9, 0x86, -0x86, 0x86, 0x68, 0xCC, 0xCC, 0xCC, 0xF1, 0x18, 0x18, 0x18, -0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0xFD, 0xFD, 0xFD, 0x00, 0x70, 0x70, 0x70, 0x03, 0x16, 0x16, -0x16, 0x2F, 0xB6, 0xB6, 0xB6, 0xCA, 0xEF, 0xEF, 0xEF, 0xFE, -0xE6, 0xE6, 0xE6, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, 0xDF, 0xDF, -0xDF, 0xFF, 0xDF, 0xDF, 0xDF, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, -0xDF, 0xDF, 0xDF, 0xFF, 0xDF, 0xDF, 0xDF, 0xFF, 0xE1, 0xE1, -0xE1, 0xFF, 0xE7, 0xE7, 0xE7, 0xFF, 0xED, 0xED, 0xED, 0xFB, -0x7F, 0x7F, 0x7F, 0x98, 0x12, 0x12, 0x12, 0x13, 0xD0, 0xD0, -0xD0, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF5, 0xF5, 0xF5, 0x00, 0x32, -0x32, 0x32, 0x06, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, -0x26, 0x03, 0x03, 0x03, 0x44, 0x5E, 0x5E, 0x5E, 0x9D, 0xD0, -0xD0, 0xD0, 0xEA, 0xF0, 0xF0, 0xF0, 0xFE, 0xEB, 0xEB, 0xEB, -0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xE7, 0xE7, 0xE7, 0xFF, 0xE8, -0xE8, 0xE8, 0xFF, 0xEB, 0xEB, 0xEB, 0xFF, 0xED, 0xED, 0xED, -0xFC, 0xB2, 0xB2, 0xB2, 0xD6, 0x35, 0x35, 0x35, 0x76, 0x00, -0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0x1C, 0x1C, 0x1C, -0x08, 0xF0, 0xF0, 0xF0, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, -0xC0, 0x01, 0x9B, 0x9B, 0x9B, 0x08, 0xC9, 0xC9, 0xC9, 0x0B, -0xE3, 0xE3, 0xE3, 0x0D, 0xFA, 0xFA, 0xFA, 0x10, 0x03, 0x03, -0x03, 0x17, 0x33, 0x33, 0x33, 0x30, 0x3B, 0x3B, 0x3B, 0x2B, -0x21, 0x21, 0x21, 0x18, 0x06, 0x06, 0x06, 0x06, 0xF3, 0xF3, -0xF3, 0xF4, 0xD6, 0xD6, 0xD6, 0xE1, 0xC1, 0xC1, 0xC1, 0xCE, -0xDE, 0xDE, 0xDE, 0xD5, 0x06, 0x06, 0x06, 0xEB, 0x16, 0x16, -0x16, 0xF2, 0x3E, 0x3E, 0x3E, 0xF4, 0x56, 0x56, 0x56, 0xF8, -0x4F, 0x4F, 0x4F, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0xE2, 0xE2, 0xE2, 0x00, 0xE5, 0xE5, 0xE5, -0x02, 0xE4, 0xE4, 0xE4, 0x02, 0xCE, 0xCE, 0xCE, 0x04, 0xE5, -0xE5, 0xE5, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -0xFD, 0x2C, 0x2C, 0x2C, 0xFD, 0x35, 0x35, 0x35, 0xFD, 0x23, -0x23, 0x23, 0xFD, 0x1E, 0x1E, 0x1E, 0x00, 0x06, 0x06, 0x06, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xEA, 0x4C, -0xEA, 0x00, 0x54, 0x70, 0x66, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Log3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x0B, 0x0B, 0x0C, 0x01, 0x2A, 0x2B, -0x2B, 0x1B, 0x47, 0x47, 0x49, 0x3D, 0x61, 0x61, 0x63, 0x58, -0x15, 0x15, 0x16, 0x04, 0xD2, 0xD2, 0xD1, 0xDF, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x03, 0x24, 0x24, 0x26, -0x1B, 0x30, 0x30, 0x30, 0x2E, 0x32, 0x33, 0x34, 0x33, 0x31, -0x30, 0x31, 0x32, 0x25, 0x25, 0x25, 0x32, 0x0C, 0x0C, 0x0B, -0x18, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x01, 0x25, -0x26, 0x26, 0xAC, 0xA3, 0xA3, 0xA1, 0xBE, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, -0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x04, 0x2B, 0x2C, 0x2D, 0x1B, -0x2B, 0x2B, 0x2C, 0x2F, 0x30, 0x2F, 0x30, 0x32, 0x31, 0x31, -0x31, 0x33, 0x24, 0x24, 0x25, 0x30, 0x0C, 0x0C, 0x0C, 0x18, -0x02, 0x02, 0x01, 0x03, 0x00, 0x00, 0x00, 0x01, 0xFE, 0xFE, -0xFE, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF7, 0xF8, -0xF8, 0xEE, 0x2D, 0x2C, 0x29, 0x1C, 0xEE, 0xEE, 0xEE, 0xF7, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xA0, 0xA0, 0xA4, 0x8C, 0xF2, 0xF3, 0xF6, 0xFC, 0xF3, -0xF4, 0xF7, 0xFE, 0xF3, 0xF4, 0xF7, 0xFF, 0xF1, 0xF2, 0xF5, -0xFF, 0xEF, 0xEF, 0xF2, 0xFF, 0xEE, 0xEF, 0xF2, 0xFF, 0xEE, -0xEF, 0xF2, 0xFF, 0xED, 0xEE, 0xF1, 0xFF, 0xED, 0xED, 0xF0, -0xFF, 0xEE, 0xEE, 0xF1, 0xFF, 0xEE, 0xEF, 0xF2, 0xFF, 0xEE, -0xEE, 0xF1, 0xFF, 0xEC, 0xED, 0xF0, 0xFF, 0xED, 0xEE, 0xF1, -0xFE, 0x50, 0x51, 0x53, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0xD0, 0xD1, 0xCF, 0xDE, 0xFC, 0xFC, 0xFC, 0x03, 0xFB, 0xFB, -0xFB, 0x01, 0xFA, 0xFA, 0xFA, 0x00, 0xFA, 0xFA, 0xFA, 0x00, -0xFE, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x01, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0xF7, 0x01, -0x42, 0x42, 0x43, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xCF, -0xCF, 0xCE, 0xCD, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xDA, 0xD9, -0x00, 0xD7, 0xD7, 0xD7, 0x00, 0xF4, 0xF4, 0xF4, 0x00, 0x01, -0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF7, 0xF7, 0xF7, 0x00, 0xE3, -0xE3, 0xE2, 0x00, 0xDC, 0xDC, 0xDB, 0x00, 0xD2, 0xD1, 0xD1, -0x00, 0xD5, 0xD5, 0xD4, 0x00, 0xD6, 0xD6, 0xD5, 0x00, 0x40, -0x3F, 0x40, 0x49, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, -0x00, 0x0E, 0x0E, 0x0E, 0x11, 0x99, 0x99, 0x99, 0xB0, 0x1F, -0x1F, 0x1F, 0x33, 0x04, 0x00, 0x00, 0x00, 0x00, 0xD6, 0xD5, -0xD4, 0xD9, 0xF8, 0xF8, 0xF9, 0xF4, 0x23, 0x22, 0x23, 0x0D, -0x01, 0x01, 0x01, 0x00, 0xF9, 0xF9, 0xF9, 0x00, 0xE5, 0xE4, -0xE4, 0x00, 0xF1, 0xF1, 0xF1, 0x00, 0x09, 0x09, 0x09, 0x00, -0xE3, 0xE4, 0xE3, 0x00, 0x0D, 0x0C, 0x0D, 0x00, 0x05, 0x05, -0x05, 0x00, 0xFB, 0xFC, 0xFB, 0x00, 0x05, 0x05, 0x05, 0x00, -0xF5, 0xF4, 0xF5, 0x00, 0x07, 0x07, 0x07, 0x00, 0x19, 0x19, -0x18, 0x24, 0x3A, 0x3A, 0x3C, 0x2A, 0x69, 0x69, 0x67, 0x66, -0xEA, 0xEA, 0xEA, 0x32, 0x1C, 0x1C, 0x1C, 0x37, 0xEA, 0xEA, -0xEA, 0xA0, 0x04, 0x0E, 0x0E, 0x09, 0x07, 0x6F, 0x68, 0x34, -0x5F, 0xFE, 0xFA, 0xE6, 0x05, 0xE1, 0xE7, 0x00, 0x00, 0xEB, -0xEA, 0xEA, 0x00, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x02, 0x02, 0x02, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0x01, -0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFB, -0x00, 0x05, 0x05, 0x05, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFA, 0x00, 0xFF, 0xFF, 0x00, -0x02, 0x7C, 0x7C, 0x7C, 0x80, 0xB6, 0xB6, 0xB4, 0x19, 0x57, -0x58, 0x58, 0x39, 0xA4, 0xA3, 0xA3, 0xF7, 0xFB, 0xFB, 0xFB, -0xDA, 0x03, 0xAE, 0xA4, 0x5C, 0x9B, 0x61, 0x59, 0x1F, 0x78, -0xF8, 0xFC, 0x13, 0x05, 0x03, 0x07, 0x20, 0x00, 0xF5, 0xF6, -0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x0C, 0x0D, 0x0D, 0x00, 0xF2, 0xF3, 0xF3, 0x00, 0x0A, 0x0A, -0x0B, 0x00, 0x01, 0x02, 0x02, 0x00, 0xFB, 0xFB, 0xFA, 0x00, -0x03, 0x04, 0x04, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0x00, 0x01, -0x01, 0x00, 0x05, 0x05, 0x06, 0x00, 0xF5, 0xF4, 0xF5, 0x00, -0xEA, 0xEA, 0xE9, 0xFF, 0x2C, 0x2C, 0x2B, 0xEE, 0xD3, 0xD5, -0xD5, 0x1A, 0xA3, 0xA2, 0xA2, 0xB0, 0xED, 0xED, 0xED, 0xA5, -0x02, 0x8E, 0x95, 0xC7, 0xA0, 0xFF, 0xFF, 0x02, 0xFD, 0x02, -0xFF, 0xE6, 0x00, 0x04, 0x04, 0x03, 0x00, 0xF0, 0xEF, 0xEF, -0x00, 0x04, 0x04, 0x04, 0x00, 0x02, 0x01, 0x01, 0x00, 0x01, -0x01, 0x02, 0x00, 0x02, 0x01, 0x01, 0x00, 0xFE, 0xFF, 0xFE, -0x00, 0xFA, 0xFA, 0xFA, 0x00, 0x0F, 0x0F, 0x10, 0x00, 0xFC, -0xFC, 0xFC, 0x00, 0xFC, 0xFD, 0xFC, 0x00, 0xFD, 0xFD, 0xFD, -0x00, 0x0A, 0x0A, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x00, 0x08, -0x09, 0x08, 0x27, 0x1F, 0x20, 0x20, 0x39, 0xCE, 0xCC, 0xCC, -0xD3, 0xEF, 0xEF, 0xEF, 0x84, 0x00, 0x00, 0x00, 0xF3, 0x03, -0xDF, 0xE0, 0xED, 0xE6, 0x2C, 0x2A, 0x1E, 0x25, 0x23, 0x21, -0x08, 0x2D, 0x03, 0x09, 0x3A, 0x00, 0xED, 0xEE, 0xED, 0x00, -0x08, 0x08, 0x08, 0x00, 0xF4, 0xF5, 0xF4, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0x01, 0x01, 0x01, 0x00, -0x06, 0x06, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFB, -0xFB, 0x00, 0x26, 0x26, 0x26, 0x00, 0x1C, 0x1C, 0x1C, 0x00, -0x14, 0x14, 0x14, 0x00, 0xFA, 0xF9, 0xF8, 0x00, 0x0D, 0x0D, -0x0C, 0x02, 0xC0, 0xC2, 0xC2, 0xF8, 0xC1, 0xC0, 0xC0, 0x9C, -0xDA, 0xDA, 0xDA, 0xB5, 0x00, 0x00, 0x00, 0xFD, 0x02, 0x00, -0x00, 0x00, 0xFB, 0x76, 0x7F, 0xBB, 0x81, 0xFB, 0xF9, 0xF1, -0xF1, 0xFD, 0xFD, 0xF6, 0x00, 0x0A, 0x0A, 0x0B, 0x00, 0x01, -0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x00, 0xF7, 0xF6, 0xF6, -0x00, 0x10, 0x0F, 0x10, 0x00, 0x0C, 0x0B, 0x0C, 0x00, 0x06, -0x05, 0x06, 0x00, 0x03, 0x02, 0x02, 0x00, 0x18, 0x18, 0x18, -0x00, 0x0A, 0x0A, 0x0B, 0x00, 0x06, 0x05, 0x06, 0x00, 0x01, -0x00, 0x01, 0x00, 0xF3, 0xF3, 0xF5, 0x00, 0x05, 0x07, 0x07, -0x00, 0xD3, 0xD2, 0xD3, 0xF0, 0xD7, 0xD7, 0xD7, 0xB0, 0x00, -0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0xF0, 0xF1, 0xF7, 0xF1, 0x06, 0x07, 0x08, 0x08, -0x33, 0x33, 0x38, 0x3E, 0xFD, 0xFF, 0x0D, 0x01, 0xF9, 0xF8, -0xF9, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x20, 0x20, 0x20, 0x00, -0x17, 0x17, 0x18, 0x00, 0x15, 0x16, 0x16, 0x00, 0x14, 0x15, -0x15, 0x00, 0x13, 0x14, 0x14, 0x00, 0x0B, 0x0B, 0x0B, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0x06, 0x05, 0x03, 0x00, 0xBC, 0xBE, 0xBD, 0x00, -0x11, 0x0F, 0x11, 0xFC, 0xB9, 0xB9, 0xB8, 0x89, 0xFC, 0xFC, -0xFC, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFE, 0xCF, 0xD1, 0xE8, 0xD7, 0x4B, -0x4A, 0x3C, 0x55, 0x1F, 0x20, 0x30, 0x10, 0x11, 0x11, 0x11, -0x00, 0x19, 0x19, 0x19, 0x00, 0x0A, 0x09, 0x0A, 0x00, 0x02, -0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, -0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0xE5, 0xE5, 0xE3, -0x00, 0xBB, 0xBF, 0xBD, 0x00, 0xE9, 0xE7, 0xE8, 0x00, 0x49, -0x48, 0x4A, 0x09, 0xD4, 0xD5, 0xD5, 0xBC, 0xE1, 0xE0, 0xDF, -0xDE, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFA, 0xFB, 0xFC, 0xF7, 0xFB, 0xFD, -0x09, 0x0E, 0x3F, 0x3F, 0x41, 0x40, 0xCD, 0xCE, 0xCC, 0x00, -0xF7, 0xF7, 0xF7, 0x00, 0xE6, 0xE6, 0xE6, 0x00, 0x09, 0x09, -0x09, 0x00, 0x07, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x02, -0x01, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xD2, 0xD3, 0xD1, 0x00, -0xCD, 0xCD, 0xCC, 0x00, 0x31, 0x2F, 0x30, 0x00, 0x2B, 0x2C, -0x2D, 0x01, 0xF2, 0xF2, 0xF2, 0xEE, 0xBF, 0xBE, 0xBD, 0xBA, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xCD, 0xCD, 0xCF, -0xBF, 0x07, 0x08, 0x08, 0xFF, 0x1D, 0x1D, 0x1E, 0x00, 0x1F, -0x1F, 0x20, 0x00, 0x2B, 0x2C, 0x2C, 0x00, 0x0E, 0x0F, 0x0F, -0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFE, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xE6, 0xE4, 0x00, 0xD7, 0xD8, 0xD7, 0x00, 0x0D, -0x0A, 0x0B, 0x00, 0x2A, 0x2B, 0x2C, 0x00, 0x06, 0x06, 0x06, -0x00, 0x43, 0x42, 0x44, 0x46, 0x02, 0x02, 0x02, 0x05, 0x00, -0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xDF, 0xDE, 0xD7, -0xF2, 0xF2, 0xF3, 0xF1, 0x1C, 0x1B, 0x1C, 0x00, 0x04, 0x03, -0x04, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0x01, 0x01, -0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xF1, 0xF0, 0xF0, 0x00, -0xE3, 0xE2, 0xE1, 0x00, 0xED, 0xEC, 0xEC, 0x00, 0x2D, 0x2D, -0x2E, 0x00, 0x15, 0x14, 0x16, 0x00, 0xF8, 0xF8, 0xF9, 0xFE, -0xF6, 0xF7, 0xF7, 0x0F, 0x12, 0x12, 0x13, 0x15, 0x00, 0x00, -0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xB1, -0xB1, 0xB6, 0xC1, 0x36, 0x37, 0x37, 0x37, 0x01, 0x01, 0x01, -0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFE, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, -0x00, 0x00, 0x00, 0x01, 0x00, 0xBE, 0xBD, 0xBB, 0x00, 0xD6, -0xD6, 0xD3, 0x00, 0x0F, 0x0F, 0x0F, 0xF7, 0xD2, 0xD3, 0xD5, -0xBC, 0xDE, 0xDD, 0xDE, 0xC8, 0xD4, 0xD4, 0xD2, 0xCC, 0xF0, -0xF0, 0xF0, 0xD9, 0x00, 0x00, 0xFF, 0xE5, 0x00, 0x00, 0x00, -0xFC, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xCF, 0xD0, -0xCE, 0xD1, 0x36, 0x37, 0x36, 0x37, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, -0xF5, 0x00, 0xF1, 0xF0, 0xE4, 0x00, 0xDC, 0xDB, 0xD4, 0xF1, -0xA8, 0xAA, 0xBB, 0xBD, 0xED, 0xED, 0xEE, 0x19, 0x62, 0x62, -0x61, 0x2E, 0x8D, 0x8D, 0x8D, 0x7E, 0xCF, 0xCF, 0xCF, 0x9F, -0x00, 0x00, 0x00, 0xF3, 0x00, 0x00, 0x00, 0xFD, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xCF, 0xCE, 0xCE, -0xCE, 0xE5, 0xE5, 0xE6, 0xF4, 0xDD, 0xDC, 0xD6, 0xF2, 0x16, -0x11, 0xE8, 0x19, 0xFE, 0xFB, 0xE2, 0x01, 0x02, 0xFF, 0xED, -0xFA, 0xAB, 0xB0, 0xD5, 0xB4, 0xA0, 0xA5, 0xD1, 0x93, 0xF6, -0xF7, 0xFB, 0xD2, 0x61, 0x61, 0x61, 0x8F, 0x81, 0x81, 0x81, -0x98, 0xDB, 0xDB, 0xDB, 0xAA, 0x00, 0x00, 0x00, 0xF8, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x04, 0x12, -0x04, 0x04, 0x04, 0x2C, 0x05, 0x05, 0x03, 0x2F, 0xC9, 0xBD, -0x62, 0xDB, 0xB3, 0xA8, 0x55, 0xCE, 0x29, 0x27, 0x15, 0x57, -0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x04, 0x04, -0x04, 0x13, 0x1E, 0x1E, 0x1E, 0x78, 0x00, 0x00, 0x00, 0x08, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x15, 0x14, 0x0C, -0x30, 0x01, 0x01, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x05, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xBC, 0x5F, -0xCE, 0x94, 0x2C, 0x90, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Open3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x23, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x64, 0x96, 0x4B, 0x6C, 0x5D, 0x47, 0x19, -0xC7, 0x7F, 0x73, 0x66, 0xCE, 0x39, 0xF7, 0xDC, 0x97, 0xEF, -0xBD, 0x7E, 0x25, 0x7E, 0x34, 0x71, 0x1C, 0xDB, 0xB1, 0x93, -0x34, 0xB8, 0x09, 0x45, 0x11, 0xB4, 0x42, 0x3C, 0x04, 0x24, -0x08, 0x95, 0xAA, 0x6C, 0x11, 0x3B, 0x24, 0x58, 0xB0, 0x62, -0xC1, 0x06, 0x58, 0x95, 0x15, 0x6B, 0x04, 0x95, 0x90, 0x22, -0x45, 0x42, 0x20, 0x84, 0x84, 0x5A, 0x90, 0xA2, 0xB4, 0xA1, -0x0A, 0x10, 0xDA, 0xF4, 0x45, 0x5A, 0x35, 0x4D, 0x1B, 0x39, -0x76, 0xDD, 0xD8, 0x71, 0x62, 0xFB, 0x3A, 0xBE, 0xCF, 0x73, -0xCE, 0xCC, 0x9C, 0x61, 0x71, 0x93, 0x6B, 0x94, 0x8C, 0x34, -0xCB, 0xF9, 0xFF, 0xBE, 0xEF, 0xFF, 0x9F, 0x4F, 0x33, 0xE2, -0xE7, 0x3F, 0x7E, 0x96, 0x47, 0x97, 0xD6, 0x29, 0x23, 0x23, -0xFB, 0xC9, 0x9C, 0xE0, 0xE0, 0xF4, 0x1C, 0x4F, 0x9D, 0x38, -0xC6, 0xC5, 0x0B, 0x2F, 0xB3, 0xBE, 0xD9, 0xE0, 0x9B, 0x67, -0x5E, 0xE0, 0xED, 0x37, 0xFE, 0xE5, 0xE5, 0x72, 0xB2, 0x36, -0x36, 0x31, 0x39, 0x5A, 0xAB, 0x96, 0xC6, 0x47, 0x07, 0x6B, -0xFB, 0xEE, 0x6D, 0x6D, 0xD5, 0x56, 0x3E, 0xBD, 0x5D, 0xA9, -0xD5, 0x2A, 0x33, 0x33, 0xB3, 0x4F, 0xFE, 0xF6, 0xC0, 0x89, -0xE7, 0x2E, 0x03, 0x28, 0x6B, 0xED, 0x63, 0x00, 0x6B, 0x2D, -0xA9, 0x36, 0x44, 0xB9, 0xD2, 0x50, 0x2E, 0x0C, 0x8F, 0x26, -0x49, 0xF7, 0xD0, 0xC2, 0xC2, 0xFC, 0xD4, 0x91, 0x2C, 0x3B, -0x34, 0x56, 0xCD, 0x0E, 0x7D, 0xF7, 0xEC, 0xE9, 0x7D, 0xBE, -0xF2, 0x46, 0xF3, 0x39, 0x3F, 0x9F, 0x68, 0x4D, 0x92, 0xA6, -0xCC, 0x1E, 0x1C, 0xE1, 0xE9, 0x93, 0x47, 0xE8, 0xEE, 0x6E, -0xE0, 0xA2, 0x91, 0xAB, 0x40, 0x0F, 0x10, 0x45, 0xD1, 0x63, -0x00, 0x63, 0x2C, 0xE3, 0x63, 0xFB, 0x5E, 0x3C, 0xF3, 0xF5, -0x67, 0x7E, 0xA6, 0xA4, 0xC5, 0x59, 0xCD, 0xD4, 0xC4, 0x1C, -0x41, 0xA8, 0xC8, 0x3A, 0x0D, 0x3C, 0xE9, 0x83, 0x2F, 0xA9, -0x6F, 0xB5, 0x48, 0x8C, 0x47, 0x21, 0x0A, 0x09, 0x03, 0x87, -0x6E, 0xDE, 0xA5, 0xB9, 0xB3, 0x85, 0xEF, 0xEB, 0x38, 0xFF, -0x40, 0x4B, 0xD5, 0x06, 0x47, 0x1F, 0x03, 0x48, 0xBF, 0xC8, -0xC4, 0xD8, 0xE8, 0xE9, 0xEA, 0x50, 0x48, 0xBC, 0xB3, 0x8B, -0x11, 0x90, 0xB4, 0x76, 0xE9, 0x36, 0x1C, 0x42, 0x08, 0x8A, -0x05, 0xC9, 0xD6, 0x7A, 0x9D, 0xE5, 0x3B, 0x1D, 0x8E, 0x1F, -0x99, 0x24, 0xF0, 0x0C, 0xD6, 0x81, 0x36, 0x19, 0x5A, 0x5B, -0xA4, 0x49, 0xD4, 0x43, 0x2D, 0x2F, 0xCB, 0x2C, 0x8F, 0x6E, -0xC8, 0x88, 0x93, 0xA4, 0x9B, 0x34, 0xDA, 0x74, 0x93, 0x94, -0x34, 0x4D, 0x31, 0x5A, 0xE3, 0x32, 0x8B, 0x92, 0x82, 0x77, -0x3E, 0xB8, 0xC5, 0x4B, 0x7F, 0xB8, 0xC4, 0x67, 0xEB, 0x9B, -0xE4, 0x23, 0x1F, 0xEB, 0x00, 0x04, 0x36, 0xCB, 0xB0, 0xD6, -0x10, 0xC7, 0xCD, 0xC2, 0x43, 0x80, 0xEA, 0xB4, 0x9B, 0x8F, -0x75, 0xD0, 0x6A, 0xB6, 0x48, 0x92, 0x34, 0x76, 0x59, 0x86, -0x6F, 0x3B, 0x28, 0x61, 0x70, 0x08, 0xA4, 0x10, 0x04, 0x04, -0x2C, 0x2D, 0xAD, 0xB2, 0x76, 0xA7, 0xCE, 0xD1, 0xF9, 0x59, -0x10, 0x02, 0x01, 0x38, 0xC0, 0x1A, 0x83, 0x31, 0x06, 0x52, -0x9D, 0xDF, 0x03, 0x6C, 0xAF, 0x3E, 0x22, 0xEF, 0xB8, 0xBF, -0xBD, 0x03, 0xF1, 0x13, 0xDD, 0x90, 0x2E, 0x2B, 0xED, 0x3C, -0x1B, 0xBA, 0x46, 0x9C, 0x85, 0x28, 0x09, 0x83, 0x61, 0x8A, -0xF1, 0x96, 0x28, 0x87, 0x06, 0x29, 0x0C, 0x08, 0xAF, 0x77, -0xCA, 0x39, 0x8C, 0x36, 0x68, 0x9D, 0xA2, 0x04, 0x61, 0x1F, -0x10, 0x8F, 0x3E, 0x72, 0x4D, 0x85, 0x24, 0xAA, 0x34, 0x69, -0x88, 0x4A, 0xE7, 0xC2, 0xE6, 0x51, 0xAE, 0x37, 0x07, 0x89, -0x5D, 0xD4, 0xEB, 0x40, 0x4A, 0x72, 0x4E, 0xB2, 0x12, 0x37, -0xD9, 0xD4, 0x1B, 0x58, 0xA7, 0x00, 0x0B, 0x42, 0x90, 0xD9, -0x0C, 0xA3, 0x13, 0x4C, 0x9A, 0x20, 0x70, 0xFD, 0x0C, 0x94, -0x37, 0x7D, 0xE6, 0xFF, 0xC4, 0x05, 0x3A, 0x8E, 0x19, 0xAC, -0x0D, 0x2D, 0x6C, 0x57, 0x2A, 0xDF, 0x5B, 0xEF, 0x14, 0xC9, -0x85, 0x96, 0x8A, 0xB0, 0x48, 0xCF, 0x43, 0x2A, 0x50, 0xBE, -0x22, 0xF3, 0x4B, 0xDC, 0xF6, 0x66, 0x69, 0x88, 0x2A, 0x08, -0x8D, 0x00, 0xB2, 0xCC, 0xA2, 0x8D, 0x46, 0x6B, 0x8D, 0x73, -0xCE, 0xEB, 0x03, 0xB6, 0x57, 0x3E, 0x7C, 0xA8, 0x4E, 0x9A, -0x74, 0x29, 0x16, 0xCB, 0xC1, 0xC0, 0xF4, 0xA1, 0x3F, 0xF9, -0x03, 0x83, 0x03, 0x79, 0x93, 0x20, 0x85, 0x87, 0x10, 0x3E, -0x4A, 0x4A, 0x94, 0x52, 0x28, 0x3F, 0xA0, 0x10, 0x0A, 0xF2, -0xBE, 0xC0, 0x93, 0xF2, 0x81, 0xA9, 0x3D, 0xFF, 0xB5, 0xD6, -0x68, 0x9D, 0xE2, 0x32, 0x27, 0xFA, 0x80, 0x8D, 0xE5, 0x9B, -0x08, 0x1C, 0x38, 0x47, 0xAB, 0xD5, 0x60, 0xF1, 0xCB, 0xDF, -0xFE, 0x49, 0x6D, 0x74, 0xFC, 0x68, 0xB7, 0xD3, 0x40, 0x2A, -0x09, 0xC2, 0xC3, 0xF7, 0x43, 0xF0, 0x14, 0x78, 0x92, 0x20, -0x0C, 0x50, 0x4A, 0x21, 0xA5, 0x87, 0xF7, 0xB0, 0x4E, 0xE7, -0xD0, 0x5A, 0x63, 0xB4, 0xC6, 0xE8, 0x04, 0x27, 0x9C, 0xEB, -0x03, 0xA4, 0x0A, 0x90, 0xCA, 0xA7, 0xDD, 0xB8, 0x4F, 0x90, -0x2B, 0x30, 0x79, 0x78, 0xEE, 0x79, 0xA5, 0x04, 0x81, 0x54, -0x48, 0x21, 0x50, 0x41, 0x48, 0xAC, 0x53, 0x76, 0x37, 0x6F, -0x83, 0x17, 0x50, 0xA8, 0x0E, 0x21, 0xA4, 0x4F, 0x2E, 0x97, -0x43, 0x3E, 0xE8, 0x20, 0xCB, 0x32, 0x8C, 0x4E, 0x31, 0x46, -0xA3, 0xD3, 0x14, 0x21, 0xBC, 0xBD, 0x0E, 0xBA, 0x5B, 0xB7, -0x69, 0xBA, 0x80, 0xEA, 0xE4, 0x0C, 0x81, 0x92, 0xE3, 0xC5, -0x52, 0xF9, 0xA8, 0xC2, 0x23, 0x0B, 0x42, 0x94, 0x92, 0x78, -0x32, 0xA0, 0xBD, 0x71, 0x8B, 0x62, 0xFD, 0x2D, 0xC6, 0xFD, -0x2D, 0xB6, 0xBB, 0x73, 0xB4, 0x9A, 0x96, 0x4E, 0xDC, 0xAB, -0x18, 0x4F, 0x62, 0x6D, 0xD6, 0xAB, 0x3E, 0xED, 0x65, 0x60, -0x8D, 0x95, 0x7D, 0x40, 0x7B, 0x67, 0x93, 0x0F, 0xDF, 0x7F, -0x9F, 0x7D, 0xD3, 0x2B, 0x1C, 0x39, 0xFD, 0x35, 0x55, 0x2C, -0x95, 0xA5, 0x1F, 0xFA, 0x78, 0x12, 0x82, 0x30, 0x04, 0x99, -0x23, 0xAF, 0x34, 0x03, 0x7E, 0x97, 0x31, 0x77, 0x8B, 0xC8, -0x8B, 0xB0, 0x6D, 0x9F, 0xAD, 0xED, 0x1D, 0x42, 0x19, 0x41, -0x4E, 0xA1, 0xD3, 0x14, 0xAD, 0x53, 0x8C, 0xD5, 0x64, 0x36, -0x23, 0xEE, 0x34, 0xFB, 0x73, 0xE0, 0xE5, 0x8B, 0x65, 0xA2, -0x42, 0x91, 0x5B, 0xD7, 0xDE, 0xE2, 0xF5, 0x3F, 0x9F, 0xB3, -0xC6, 0xE8, 0x9D, 0x91, 0xD1, 0x22, 0x61, 0x18, 0x92, 0xC6, -0x09, 0x9B, 0xF7, 0xEE, 0xD2, 0x35, 0x3E, 0x69, 0x34, 0xCE, -0x5A, 0xF9, 0x59, 0xBA, 0xC5, 0x29, 0x72, 0xBE, 0xA2, 0x5A, -0x29, 0xF2, 0xF1, 0x86, 0xA3, 0xBD, 0xD1, 0x45, 0x7A, 0x19, -0xC6, 0x18, 0x8C, 0xD6, 0xD8, 0xCC, 0x90, 0xC6, 0xAD, 0x52, -0x1F, 0xB0, 0xBA, 0xBA, 0x1A, 0x6D, 0xD7, 0x77, 0x26, 0x93, -0x8C, 0xD9, 0x9D, 0x7B, 0xEB, 0xD1, 0xDB, 0x97, 0x5F, 0xFB, -0xA4, 0x93, 0xC0, 0xCA, 0xCA, 0xA7, 0x2C, 0xAF, 0x2C, 0xB3, -0xB9, 0xB1, 0x46, 0xE2, 0x95, 0x68, 0x15, 0x8F, 0xD1, 0x2A, -0x9F, 0xA4, 0x5D, 0x3A, 0x45, 0x2A, 0x0A, 0x0C, 0x97, 0x7C, -0xDE, 0x5C, 0x36, 0xBC, 0xFA, 0xDF, 0x6D, 0x8A, 0xA1, 0xEC, -0x65, 0xA0, 0x7B, 0x90, 0x2C, 0xB3, 0xFD, 0x41, 0xF3, 0xE6, -0xE6, 0xE6, 0xD2, 0x6A, 0xB5, 0x1A, 0x00, 0xE3, 0x80, 0xFA, -0xEB, 0xB9, 0xDF, 0xBC, 0xFA, 0xD1, 0xF5, 0x25, 0x3C, 0x3F, -0x20, 0x97, 0xCB, 0x51, 0xAD, 0x54, 0x18, 0x28, 0x15, 0x90, -0xD1, 0x30, 0x71, 0xEE, 0x20, 0xAE, 0x30, 0xC6, 0xEC, 0xB1, -0x45, 0xCA, 0x03, 0x15, 0x02, 0xFF, 0xC1, 0x04, 0x1B, 0xBD, -0xB7, 0xB5, 0x06, 0xE7, 0xFC, 0x3E, 0x60, 0x6C, 0x6C, 0xCC, -0x4E, 0x4C, 0x4C, 0x2C, 0x01, 0x6D, 0xE0, 0xF0, 0xD2, 0x07, -0xEF, 0x5C, 0xBD, 0xF4, 0xC7, 0xDF, 0x5D, 0x19, 0x1A, 0xDD, -0x4F, 0x75, 0x70, 0x84, 0x7C, 0x3E, 0x22, 0x9F, 0xCF, 0x53, -0x2C, 0x84, 0x44, 0x21, 0xF8, 0xD2, 0x30, 0xBD, 0x70, 0x8C, -0xCA, 0xF0, 0x08, 0xD6, 0x68, 0x3C, 0xCF, 0xEB, 0xF9, 0xAF, -0x7B, 0x39, 0x58, 0xA3, 0x01, 0xFA, 0x21, 0x7B, 0xE7, 0xCF, -0x9F, 0xE7, 0xE6, 0xCD, 0x9B, 0xE4, 0x72, 0x39, 0x0D, 0x8C, -0x02, 0xDE, 0xD6, 0x7B, 0xAF, 0xDC, 0xF4, 0xD6, 0xDF, 0xC5, -0x8B, 0x6A, 0x0C, 0xEC, 0x1B, 0x27, 0x97, 0x2F, 0x20, 0x7D, -0x85, 0x27, 0x3D, 0x1C, 0xA0, 0x8D, 0x41, 0x86, 0x79, 0x9C, -0x8C, 0x48, 0xB5, 0xEE, 0xF9, 0x6F, 0x0C, 0xD6, 0x18, 0xAC, -0xD1, 0x64, 0x26, 0xD9, 0xB3, 0x48, 0x29, 0x85, 0x52, 0x4A, -0x6A, 0xAD, 0xE7, 0x41, 0x94, 0x81, 0xDA, 0xF8, 0xFE, 0xA1, -0xD2, 0x33, 0x63, 0x1D, 0x76, 0xFF, 0xF9, 0x6B, 0x3E, 0xFB, -0xE8, 0x3D, 0x12, 0xF2, 0x78, 0x85, 0x01, 0xFC, 0x62, 0x05, -0x55, 0x2C, 0x91, 0x05, 0x05, 0x3A, 0xED, 0x0E, 0xC9, 0xD2, -0x6B, 0x70, 0x7F, 0x19, 0xE3, 0x14, 0x46, 0x1B, 0xD2, 0xB8, -0x8B, 0xD1, 0x09, 0x61, 0xA1, 0xB2, 0xD3, 0xBF, 0xA6, 0xD5, -0x6A, 0x95, 0x34, 0x4D, 0x6D, 0xBD, 0x5E, 0xFF, 0x0F, 0xB8, -0xEF, 0x03, 0x63, 0xB1, 0x51, 0x51, 0x6E, 0x68, 0x8E, 0x03, -0xF1, 0x4B, 0xDC, 0xBA, 0xF4, 0x0A, 0x9B, 0xFB, 0xBF, 0x84, -0xA8, 0x4E, 0xE3, 0x54, 0x1E, 0x61, 0x63, 0xB2, 0xC6, 0x0A, -0xE1, 0xC7, 0x57, 0x98, 0x70, 0x4B, 0x4E, 0x8A, 0xC3, 0x24, -0x26, 0x13, 0x49, 0xB7, 0x45, 0xBB, 0xB1, 0xC5, 0xA1, 0x13, -0x5F, 0xBD, 0x36, 0xF5, 0xE4, 0x37, 0x7E, 0xD0, 0x07, 0x4C, -0x4F, 0x4F, 0xE3, 0x9C, 0x63, 0x66, 0x66, 0x66, 0xF9, 0xC6, -0x8D, 0x1B, 0x17, 0xD7, 0xD6, 0xD6, 0x5E, 0x88, 0xF2, 0xE1, -0x81, 0x9D, 0x56, 0x4A, 0x33, 0xB6, 0x0C, 0x07, 0xDB, 0xA4, -0x77, 0xFE, 0x02, 0x5B, 0x03, 0xC8, 0xA8, 0x42, 0xA1, 0x50, -0x5E, 0x3E, 0x7E, 0xFC, 0xF8, 0xEB, 0xE7, 0x6E, 0x96, 0x97, -0x7E, 0xF5, 0xB7, 0x65, 0xB9, 0x70, 0xAA, 0xFB, 0xDC, 0x17, -0xB3, 0xEE, 0x62, 0xF3, 0xFE, 0x26, 0xD3, 0x4F, 0x9D, 0xB9, -0x32, 0x77, 0xEA, 0xEC, 0x57, 0xC0, 0x25, 0x7D, 0xC0, 0xFC, -0xFC, 0x3C, 0x42, 0x08, 0x86, 0x87, 0x87, 0x09, 0xC3, 0xF0, -0xCA, 0xDA, 0xDA, 0xDA, 0xDD, 0x8B, 0xFF, 0x78, 0xBB, 0xF1, -0x85, 0xDF, 0xFF, 0xE2, 0xF9, 0x93, 0xB3, 0xC3, 0xC7, 0xF4, -0xFE, 0xC9, 0x6B, 0xD5, 0xE1, 0x03, 0xFF, 0xB6, 0x26, 0xBE, -0x3A, 0x39, 0xF7, 0xF4, 0x1B, 0x59, 0x96, 0x7D, 0x32, 0xF8, -0xC4, 0x38, 0x8D, 0x97, 0x37, 0x01, 0xCA, 0x8D, 0xDD, 0xFA, -0x77, 0x92, 0x56, 0x95, 0xE9, 0xC5, 0x6F, 0x5D, 0x98, 0x5A, -0x3C, 0x7B, 0xA6, 0xDB, 0xB8, 0x97, 0x21, 0x0D, 0x7B, 0x0F, -0x4E, 0xA7, 0xD3, 0x7B, 0x87, 0xA5, 0xA4, 0x5E, 0xAF, 0x33, -0x35, 0x35, 0xB5, 0xD4, 0x4E, 0xBC, 0x5F, 0xFE, 0xFD, 0xF2, -0x8D, 0x17, 0x7F, 0xF4, 0xD3, 0xF3, 0x95, 0x4E, 0xDB, 0xDE, -0xD3, 0xBA, 0xC3, 0xED, 0x1B, 0x6F, 0x82, 0x8C, 0x30, 0x69, -0x93, 0xE6, 0xEA, 0x12, 0xF3, 0x47, 0x0E, 0xF3, 0xB9, 0xC5, -0xCF, 0x37, 0xA6, 0xA6, 0x0E, 0x9C, 0x1F, 0x59, 0x38, 0x7B, -0x7D, 0x24, 0x3F, 0xF9, 0xC3, 0xA4, 0xDB, 0xCC, 0x74, 0xDA, -0x25, 0xC8, 0xEF, 0x7D, 0x24, 0xFE, 0x37, 0x00, 0x7B, 0x59, -0x0C, 0x33, 0xED, 0xB3, 0xBB, 0x03, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xEC, 0xEC, 0xEC, 0x33, 0xE5, 0xE4, 0xE4, 0x7D, 0x04, 0x04, -0x04, 0x73, 0x51, 0x4E, 0x4F, 0xDD, 0xFE, 0xFE, 0xFE, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x2D, 0x2E, 0x2E, 0x00, 0x21, 0x22, 0x22, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x14, 0x14, 0x13, 0x33, -0x2C, 0x2D, 0x2D, 0x6D, 0x17, 0x17, 0x17, 0x38, 0x04, 0x05, -0x05, 0xF7, 0xF5, 0xF4, 0xF5, 0xAA, 0x1B, 0x1C, 0x1B, 0x87, -0x18, 0x18, 0x18, 0x00, 0xFC, 0xFC, 0xFC, 0x00, 0x04, 0xF4, -0xF3, 0xF3, 0x03, 0x1D, 0x1D, 0x1D, 0x47, 0xD0, 0xD0, 0xD1, -0x42, 0x17, 0x18, 0x17, 0x42, 0xEC, 0xEB, 0xEC, 0xCC, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0xFA, 0xFA, 0xF9, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x1A, 0x1A, 0x1A, 0x54, 0x38, 0x39, 0x39, 0xA5, 0x06, -0x06, 0x07, 0x06, 0xF1, 0xF1, 0xF1, 0xFA, 0xD7, 0xD6, 0xD6, -0xA4, 0x0F, 0x0F, 0x0F, 0xA6, 0xD3, 0xD2, 0xD1, 0x00, 0x09, -0x09, 0x09, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0xFF, 0xFF, -0xFF, 0x00, 0xD4, 0xD3, 0xD4, 0x6B, 0x0A, 0x0A, 0x09, 0x8F, -0xD6, 0xD4, 0xD5, 0xBB, 0xDC, 0xDC, 0xDB, 0x50, 0x00, 0x00, -0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xEC, 0xEC, 0xEC, 0x00, 0xEC, 0xEC, 0xED, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, -0x70, 0x71, 0x71, 0xDA, 0xF0, 0xEF, 0xF0, 0x21, 0xF3, 0xF3, -0xF3, 0x00, 0xD1, 0xD1, 0xD1, 0xA6, 0xF8, 0xF7, 0xF7, 0x5B, -0xFE, 0xFD, 0xFD, 0x22, 0x10, 0x11, 0x11, 0x52, 0x0B, 0x0C, -0x0B, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, -0x00, 0x29, 0x2A, 0x29, 0x95, 0xD0, 0xCE, 0xCF, 0xC7, 0xFB, -0xFA, 0xFA, 0xB0, 0x21, 0x21, 0x21, 0xA1, 0xF8, 0xF8, 0xF8, -0x5E, 0x01, 0x01, 0x01, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x0C, -0x0C, 0x0D, 0x00, 0xF3, 0xF4, 0xF4, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x0A, 0x0B, 0x24, 0x24, -0x25, 0x25, 0x20, 0xF3, 0xF2, 0xF3, 0x00, 0xD2, 0xD2, 0xD1, -0x00, 0x14, 0x14, 0x14, 0x4A, 0x0A, 0x0B, 0x0A, 0xA0, 0x06, -0x06, 0x06, 0x54, 0xEF, 0xEE, 0xEF, 0xAF, 0xF6, 0xF6, 0xF5, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x03, 0x03, 0x03, 0x00, 0x24, 0x25, 0x25, 0xCE, 0x99, 0x96, -0x97, 0x45, 0xFE, 0xFE, 0xFE, 0x3D, 0x08, 0x07, 0x08, 0xA2, -0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x0D, 0x0C, 0x0D, 0x00, 0x01, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x22, 0x03, 0x03, -0x03, 0x01, 0x0C, 0x0D, 0x0C, 0x00, 0x0B, 0x0B, 0x0B, 0x00, -0x25, 0x26, 0x25, 0x10, 0x0D, 0x0D, 0x0D, 0x5F, 0x00, 0xFF, -0x00, 0x03, 0xFB, 0xFB, 0xFB, 0x8F, 0xFF, 0xFF, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, -0xD9, 0x98, 0x94, 0x96, 0x43, 0xFE, 0xFF, 0xFE, 0x3D, 0x08, -0x08, 0x08, 0xA3, 0xFF, 0xFF, 0xFF, 0x04, 0x01, 0x01, 0x00, -0x00, 0x15, 0x15, 0x14, 0x00, 0xF2, 0xF3, 0xF3, 0x00, 0xF2, -0xF3, 0xF3, 0x00, 0x0A, 0x0A, 0x0A, 0x2C, 0xD8, 0xD7, 0xD7, -0x00, 0x8B, 0x89, 0x8A, 0x00, 0xB0, 0xB0, 0xB1, 0x00, 0x12, -0x12, 0x12, 0x00, 0x09, 0x09, 0x0A, 0xF6, 0xFA, 0xFA, 0xF9, -0x5A, 0xFA, 0xFA, 0xFA, 0xCE, 0xFF, 0xFF, 0x00, 0x00, 0xC4, -0xE8, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFD, 0xFD, 0xFD, 0xDA, 0x98, 0x94, 0x96, 0x43, 0xFD, 0xFD, -0xFE, 0x3C, 0x09, 0x08, 0x09, 0xA2, 0x00, 0x00, 0x00, 0x05, -0x0C, 0x0F, 0x11, 0x00, 0xD5, 0xFE, 0x21, 0x00, 0xD8, 0xF7, -0x16, 0x0D, 0x12, 0x13, 0x14, 0x6A, 0xE5, 0xE5, 0xE6, 0x00, -0x17, 0x18, 0x18, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFA, 0xFA, -0xFA, 0x00, 0x17, 0x17, 0x16, 0x05, 0x0F, 0x10, 0x11, 0xD7, -0x24, 0x25, 0x25, 0x00, 0x10, 0x1A, 0x21, 0x00, 0xD1, 0xEF, -0x0B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFD, 0xFD, 0xFD, 0xDA, 0x99, 0x95, 0x96, -0x44, 0xFC, 0xFC, 0xFC, 0x3C, 0x08, 0x08, 0x09, 0xA1, 0x02, -0x04, 0x06, 0x05, 0xEE, 0x03, 0x1B, 0x0D, 0xDB, 0xF7, 0x33, -0xB4, 0x92, 0xC3, 0x12, 0x1F, 0xDC, 0xE3, 0xF3, 0x00, 0x10, -0x10, 0x0F, 0xFE, 0x25, 0x26, 0x25, 0xB6, 0xD1, 0xD0, 0xD0, -0x69, 0xE0, 0xE0, 0xE0, 0x58, 0x01, 0x02, 0x01, 0xF5, 0x02, -0x03, 0x02, 0x00, 0xE8, 0xE5, 0xE2, 0x00, 0xEB, 0xC6, 0xAA, -0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFD, 0xFD, 0xD9, -0x99, 0x97, 0x98, 0x45, 0x66, 0x69, 0x68, 0xBB, 0x09, 0x07, -0x09, 0xA3, 0x35, 0xFF, 0xF4, 0x19, 0x35, 0xF7, 0xB8, 0x3E, -0x9F, 0x05, 0x65, 0x00, 0x8B, 0xB8, 0xF9, 0xEF, 0x34, 0x01, -0xAB, 0x59, 0xEE, 0xEC, 0xE9, 0xB9, 0x3D, 0x3D, 0x3D, 0x00, -0x0B, 0x0C, 0x0C, 0x00, 0x09, 0x09, 0x09, 0x00, 0x02, 0x03, -0x03, 0x00, 0xEB, 0xE3, 0xDD, 0x00, 0xF6, 0xD3, 0xB4, 0x00, -0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x02, 0x00, 0xFB, 0x13, 0x23, 0x00, 0xFB, 0x13, 0x23, -0x00, 0xFB, 0x13, 0x23, 0x00, 0xFB, 0x13, 0x24, 0x00, 0xF7, -0x0F, 0x20, 0xD9, 0x8F, 0xA9, 0xC5, 0x50, 0x15, 0xF6, 0xF9, -0x53, 0x8C, 0x23, 0xEA, 0x3E, 0x19, 0xDB, 0xBF, 0x00, 0x73, -0xD9, 0x8D, 0xFE, 0xF4, 0xF8, 0xF2, 0x6E, 0xD5, 0xFA, 0x22, -0xB9, 0x04, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x07, 0x08, 0x07, 0x00, 0x18, 0x19, 0x19, 0x00, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF4, -0xF8, 0x00, 0x48, 0x7D, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFA, 0xFA, -0x00, 0x0F, 0x23, 0xF1, 0xF7, 0xB6, 0x7A, 0x03, 0xCC, 0x3A, -0x10, 0xFF, 0xFC, 0x00, 0xFD, 0x01, 0x01, 0x00, 0xE9, 0xEB, -0xEA, 0xFB, 0xFE, 0xDD, 0xDD, 0x44, 0x13, 0xF3, 0xF3, 0xC2, -0xF5, 0xF0, 0xF1, 0x00, 0xF2, 0x1A, 0x1A, 0x00, 0x04, 0x37, -0x35, 0x00, 0xF7, 0x4E, 0x4F, 0x00, 0xF4, 0x01, 0x02, 0x00, -0xD9, 0xD8, 0xD9, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFB, 0x00, 0x10, 0x02, 0x02, 0x19, -0xB6, 0xDF, 0xD9, 0xC3, 0x39, 0xC6, 0xE3, 0xB8, 0x00, 0x29, -0x1B, 0x19, 0x00, 0x22, 0x44, 0x44, 0x00, 0x09, 0xE3, 0xE3, -0x05, 0xDC, 0xF5, 0xF6, 0xAF, 0xF9, 0xF5, 0xF6, 0x59, 0x12, -0xFF, 0xFF, 0xBA, 0x0E, 0xE2, 0xE2, 0x00, 0x07, 0xF0, 0xEB, -0x00, 0x14, 0xBB, 0xB8, 0x00, 0xCE, 0x3D, 0x3C, 0x00, 0xEE, -0x1D, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFC, -0x00, 0x0E, 0x18, 0x13, 0x20, 0xB3, 0xDF, 0xD3, 0xE6, 0x39, -0xD6, 0x11, 0x39, 0x00, 0xC6, 0x43, 0x81, 0x00, 0xDE, 0x08, -0x19, 0xF5, 0xC7, 0xA3, 0xA3, 0xFF, 0x06, 0x13, 0x13, 0x00, -0x2B, 0x33, 0x33, 0x12, 0xF2, 0x11, 0x11, 0xB6, 0xDE, 0x0B, -0x0B, 0x98, 0xFC, 0x02, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x33, 0xDE, 0xD6, 0x00, 0xFE, 0xD8, -0xD5, 0x00, 0xE0, 0xDF, 0xDF, 0x00, 0x02, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x0A, 0x18, 0x12, 0x20, -0xB1, 0xD1, 0xCA, 0xE4, 0x3C, 0xF4, 0xFF, 0x0F, 0x00, 0x23, -0x2B, 0x1D, 0x00, 0xD1, 0x11, 0x2D, 0xF7, 0xB3, 0xFD, 0x20, -0x42, 0x01, 0xF4, 0xF4, 0x8D, 0xD9, 0xCA, 0xCA, 0xFF, 0x08, -0x1C, 0x1C, 0x00, 0x29, 0x35, 0x35, 0x03, 0xFE, 0x09, 0x09, -0x67, 0xD9, 0x0E, 0x0E, 0xCF, 0xEE, 0x02, 0x04, 0x39, 0x00, -0x00, 0x00, 0x00, 0x09, 0xFE, 0xFD, 0x00, 0x62, 0xED, 0xE2, -0x00, 0xE3, 0x20, 0x57, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFD, -0x00, 0x07, 0x01, 0x02, 0x19, 0xAA, 0xD4, 0xD1, 0xEB, 0x40, -0xE8, 0xF0, 0x05, 0x00, 0x1A, 0x26, 0x1E, 0x00, 0x07, 0x04, -0xFE, 0xFF, 0xEC, 0xE7, 0xDB, 0x70, 0xEC, 0x17, 0x16, 0xCA, -0x11, 0xF3, 0xF3, 0x78, 0xF3, 0xF4, 0xF4, 0xC0, 0xCE, 0xB4, -0xB4, 0x00, 0x09, 0x20, 0x20, 0x00, 0x2E, 0x3D, 0x3D, 0x00, -0x0A, 0x07, 0x07, 0x20, 0xDD, 0x02, 0x04, 0xBB, 0xEC, 0x01, -0x03, 0x43, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFE, 0xFE, 0x00, -0xF4, 0xFF, 0x0A, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x02, 0xF5, 0xF7, 0x12, -0x9D, 0xE4, 0xE1, 0xF8, 0x4B, 0xE3, 0xE4, 0xFA, 0x00, 0x13, -0x22, 0x1D, 0x00, 0x18, 0x16, 0x08, 0x00, 0xE1, 0xDB, 0xD6, -0x9B, 0x08, 0x0A, 0xF5, 0x9A, 0x09, 0xF6, 0xEE, 0x00, 0xF3, -0xFF, 0xFF, 0xFD, 0x02, 0xF1, 0xF1, 0x67, 0xF5, 0xFB, 0xFB, -0xF5, 0xCC, 0xAB, 0xAB, 0x00, 0x0A, 0x24, 0x24, 0x00, 0x2E, -0x3F, 0x3F, 0x00, 0x0C, 0x05, 0x06, 0x0B, 0xDE, 0x01, 0x04, -0xAE, 0xEE, 0xF9, 0xFE, 0x32, 0x05, 0xFC, 0xFB, 0x00, 0x64, -0xC9, 0x91, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFC, -0xFE, 0x00, 0x7F, 0xA1, 0xD5, 0x87, 0xF7, 0xFA, 0x0B, 0x5B, -0xE7, 0xDF, 0xF0, 0x00, 0x0D, 0x1F, 0x1E, 0x00, 0x23, 0x21, -0x10, 0x00, 0xDB, 0xD3, 0xD7, 0xC3, 0x09, 0x08, 0xF0, 0x6E, -0xFF, 0xFD, 0xFD, 0x00, 0x07, 0xF6, 0xF2, 0x00, 0xF3, 0x00, -0x00, 0x00, 0xFD, 0xFC, 0xFC, 0xDB, 0xF5, 0xF3, 0xF3, 0x78, -0xFC, 0xFD, 0xFD, 0x00, 0xC9, 0xA2, 0xA2, 0x00, 0x0B, 0x25, -0x25, 0x00, 0x2F, 0x3E, 0x3E, 0x00, 0x0B, 0x05, 0x05, 0x0E, -0xD9, 0xF2, 0xFB, 0xAF, 0xF8, 0xF7, 0xFE, 0x17, 0x51, 0xF1, -0xDE, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x89, 0xA9, 0xD7, -0x66, 0xC3, 0xE1, 0x04, 0x74, 0x02, 0xFA, 0xFF, 0x00, 0x0B, -0x1C, 0x1D, 0x00, 0x27, 0x26, 0x13, 0x00, 0xDB, 0xD5, 0xDA, -0xE3, 0x04, 0x03, 0xE6, 0x57, 0xFE, 0xFD, 0xF8, 0xF9, 0xFA, -0xE2, 0xC9, 0x00, 0xCB, 0xDF, 0xBD, 0x00, 0xA7, 0x0C, 0x0C, -0x00, 0xDE, 0x02, 0x02, 0x00, 0xF0, 0xF4, 0xF3, 0x95, 0xDA, -0xF2, 0xF1, 0x9A, 0x00, 0xFF, 0xFF, 0x00, 0xC8, 0x9F, 0x9F, -0x00, 0x09, 0x1E, 0x1E, 0x00, 0x2E, 0x3B, 0x3B, 0x00, 0x03, -0x03, 0x04, 0x1E, 0xDD, 0xF8, 0x00, 0xA3, 0xFF, 0xFA, 0xFF, -0x02, 0x01, 0xD2, 0xDC, 0xEC, 0x15, 0x4F, 0x84, 0xD4, 0xDF, -0x21, 0x0F, 0x05, 0xAD, 0xDE, 0xF5, 0x03, 0x32, 0x16, 0x13, -0x0A, 0x2C, 0xE3, 0xDE, 0xE4, 0xF5, 0xFA, 0xF4, 0xD6, 0x41, -0xFD, 0xEF, 0xD3, 0xCB, 0xFE, 0xDF, 0xC0, 0x00, 0x06, 0xFD, -0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x03, 0xFF, 0xFF, 0x00, 0x24, 0xF9, 0xF8, 0x00, 0x29, 0xF7, -0xF6, 0x03, 0x27, 0x0B, 0x0D, 0x8C, 0x1C, 0x10, 0x10, 0x6F, -0x03, 0x01, 0x01, 0x01, 0x33, 0x50, 0x50, 0x00, 0xF9, 0xE5, -0xE5, 0x00, 0xDB, 0xD1, 0xD1, 0xFF, 0x21, 0xFF, 0xFF, 0x46, -0x02, 0xF1, 0xF1, 0xF5, 0x0A, 0xF3, 0xEA, 0xED, 0x08, 0x2C, -0x34, 0x1F, 0xE5, 0x32, 0x3B, 0x1F, 0xEF, 0xE0, 0xDC, 0xE7, -0xFB, 0xF0, 0xD8, 0xB2, 0x60, 0xF1, 0xC8, 0x92, 0xCB, 0xF0, -0xC8, 0xA1, 0x00, 0xFD, 0xF4, 0xEC, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, -0x01, 0x01, 0x00, 0xD9, 0x08, 0x09, 0x00, 0xA3, 0x01, 0x03, -0xFD, 0xAA, 0xF3, 0xF3, 0x71, 0xC8, 0xED, 0xED, 0x6B, 0xF4, -0xF9, 0xF9, 0xF8, 0xCA, 0xAF, 0xAF, 0x00, 0x08, 0x18, 0x18, -0x00, 0x31, 0x51, 0x51, 0xE9, 0xDA, 0xEE, 0xEE, 0xCA, 0x03, -0x1D, 0x18, 0x10, 0xF5, 0xCE, 0xC9, 0xC6, 0x0A, 0xD7, 0xE5, -0x04, 0x6D, 0xE5, 0xD4, 0xD9, 0x11, 0xF8, 0xD2, 0x99, 0x8B, -0x05, 0xEB, 0xBB, 0xCA, 0x07, 0x00, 0xFA, 0x1E, 0x09, 0x09, -0x09, 0x1F, 0x07, 0x07, 0x07, 0x1F, 0x02, 0x02, 0x02, 0x1E, -0x01, 0x01, 0x01, 0x1E, 0x01, 0x01, 0x01, 0x1E, 0x01, 0x01, -0x01, 0x1E, 0x02, 0x02, 0x02, 0x1E, 0x03, 0x05, 0x05, 0x1D, -0xEE, 0x08, 0x08, 0x1A, 0xD2, 0x04, 0x04, 0xE4, 0xE3, 0xFF, -0xFF, 0xCE, 0x1D, 0xFD, 0xFD, 0x35, 0xFB, 0xF9, 0xF9, 0xE9, -0x81, 0xD4, 0xD4, 0x69, 0x89, 0xE5, 0xE5, 0xD9, 0x01, 0x95, -0x95, 0x95, 0x03, 0xCF, 0xCE, 0xCE, 0x10, 0xE5, 0xE7, 0xEB, -0x0B, 0xF0, 0xF0, 0xED, 0x05, 0x04, 0x03, 0x02, 0x03, 0x00, -0x00, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0x04, 0xFF, 0xFF, 0xFF, -0x03, 0xE7, 0xE7, 0xE7, 0x01, 0xEE, 0xEE, 0xEE, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x00, 0x00, 0xFD, 0x01, 0x01, 0x01, 0xFC, 0x01, 0x01, 0x01, -0xFD, 0x02, 0xFD, 0xFD, 0xFE, 0xFD, 0xFF, 0xFF, 0xF8, 0xFF, -0x02, 0x02, 0xF7, 0xF3, 0xF3, 0xF3, 0xF1, 0x06, 0x4A, 0xD6, -0xAB, 0xAA, 0xF4, 0xEA, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF8, 0xF8, 0x00, -0xA5, 0xA6, 0xA6, 0x02, 0x12, 0x12, 0x12, 0x49, 0x0B, 0x0B, -0x0C, 0x3F, 0xFB, 0xFB, 0xFA, 0xEC, 0x0A, 0x09, 0x0A, 0xA4, -0x22, 0x23, 0x23, 0xE6, 0x01, 0x01, 0x01, 0x00, 0x08, 0x08, -0xFE, 0x00, 0xFE, 0xFE, 0x03, 0x00, 0xFC, 0xFD, 0x01, 0x00, -0x02, 0x00, 0x01, 0x00, 0xF5, 0xF6, 0xF6, 0x01, 0xDD, 0xDD, -0xDC, 0x59, 0x09, 0x09, 0x09, 0x2F, 0x00, 0x00, 0x00, 0xE6, -0xED, 0xED, 0xEE, 0xA4, 0x2C, 0x2B, 0x2B, 0xED, 0x26, 0x26, -0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0xEB, 0xEB, 0xEB, 0x08, 0x8D, -0x8E, 0x8F, 0xA9, 0x5F, 0x5E, 0x5E, 0x4D, 0x1F, 0x1F, 0x1F, -0x01, 0xF8, 0xF8, 0xF8, 0x00, 0xEC, 0xED, 0xED, 0xE5, 0xF9, -0xF9, 0xF9, 0xC2, 0xFF, 0xFF, 0x00, 0xE0, 0x09, 0x09, 0xFE, -0xF2, 0xFF, 0xFF, 0x04, 0xFE, 0xFE, 0xFE, 0x03, 0x09, 0x03, -0x02, 0x02, 0x1A, 0x05, 0x06, 0x05, 0x31, 0x09, 0x09, 0x0A, -0x34, 0x02, 0x01, 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xBF, -0xBF, 0xBF, 0xE7, 0x12, 0x12, 0x12, 0x4E, 0x45, 0x45, 0x44, -0xCC, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0x00, -0x00, 0x00, 0x00, 0x00, 0xD0, 0xD0, 0xD0, 0x41, 0x0E, 0x0E, -0x0F, 0xBE, 0xDD, 0xDD, 0xDD, 0x00, 0xEE, 0xEE, 0xEE, 0x00, -0x0B, 0x0B, 0x0B, 0x00, 0x34, 0x34, 0x34, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0x03, 0x03, 0x03, 0x00, 0x0C, 0x0C, 0x0C, 0x00, -0x02, 0x03, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0xF9, -0xF9, 0x00, 0xFC, 0xFD, 0xFD, 0x00, 0xED, 0xEC, 0xED, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0x03, 0x03, 0x03, 0x00, 0x15, 0x16, -0x16, 0x00, 0xD0, 0xD0, 0xD0, 0xA0, 0x44, 0x43, 0x42, 0x61, -0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x10, 0x10, 0x11, 0x76, 0xD1, 0xD2, 0xD2, -0x00, 0xD4, 0xD4, 0xD4, 0x00, 0xF6, 0xF5, 0xF5, 0x00, 0x10, -0x10, 0x11, 0x00, 0xEF, 0xEF, 0xF0, 0x00, 0x45, 0x46, 0x44, -0x00, 0x0F, 0x0F, 0x0E, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFB, 0xF4, 0xF5, 0x00, 0x02, 0x02, 0x02, 0x00, 0xF8, -0xF8, 0xF8, 0x00, 0xFC, 0xFD, 0xFD, 0x00, 0xFB, 0xFB, 0xFC, -0x00, 0x27, 0x26, 0x26, 0x52, 0xF5, 0xF5, 0xF5, 0x7A, 0x0B, -0x0B, 0x0B, 0xE7, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xF6, -0xF6, 0x33, 0xFD, 0xFE, 0xFE, 0x46, 0xE5, 0xE4, 0xE4, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0xF9, 0xFA, 0xFB, 0x00, 0xE8, 0xE8, -0xE8, 0x00, 0xC9, 0xC9, 0xC8, 0x00, 0xCC, 0xCC, 0xCE, 0x00, -0xFD, 0xFE, 0xFE, 0x00, 0xED, 0xED, 0xEE, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0xE7, 0xE8, 0xE8, 0x00, 0x06, 0x06, 0x06, 0x00, -0xB6, 0xB7, 0xB7, 0x00, 0xC2, 0xC3, 0xC3, 0x00, 0x26, 0x27, -0x27, 0x00, 0xE1, 0xE1, 0xE1, 0x00, 0xDE, 0xDF, 0xDE, 0x00, -0xF9, 0xF9, 0xF9, 0x0E, 0xFA, 0xFA, 0xFB, 0x6B, 0x00, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x5B, 0xFE, 0xFE, 0xFE, 0x02, 0x06, 0x07, 0x08, 0x00, 0xE6, -0xE5, 0xE7, 0x00, 0x01, 0x01, 0x01, 0x00, 0xED, 0xED, 0xED, -0x00, 0xFA, 0xFA, 0xFB, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xE9, -0xE9, 0xEA, 0x00, 0xEA, 0xEB, 0xEA, 0x00, 0xFE, 0xFE, 0xFE, -0x00, 0xE8, 0xE7, 0xE8, 0x00, 0xF2, 0xF3, 0xF4, 0x00, 0x39, -0x39, 0x39, 0x00, 0x28, 0x28, 0x28, 0x00, 0xC3, 0xC3, 0xC3, -0x00, 0x1E, 0x1E, 0x1E, 0x00, 0x24, 0x23, 0x23, 0x00, 0xF6, -0xF6, 0xF6, 0x00, 0xFB, 0xFC, 0xFC, 0x5B, 0xFE, 0xFE, 0xFE, -0x02, 0x02, 0xFF, 0xFF, 0xFF, 0x00, 0xFB, 0xFB, 0xFB, 0x4A, -0xF6, 0xF5, 0xF6, 0x00, 0x21, 0x21, 0x21, 0x00, 0x2F, 0x30, -0x2F, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1D, 0x1E, 0x1E, 0x00, -0x30, 0x32, 0x32, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xDE, 0xDF, -0xDF, 0x00, 0xE9, 0xE9, 0xEA, 0x00, 0xA0, 0xA0, 0xA2, 0x00, -0x04, 0x05, 0x05, 0x00, 0xD1, 0xD2, 0xD2, 0x00, 0xE0, 0xE0, -0xE0, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0xBF, 0xBF, 0xBE, 0x00, -0x04, 0x03, 0x03, 0x00, 0x16, 0x17, 0x17, 0x00, 0x07, 0x08, -0x08, 0x00, 0xF8, 0xF8, 0xF8, 0x1F, 0xFC, 0xFC, 0xFC, 0x2C, -0x04, 0xFC, 0xFC, 0xFC, 0x16, 0xF6, 0xF6, 0xF7, 0x23, 0x03, -0x04, 0x03, 0x00, 0x29, 0x29, 0x27, 0x00, 0x14, 0x14, 0x14, -0x00, 0xDD, 0x1B, 0x1B, 0x00, 0xEC, 0xEC, 0xEC, 0x00, 0xF8, -0xF7, 0xF7, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0xE6, 0xE6, 0xE6, -0x00, 0xFD, 0xF5, 0xF5, 0x00, 0xEC, 0xC8, 0xC8, 0x00, 0x02, -0x03, 0x03, 0x00, 0x06, 0x06, 0x06, 0x00, 0xF4, 0xF5, 0xF4, -0x00, 0xEF, 0xEF, 0xF0, 0x00, 0x3B, 0x3C, 0x3D, 0x00, 0x11, -0x13, 0x13, 0x00, 0x04, 0x04, 0x04, 0x00, 0x09, 0x09, 0x09, -0x00, 0xFD, 0xFC, 0xFC, 0x01, 0xFA, 0xFB, 0xFB, 0x38, 0x04, -0xFA, 0xFA, 0xFB, 0x27, 0xF4, 0xF5, 0xF4, 0x03, 0x07, 0x07, -0x07, 0x00, 0x08, 0x08, 0x09, 0x00, 0x17, 0x17, 0x16, 0x00, -0xE2, 0xE2, 0xE2, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0xE4, 0xE3, -0xE3, 0x00, 0xEE, 0xEE, 0xEE, 0x00, 0xFD, 0xFD, 0xFC, 0x00, -0x16, 0x17, 0x17, 0x00, 0x07, 0x18, 0x18, 0x00, 0xD7, 0xB7, -0xB6, 0x00, 0xF8, 0xF8, 0xF8, 0x00, 0x07, 0x06, 0x07, 0x00, -0x10, 0x10, 0x10, 0x00, 0xF6, 0xF6, 0xF6, 0x00, 0x00, 0xFF, -0x00, 0x00, 0x30, 0x30, 0x2F, 0x00, 0x05, 0x05, 0x05, 0x00, -0xFE, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0x2D, 0x04, 0xF7, -0xF8, 0xF7, 0x1D, 0xF8, 0xF7, 0xF8, 0x01, 0x0D, 0x0D, 0x0C, -0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xDF, 0xDF, 0xE0, 0x00, 0xD6, -0xD7, 0xD7, 0x00, 0xD9, 0xD9, 0xD9, 0x00, 0xD4, 0xD3, 0xD2, -0x00, 0xF4, 0xF4, 0xF4, 0x00, 0xF6, 0xF6, 0xF6, 0x00, 0x1B, -0x1B, 0x1C, 0x00, 0x06, 0x07, 0x06, 0x00, 0xE8, 0xE7, 0xE8, -0x00, 0xFB, 0xFB, 0xFA, 0x00, 0x01, 0x01, 0x01, 0x00, 0x27, -0x27, 0x28, 0x00, 0xF0, 0xF2, 0xF1, 0x00, 0x05, 0x05, 0x05, -0x00, 0x0F, 0x0F, 0x0E, 0x00, 0x21, 0x21, 0x21, 0x00, 0xFE, -0xFE, 0xFE, 0x00, 0xFA, 0xFA, 0xFB, 0x24, 0x04, 0xF9, 0xF8, -0xF9, 0x0B, 0xF9, 0xFA, 0xF9, 0x00, 0x0B, 0xFF, 0x0B, 0x00, -0xF2, 0xF2, 0xF3, 0x00, 0xDE, 0xDF, 0xDE, 0x00, 0xDA, 0xDA, -0xDA, 0x00, 0xEA, 0xEA, 0xEA, 0xF0, 0x0C, 0x0C, 0x0D, 0x04, -0xFB, 0xFB, 0xFD, 0x0C, 0x03, 0x03, 0x05, 0xF2, 0xEE, 0xEE, -0xEE, 0xCA, 0x00, 0x01, 0x00, 0xFA, 0x02, 0x03, 0x03, 0x2E, -0x08, 0x03, 0x0A, 0x1A, 0x09, 0x09, 0x08, 0xFE, 0xF0, 0xF1, -0xF1, 0xEC, 0xF7, 0xF7, 0xF7, 0x17, 0x06, 0x05, 0x06, 0x01, -0x15, 0x14, 0x14, 0x00, 0x11, 0x11, 0x11, 0x00, 0x07, 0x06, -0x06, 0x00, 0x03, 0x03, 0x03, 0x0F, 0x04, 0xF9, 0xF9, 0xF9, -0xFE, 0xF9, 0xF8, 0xF9, 0x00, 0xF7, 0xF7, 0xF7, 0x00, 0xF7, -0xF7, 0xF7, 0x00, 0xE0, 0xE0, 0xE1, 0x00, 0xE7, 0xE7, 0xE6, -0xD7, 0xF8, 0xF9, 0xF9, 0x3B, 0x03, 0x04, 0x05, 0xFD, 0xFF, -0x00, 0xFF, 0x1A, 0x0E, 0x10, 0x0E, 0xE4, 0xEB, 0xE9, 0xEB, -0xF4, 0x02, 0x02, 0x01, 0x00, 0x07, 0x0A, 0x07, 0x03, 0xF7, -0xF6, 0xF6, 0x19, 0xF6, 0xF8, 0xF7, 0xFD, 0xFF, 0x01, 0x00, -0xEB, 0xFB, 0xFA, 0xFA, 0x8E, 0xE2, 0xE2, 0xE1, 0x6D, 0xDD, -0xDD, 0x1A, 0x00, 0x20, 0x20, 0x20, 0x00, 0x11, 0x10, 0x10, -0x00, 0x00, 0x01, 0x01, 0xFB, 0x04, 0xFE, 0xFE, 0xFE, 0xE7, -0xF0, 0xF1, 0xF0, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0xED, 0xED, -0xEE, 0x00, 0xE0, 0xE0, 0xDF, 0xFF, 0xF2, 0xF2, 0xF3, 0x78, -0x27, 0x26, 0x24, 0xEF, 0x0C, 0x0B, 0x0B, 0x00, 0xF1, 0xF1, -0xF1, 0xF2, 0x16, 0x16, 0x16, 0x00, 0xFA, 0xF9, 0xF9, 0x00, -0x02, 0x02, 0x03, 0x00, 0x0E, 0x0F, 0x0E, 0xFD, 0xE3, 0xE2, -0xE2, 0xE4, 0x01, 0x01, 0x02, 0x00, 0x03, 0x04, 0x03, 0x00, -0xD2, 0xD2, 0xD2, 0x7D, 0xF0, 0xF0, 0xF0, 0x57, 0xE4, 0xE4, -0xE4, 0x16, 0xE3, 0xE4, 0xE3, 0x00, 0xF9, 0xF9, 0xF8, 0x00, -0xFF, 0x00, 0xFF, 0xE2, 0x04, 0x09, 0x0A, 0x09, 0xCE, 0xDF, -0xDF, 0xE0, 0xFB, 0x07, 0x07, 0x06, 0x05, 0xEA, 0xEA, 0xEB, -0x00, 0xE9, 0xE9, 0xE9, 0xC3, 0x3C, 0x3A, 0x39, 0xB6, 0x0D, -0x0D, 0x0C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x1A, 0x1A, -0x00, 0x0B, 0x0B, 0x0B, 0x00, 0xF9, 0xF9, 0xF9, 0xFF, 0x01, -0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x01, 0x08, 0x07, 0x07, -0x00, 0x02, 0x02, 0x02, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0x1F, -0x1E, 0x1E, 0xF4, 0xC8, 0xC9, 0xCA, 0x87, 0xE8, 0xE8, 0xE7, -0x8E, 0xDA, 0xD9, 0xDA, 0x01, 0xEC, 0xEB, 0xEC, 0x00, 0x0F, -0x0F, 0x0E, 0xC4, 0x01, 0x54, 0x54, 0x54, 0x02, 0x0B, 0x0C, -0x0D, 0xA0, 0x02, 0x02, 0x03, 0x5D, 0xF5, 0xF5, 0xF5, 0xFB, -0x10, 0x10, 0x0E, 0x8A, 0x11, 0x10, 0x10, 0xF6, 0xFE, 0xFE, -0xFE, 0x12, 0xFE, 0xFE, 0xFE, 0x0B, 0x00, 0x00, 0x00, 0x03, -0x02, 0x02, 0x02, 0xFE, 0x02, 0x02, 0x02, 0xFF, 0x01, 0x01, -0x01, 0x00, 0xFE, 0xFE, 0xFE, 0x02, 0xFE, 0xFE, 0xFE, 0x02, -0x00, 0x00, 0x00, 0xFF, 0x02, 0x02, 0x02, 0xF8, 0x02, 0x02, -0x02, 0xEF, 0xFD, 0xFD, 0xFD, 0xED, 0xC4, 0xC5, 0xC5, 0x72, -0x0E, 0x0E, 0x0F, 0x1F, 0x04, 0x04, 0x05, 0xE3, 0x37, 0x36, -0x34, 0x2E, 0x01, 0x2B, 0x2B, 0x2B, 0x07, 0x05, 0x05, 0x05, -0x29, 0x29, 0x2A, 0x2B, 0x73, 0x0D, 0x0D, 0x0D, 0xFC, 0xED, -0xEC, 0xEC, 0xF1, 0xCA, 0xCA, 0xC9, 0xEB, 0xFB, 0xFB, 0xFB, -0x05, 0xFB, 0xFB, 0xFB, 0xFA, 0xFC, 0xFC, 0xFC, 0xF7, 0xFD, -0xFD, 0xFD, 0xF8, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, -0x00, 0x01, 0x01, 0x01, 0x02, 0x03, 0x03, 0x03, 0x07, 0x06, -0x06, 0x06, 0x0A, 0x05, 0x05, 0x05, 0x09, 0x04, 0x04, 0x04, -0xFD, 0x10, 0x10, 0x11, 0x09, 0x20, 0x20, 0x20, 0x0E, 0x00, -0x01, 0x01, 0x11, 0xF8, 0xF8, 0xF8, 0xA5, 0x02, 0x01, 0x00, -0xB7, 0x04, 0x57, 0x57, 0x57, 0xFA, 0xF0, 0xF1, 0xF2, 0xEA, -0x22, 0x22, 0x22, 0x8A, 0x07, 0x07, 0x07, 0x03, 0xD7, 0xD8, -0xD8, 0x01, 0xDC, 0xDD, 0xDE, 0xF5, 0xD3, 0xD2, 0xD0, 0xEC, -0xFE, 0xFE, 0xFE, 0xFB, 0x01, 0x02, 0x02, 0xF9, 0x02, 0x02, -0x02, 0xFC, 0xFD, 0xFC, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x02, 0x02, 0x01, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFE, -0xFE, 0x06, 0x00, 0x00, 0x00, 0x06, 0x0A, 0x0B, 0x0B, 0x0C, -0x0C, 0x0E, 0x0F, 0x15, 0x14, 0x15, 0x15, 0xFE, 0x2E, 0x2E, -0x2E, 0xFD, 0x11, 0x11, 0x11, 0xF7, 0xF9, 0xF9, 0xF8, 0xFD, -0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xE6, 0xE6, 0xE6, 0x02, 0x00, -0x00, 0x01, 0x00, 0x08, 0x09, 0x08, 0x01, 0xED, 0xED, 0xED, -0x00, 0xE0, 0xE0, 0xE0, 0x00, 0xED, 0xED, 0xED, 0xFD, 0xFA, -0xF9, 0xFA, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0x03, 0x03, 0x03, -0x00, 0xF9, 0xF8, 0xF8, 0x00, 0xFC, 0xFD, 0xFC, 0x00, 0x09, -0x09, 0x09, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0x01, 0x01, 0x01, 0x00, 0x05, 0x05, 0x05, 0x02, 0x11, -0x11, 0x12, 0x01, 0x21, 0x20, 0x20, 0x00, 0x12, 0x12, 0x12, -0x00, 0x04, 0x04, 0x03, 0xFF, 0x12, 0x12, 0x12, 0xFE, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xF8, 0xB8, -0x51, 0x77, 0x52, 0xB9, 0x73, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xE9, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x84, 0x95, 0x5B, 0x6C, 0x14, 0x55, 0x1C, -0xC6, 0x7F, 0x73, 0xEB, 0x5E, 0x60, 0x7B, 0x59, 0xD1, 0x96, -0x76, 0xEB, 0x52, 0x6D, 0x4B, 0x01, 0x2F, 0xD0, 0x1A, 0x90, -0x20, 0x88, 0x88, 0x85, 0x80, 0x12, 0x34, 0x51, 0xAB, 0x68, -0x4C, 0xBC, 0x80, 0x1A, 0x4B, 0xA2, 0x89, 0xF1, 0x85, 0x48, -0xF4, 0x45, 0x13, 0x43, 0x34, 0x0A, 0xC1, 0x40, 0x20, 0x10, -0x13, 0xC1, 0x5B, 0x22, 0x89, 0x52, 0x6B, 0x78, 0x40, 0x11, -0x6F, 0x11, 0x1A, 0xA9, 0x88, 0x4A, 0xD1, 0x81, 0xD2, 0xCB, -0xB6, 0xDD, 0x69, 0xBB, 0xDB, 0xED, 0x4C, 0x77, 0x66, 0xE7, -0xEF, 0xC3, 0x62, 0x61, 0x63, 0xA3, 0x27, 0x99, 0x87, 0x73, -0xF9, 0x7E, 0xF3, 0x9D, 0xEF, 0xE4, 0xFC, 0x8F, 0x22, 0x22, -0x4C, 0xD5, 0x4C, 0xD3, 0x54, 0x93, 0xA3, 0xE9, 0xF2, 0x47, -0x36, 0xB5, 0xC6, 0x7F, 0xEB, 0x3A, 0x3F, 0x5B, 0x8F, 0x94, -0x5E, 0xA3, 0xA0, 0xAA, 0xAE, 0x9D, 0x1A, 0x99, 0x73, 0x7D, -0xFC, 0xEC, 0x7B, 0x3B, 0xDF, 0x36, 0xAF, 0x2A, 0x0E, 0x77, -0xCF, 0x9A, 0x35, 0xCB, 0x9D, 0x4A, 0xAF, 0x4C, 0x05, 0x3E, -0x71, 0xB2, 0x23, 0xBA, 0xEC, 0xE1, 0x4D, 0x2D, 0x57, 0x37, -0xAD, 0xBA, 0xB7, 0x71, 0xF9, 0xDD, 0x75, 0x0D, 0x73, 0x6F, -0x2C, 0x2F, 0x89, 0x84, 0x03, 0x9A, 0x02, 0x63, 0x99, 0xAC, -0xD7, 0xD5, 0xF5, 0xBB, 0xD5, 0xF1, 0xED, 0x11, 0xB3, 0xF7, -0xC7, 0xC3, 0xED, 0xF7, 0x2F, 0x9A, 0xB3, 0x6F, 0xD7, 0x8E, -0xB7, 0xFF, 0xFA, 0x3F, 0xB0, 0x56, 0xBB, 0xF0, 0xF6, 0x3B, -0xFC, 0xC6, 0xF5, 0xAF, 0x2E, 0xDD, 0xF0, 0x7C, 0xE3, 0xEC, -0x59, 0x14, 0x05, 0x14, 0x94, 0xCB, 0xAB, 0x99, 0xEC, 0x88, -0x0F, 0x66, 0x02, 0xAF, 0xED, 0xC0, 0x3E, 0xD3, 0xFF, 0xEE, -0xE0, 0xEB, 0x7F, 0x7E, 0xFB, 0xC5, 0x01, 0x60, 0x7C, 0x2A, -0xB0, 0xB6, 0x60, 0xC5, 0xDA, 0x35, 0xE9, 0x25, 0x9B, 0xB6, -0x2D, 0x5A, 0xBF, 0xAE, 0x2E, 0xE8, 0x81, 0xE2, 0x81, 0xAA, -0x41, 0x4E, 0x01, 0xAD, 0x08, 0x34, 0xC0, 0xCD, 0x81, 0x9A, -0xBD, 0x34, 0x0E, 0xB8, 0x3A, 0xFC, 0xFC, 0x75, 0x87, 0xA5, -0x1E, 0x7D, 0xEB, 0xB5, 0x13, 0x87, 0xF6, 0xEF, 0x04, 0x32, -0xF9, 0x3F, 0x8B, 0x20, 0x22, 0xD4, 0x34, 0x2D, 0x59, 0x5A, -0xF9, 0xE2, 0xC1, 0x33, 0xAB, 0xBF, 0x14, 0x7F, 0xD5, 0x21, -0x91, 0xBD, 0x3F, 0x8B, 0xB8, 0x22, 0xE2, 0x8B, 0xC8, 0x89, -0x11, 0x91, 0x87, 0xDA, 0x44, 0xEE, 0x39, 0x2C, 0xF2, 0xEA, -0x71, 0x91, 0x71, 0x11, 0xC9, 0x89, 0xC8, 0x45, 0x5F, 0xE4, -0x89, 0x76, 0x91, 0x35, 0xED, 0xE2, 0xD7, 0xBE, 0xFE, 0xBD, -0x15, 0x5F, 0xB2, 0xFA, 0x19, 0x11, 0x51, 0x44, 0x04, 0xF5, -0x52, 0xA6, 0x91, 0xD1, 0xFA, 0x95, 0x5B, 0x67, 0x34, 0x3E, -0xD8, 0x30, 0xD8, 0x83, 0x32, 0xD0, 0x6B, 0xB3, 0xB0, 0x1A, -0xF4, 0xFC, 0xEE, 0x69, 0x2C, 0x81, 0xDC, 0xB8, 0x4B, 0x62, -0x00, 0xE6, 0x46, 0x21, 0x04, 0xA8, 0x40, 0x95, 0x02, 0x11, -0xCF, 0x26, 0xD1, 0x8B, 0x52, 0x52, 0xBD, 0xA8, 0xCC, 0x9A, -0x7B, 0xDF, 0x4B, 0x1B, 0x5B, 0x37, 0xCF, 0xE1, 0xD2, 0xBC, -0xF2, 0xCE, 0x07, 0x9F, 0xAD, 0x53, 0x9A, 0x5A, 0x16, 0x27, -0xCE, 0x27, 0xE8, 0xB9, 0xD8, 0x43, 0x5F, 0x22, 0x81, 0x93, -0x2D, 0x3C, 0x8C, 0xE1, 0xA4, 0xC5, 0x40, 0x62, 0x88, 0x71, -0xBB, 0x70, 0x62, 0x68, 0x78, 0x84, 0xBE, 0xDE, 0x7E, 0xFA, -0xBB, 0x13, 0x84, 0xEA, 0x9B, 0x63, 0x07, 0x7E, 0xFC, 0xEB, -0x29, 0xD3, 0x34, 0x43, 0xFA, 0xC9, 0x8E, 0x53, 0xD1, 0xFD, -0x27, 0xFB, 0xEF, 0xA7, 0xC9, 0x0F, 0x91, 0x3C, 0x07, 0xBA, -0x0E, 0x78, 0x4C, 0x64, 0x63, 0xE4, 0x3D, 0x83, 0x00, 0x43, -0xC9, 0x24, 0x89, 0x21, 0xC1, 0xB6, 0x0D, 0xA0, 0x68, 0x12, -0x3C, 0x62, 0x59, 0xF4, 0x76, 0x3B, 0x40, 0x0E, 0x0C, 0x5D, -0x23, 0xB6, 0xB8, 0x79, 0xDB, 0xF6, 0x5D, 0x7B, 0xF5, 0x71, -0x8C, 0x18, 0x55, 0x37, 0x34, 0x70, 0xF6, 0x94, 0x82, 0xE3, -0x42, 0x51, 0x08, 0x14, 0x05, 0xD7, 0xCD, 0x4E, 0x82, 0x3D, -0x20, 0x3D, 0x98, 0xC4, 0x1E, 0xF2, 0xB0, 0x9D, 0x28, 0x50, -0x32, 0x09, 0xCE, 0x24, 0x2D, 0x18, 0x18, 0x06, 0x71, 0x21, -0xE7, 0x42, 0x64, 0x66, 0x7C, 0xFB, 0x8E, 0x17, 0x6F, 0xD4, -0x97, 0x2E, 0x6F, 0x8E, 0x73, 0xDF, 0xD6, 0x0A, 0xFA, 0x3A, -0xF3, 0xC9, 0x68, 0xD3, 0x40, 0x35, 0x90, 0xAC, 0x0D, 0x84, -0x21, 0xEF, 0x05, 0xCF, 0x1A, 0x84, 0xC1, 0x71, 0x3C, 0xA7, -0xBA, 0x20, 0x0A, 0x49, 0x25, 0x60, 0xA8, 0x1B, 0xC8, 0x82, -0x6B, 0x83, 0x5A, 0x36, 0x8D, 0x68, 0xF5, 0x4D, 0x3A, 0x81, -0x48, 0x29, 0x13, 0x99, 0x20, 0x19, 0x0B, 0xF4, 0x30, 0x18, -0x92, 0x77, 0xEA, 0xE7, 0x2E, 0x8B, 0x01, 0xDC, 0x71, 0xF0, -0x6D, 0x44, 0xBC, 0x42, 0xB0, 0x6B, 0xC3, 0x44, 0x06, 0x70, -0x20, 0x6B, 0xC3, 0x44, 0x10, 0x42, 0xC5, 0x51, 0x1D, 0x45, -0x57, 0x18, 0xBD, 0x00, 0xE6, 0x57, 0x10, 0x8C, 0x42, 0xA4, -0x0A, 0x02, 0x25, 0xF9, 0x6D, 0x5D, 0x01, 0x16, 0xD7, 0x06, -0x67, 0xAC, 0x60, 0x1C, 0x20, 0x37, 0x31, 0x06, 0xF6, 0x20, -0x78, 0x19, 0xB0, 0x2D, 0x08, 0x66, 0x00, 0x14, 0x9D, 0x9C, -0x9B, 0x22, 0x54, 0x9C, 0x45, 0x33, 0x02, 0x38, 0x29, 0xC8, -0x09, 0x04, 0xAC, 0xBC, 0xC3, 0x7F, 0xC0, 0x02, 0x92, 0xEE, -0x87, 0xD4, 0x30, 0x64, 0x33, 0x85, 0x8E, 0xC7, 0x7A, 0x20, -0xF9, 0x07, 0xB8, 0x69, 0x70, 0x52, 0x30, 0x23, 0x0C, 0x8E, -0x9D, 0x56, 0x8F, 0x7D, 0xD5, 0x76, 0x81, 0x40, 0x68, 0x80, -0x68, 0x0C, 0x82, 0xC5, 0xF9, 0xCF, 0x08, 0x83, 0xA2, 0x4D, -0x8A, 0xFD, 0x1C, 0xF8, 0xFE, 0x04, 0xB8, 0x4E, 0x41, 0x44, -0xF9, 0xAB, 0xED, 0x83, 0x28, 0xA0, 0x18, 0x10, 0x2A, 0x86, -0xD2, 0x0A, 0x87, 0x54, 0xE2, 0x57, 0x35, 0x8C, 0x7B, 0x91, -0x94, 0xD5, 0x45, 0x75, 0x83, 0x50, 0x14, 0xC9, 0x43, 0x8D, -0xE9, 0x88, 0xA6, 0x15, 0x46, 0xA1, 0x85, 0xA0, 0x28, 0x02, -0xAA, 0x51, 0x08, 0xD6, 0x02, 0x50, 0x34, 0x1D, 0x02, 0xD3, -0xA1, 0xAC, 0x02, 0x02, 0x81, 0xDE, 0xE7, 0x5A, 0x9F, 0xEA, -0x54, 0x1B, 0xE7, 0xD5, 0x0D, 0x3C, 0xBE, 0xB8, 0xEE, 0x53, -0x1A, 0x1A, 0xB3, 0xCC, 0xA8, 0xCA, 0x2F, 0x28, 0x9A, 0x86, -0x88, 0x5A, 0x78, 0x78, 0x7A, 0x18, 0x82, 0x11, 0x7C, 0x55, -0x2F, 0x00, 0xFB, 0x6A, 0x10, 0x02, 0xD3, 0x20, 0x54, 0x02, -0x75, 0x0B, 0xFC, 0x88, 0x93, 0x38, 0xF6, 0xC2, 0xC6, 0xC7, -0x7E, 0x53, 0x01, 0x79, 0xF6, 0xEE, 0x25, 0x9F, 0x84, 0xB3, -0xD6, 0x69, 0xE6, 0xDD, 0x0A, 0xE1, 0x62, 0xD0, 0x43, 0xE4, -0xFC, 0xCB, 0x62, 0xCF, 0x15, 0x3C, 0x35, 0x08, 0x46, 0x04, -0xD7, 0x57, 0x0A, 0xC0, 0x59, 0x5F, 0xCB, 0x3B, 0xAE, 0xAE, -0x83, 0x92, 0xD2, 0xE1, 0x0D, 0x37, 0xCF, 0xDC, 0x53, 0x13, -0xAF, 0x1E, 0x9D, 0xAC, 0x6E, 0x75, 0x2B, 0x37, 0xAC, 0x3F, -0x37, 0xFB, 0x9E, 0xED, 0x32, 0x98, 0xAE, 0xC4, 0xBC, 0xA0, -0x2C, 0xBB, 0xAD, 0x9E, 0x96, 0x3B, 0xE7, 0x21, 0x8A, 0xC1, -0xF1, 0xDF, 0x2D, 0xDE, 0xFF, 0x61, 0x04, 0x7C, 0x95, 0xDA, -0x58, 0x90, 0xD6, 0x95, 0x55, 0x18, 0xE2, 0x71, 0xF6, 0x7C, -0x0F, 0x6F, 0x7E, 0xFC, 0x53, 0xFE, 0x52, 0x5D, 0x5B, 0xE9, -0xC4, 0x7B, 0x8E, 0xBE, 0x69, 0x7E, 0xBE, 0xEB, 0x65, 0xC0, -0xBB, 0xB2, 0x6C, 0x06, 0x6E, 0x79, 0x60, 0xF3, 0xC3, 0x27, -0x63, 0x77, 0xBD, 0x26, 0xB6, 0x56, 0xCE, 0x39, 0x13, 0x6C, -0x05, 0xCA, 0x2A, 0xA1, 0x62, 0x26, 0xE1, 0xB2, 0x62, 0x74, -0x4D, 0x63, 0xDC, 0x76, 0xF0, 0xFA, 0x12, 0x90, 0xEC, 0x07, -0x77, 0x14, 0x2A, 0xCA, 0xA0, 0x3C, 0xE2, 0xD0, 0xBE, 0x63, -0x97, 0x79, 0x64, 0xDF, 0x2B, 0xF1, 0x58, 0x85, 0x35, 0x55, -0xA1, 0x0F, 0xD4, 0xAC, 0x7C, 0xB4, 0xE5, 0x7C, 0xFD, 0xDA, -0x2D, 0x72, 0x4D, 0x7D, 0x0D, 0xA3, 0xBE, 0xA6, 0x85, 0xA6, -0x53, 0x51, 0x1A, 0xA5, 0x38, 0x12, 0x41, 0xD7, 0x74, 0x6C, -0xC7, 0x66, 0x68, 0x78, 0x98, 0x91, 0xF4, 0x18, 0xE8, 0xB6, -0x8F, 0xDD, 0x3B, 0x62, 0x1C, 0xDB, 0xB7, 0xFB, 0xD1, 0xA6, -0xF2, 0x37, 0xF6, 0xEC, 0xDE, 0x99, 0xFC, 0xAF, 0xA7, 0x49, -0x79, 0xFA, 0x85, 0x2D, 0x75, 0x1F, 0x9E, 0x49, 0x6F, 0x4C, -0xD7, 0xAF, 0x68, 0x2E, 0xA9, 0x9D, 0x1F, 0xAF, 0x8C, 0xC5, -0x23, 0xD1, 0x32, 0x14, 0x43, 0x87, 0x54, 0x1A, 0x7A, 0xBB, -0x07, 0x9C, 0x21, 0xF3, 0x97, 0x3E, 0xE7, 0xD8, 0x47, 0xDF, -0xCF, 0x15, 0x73, 0xF7, 0xE9, 0x6F, 0xDA, 0xBE, 0x01, 0xDC, -0xFF, 0x7D, 0xF3, 0x00, 0xCC, 0xEE, 0x9E, 0xD0, 0xB6, 0x77, -0xF7, 0x5F, 0xB7, 0x7D, 0xF7, 0x81, 0x79, 0xC4, 0x6E, 0x5A, -0xA0, 0x45, 0xAB, 0xCA, 0x31, 0x74, 0x23, 0x67, 0xF5, 0x25, -0xB9, 0xD8, 0x79, 0xBA, 0xF5, 0xC9, 0x96, 0xCE, 0xC7, 0xD6, -0xAF, 0xFA, 0xA3, 0x71, 0xFE, 0x0D, 0x96, 0xA2, 0x28, 0xFF, -0xD2, 0xFF, 0x3D, 0x00, 0xEA, 0xE2, 0x4F, 0x77, 0xBB, 0xE4, -0x24, 0x44, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x05, 0x53, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x8C, 0x55, 0x6B, 0x6C, 0x54, 0x45, 0x14, -0xFE, 0x66, 0xEE, 0xBD, 0x7B, 0xF7, 0x3E, 0xB6, 0xED, 0x76, -0xB7, 0x6C, 0x5B, 0xE8, 0xF6, 0x15, 0xA4, 0x48, 0x01, 0x51, -0x14, 0x10, 0x1F, 0x80, 0xBC, 0x54, 0xF8, 0xA1, 0x12, 0xFE, -0x80, 0x89, 0x31, 0x12, 0xF1, 0xD5, 0x84, 0x04, 0xC1, 0x00, -0x46, 0x81, 0x98, 0x40, 0x8C, 0x04, 0xC5, 0x18, 0x13, 0x9E, -0x01, 0x7F, 0x18, 0xB0, 0x50, 0xE4, 0x25, 0x12, 0xC0, 0x02, -0x01, 0xDB, 0x5A, 0x01, 0x49, 0x29, 0x50, 0x5A, 0x5A, 0x68, -0xB7, 0xB5, 0xBB, 0x65, 0xB7, 0xFB, 0xE8, 0x6E, 0x77, 0xEF, -0xCC, 0xF8, 0x63, 0x2B, 0x94, 0x58, 0x88, 0x27, 0x99, 0x73, -0x32, 0x99, 0x73, 0xBE, 0x73, 0xE6, 0xE4, 0x3C, 0x88, 0x10, -0x02, 0x0F, 0xA3, 0xE6, 0xAE, 0x16, 0xAD, 0xB1, 0xBB, 0xA1, -0xE4, 0x72, 0x47, 0xFD, 0x63, 0x3B, 0xAB, 0x77, 0x7A, 0x55, -0xBB, 0xEA, 0x66, 0x16, 0x4B, 0x14, 0x3A, 0x0B, 0x6F, 0x2F, -0x9F, 0xF7, 0x71, 0x8B, 0x6C, 0x69, 0x37, 0xA6, 0x8F, 0x99, -0xE6, 0x1F, 0xCA, 0x96, 0x3C, 0x0C, 0x78, 0xED, 0x81, 0x75, -0x13, 0xBB, 0x69, 0xD3, 0xBB, 0x99, 0x59, 0xDA, 0x94, 0x29, -0x05, 0x93, 0x4A, 0x87, 0x39, 0xF2, 0xEC, 0x9A, 0xA2, 0x83, -0x71, 0x0B, 0x81, 0x98, 0x9F, 0x5D, 0x0B, 0x34, 0x76, 0xD7, -0xDD, 0xBC, 0x58, 0x9F, 0xC1, 0x46, 0xEC, 0x5D, 0x31, 0x73, -0xD5, 0x4F, 0x5E, 0x77, 0x41, 0xFC, 0x91, 0xC0, 0x7B, 0x2F, -0xEC, 0x73, 0x7F, 0x59, 0xBD, 0xEE, 0xFD, 0x45, 0xAF, 0xCC, -0xFE, 0x70, 0x6E, 0xD9, 0x3C, 0x97, 0xAE, 0x64, 0x51, 0x4E, -0x38, 0x18, 0x04, 0x08, 0x48, 0xDA, 0x08, 0x04, 0x54, 0x50, -0x30, 0xD6, 0x2F, 0x2E, 0x75, 0xD7, 0x26, 0x77, 0x9F, 0x3C, -0x70, 0x32, 0x3B, 0x5E, 0xBC, 0x72, 0xD3, 0xA2, 0xAF, 0xAE, -0x66, 0x19, 0x59, 0xFC, 0x3F, 0xC0, 0x07, 0x6A, 0x7E, 0x36, -0xB7, 0xD4, 0xAD, 0xFF, 0x7A, 0xE9, 0x82, 0x05, 0x8B, 0x47, -0x79, 0xC6, 0xDB, 0x2C, 0x22, 0xC0, 0x31, 0xD8, 0x31, 0x79, -0x80, 0x13, 0x00, 0x0A, 0x64, 0xF4, 0xC4, 0x3B, 0xF9, 0xF7, -0x47, 0x76, 0x5E, 0x36, 0x83, 0x25, 0x1F, 0x6C, 0x5F, 0xB2, -0xED, 0xC2, 0x03, 0xC0, 0xB5, 0x37, 0xEB, 0xF4, 0x8A, 0xAA, -0xB7, 0x3F, 0xAD, 0x78, 0xEB, 0x8D, 0x65, 0xC3, 0xDC, 0x5E, -0x35, 0x09, 0x0B, 0x42, 0x00, 0x48, 0x51, 0x50, 0x21, 0x83, -0x29, 0x29, 0x10, 0x7A, 0xDF, 0x01, 0xB9, 0xC7, 0x05, 0x28, -0x28, 0x52, 0xC9, 0x98, 0xD8, 0x73, 0xAC, 0xF2, 0x6A, 0x51, -0x64, 0xEA, 0x9C, 0x8D, 0x8B, 0xBF, 0xE8, 0x90, 0xEF, 0x45, -0xDB, 0x50, 0xF9, 0xD2, 0xAB, 0xF3, 0x27, 0x2C, 0xA1, 0xD9, -0x8A, 0x7A, 0x87, 0xB7, 0x01, 0x20, 0xB0, 0xC2, 0x02, 0x79, -0x77, 0xCB, 0x90, 0x6F, 0x2F, 0x45, 0x93, 0xED, 0x0F, 0x44, -0x9D, 0xFE, 0x7F, 0xC3, 0xBD, 0x0F, 0x3E, 0x70, 0x97, 0x14, -0x4A, 0xE6, 0xCE, 0x9E, 0x52, 0xF6, 0xCB, 0xFE, 0xCB, 0xAB, -0xAE, 0x75, 0x5C, 0x5F, 0x21, 0x03, 0x40, 0x20, 0x12, 0x90, -0x5B, 0x78, 0xED, 0xB2, 0xE9, 0x79, 0xE5, 0xAE, 0x5B, 0x3D, -0x77, 0xD2, 0x66, 0x84, 0x40, 0x04, 0x65, 0x94, 0x24, 0x33, -0x90, 0xAB, 0x17, 0x21, 0x07, 0xF9, 0x38, 0xDB, 0x75, 0x10, -0xED, 0x6A, 0x13, 0x18, 0xB5, 0x06, 0xC0, 0x07, 0xA7, 0x49, -0x40, 0xA1, 0xB2, 0xE4, 0x2C, 0x65, 0xAF, 0xD5, 0x77, 0xD6, -0xEE, 0x23, 0x42, 0x08, 0xBC, 0xB7, 0xAB, 0xE2, 0x59, 0xE7, -0xE4, 0xD6, 0x5F, 0x2D, 0xC8, 0x46, 0x2C, 0x9E, 0x04, 0xA5, -0x14, 0x94, 0x4A, 0x50, 0xFA, 0x34, 0xCC, 0xB4, 0x2F, 0xC4, -0xF8, 0x9C, 0xC9, 0x90, 0x15, 0x09, 0x8A, 0x2A, 0xE3, 0x62, -0xE4, 0x1C, 0x4E, 0xF6, 0x56, 0x22, 0x41, 0xFB, 0x20, 0x84, -0x18, 0x38, 0xFC, 0x9E, 0xD4, 0x6C, 0x14, 0xFB, 0x2B, 0xEB, -0xB7, 0xC8, 0x29, 0x2B, 0x05, 0x77, 0xBE, 0x32, 0x23, 0x8E, -0xB8, 0xDA, 0xDA, 0x16, 0x84, 0xE0, 0x80, 0x24, 0x49, 0xA0, -0x54, 0x82, 0x9E, 0xCA, 0x80, 0x35, 0x2C, 0x1D, 0x9D, 0x10, -0x02, 0x54, 0x48, 0x98, 0xEC, 0x9A, 0x09, 0x3B, 0x31, 0x51, -0xD9, 0xBA, 0x15, 0xFE, 0x94, 0x0F, 0x9C, 0x33, 0x70, 0x21, -0xD2, 0x92, 0x73, 0x18, 0x86, 0x82, 0x11, 0xC5, 0xE6, 0x5C, -0xF9, 0xC8, 0xA5, 0xE3, 0xEA, 0xA9, 0xB6, 0xC3, 0xA3, 0x8B, -0x4C, 0x55, 0xEA, 0xF4, 0x05, 0x40, 0xA9, 0x0C, 0x49, 0x96, -0x21, 0x51, 0x09, 0x0E, 0xC1, 0x61, 0x65, 0xB3, 0x41, 0x9F, -0x15, 0x80, 0x00, 0x26, 0xE5, 0xBE, 0x88, 0x7C, 0xCD, 0x8B, -0x1D, 0x57, 0x36, 0xA1, 0x26, 0xF0, 0x1B, 0x18, 0x4F, 0x81, -0x31, 0x0E, 0xCE, 0x19, 0x6C, 0x2A, 0x45, 0x96, 0x53, 0x2F, -0x95, 0x25, 0x89, 0xDA, 0xED, 0xAA, 0x64, 0xFA, 0xAE, 0x06, -0x49, 0xC8, 0x1F, 0x85, 0x3D, 0x5B, 0x85, 0xA2, 0xC8, 0xA0, -0x84, 0xC2, 0x4E, 0x4C, 0x0C, 0xD5, 0x40, 0x42, 0x08, 0x14, -0x3A, 0x4B, 0xF1, 0xCE, 0xD8, 0xE5, 0xE8, 0xEB, 0x8B, 0xA1, -0xA6, 0xAB, 0x1A, 0x29, 0x9E, 0x04, 0x17, 0x0C, 0x49, 0x0E, -0x64, 0x3A, 0x55, 0x2A, 0x83, 0x70, 0x41, 0x89, 0x10, 0x9D, -0xE7, 0x13, 0xB8, 0x79, 0x3A, 0x02, 0xBB, 0x37, 0x02, 0xDD, -0x2B, 0x43, 0xF3, 0xC8, 0x20, 0x39, 0x3A, 0xD8, 0x48, 0x3E, -0x64, 0x67, 0x32, 0xC6, 0xD1, 0xEE, 0x6B, 0x47, 0xF3, 0xAD, -0x16, 0xF4, 0xDC, 0x0D, 0xA2, 0x3F, 0x92, 0x42, 0x7F, 0x8F, -0x05, 0x11, 0x21, 0x70, 0xCC, 0x32, 0x20, 0x0B, 0xC1, 0xE3, -0x96, 0xC5, 0xC2, 0x19, 0x5E, 0x55, 0x48, 0x3A, 0x88, 0x15, -0x01, 0xA2, 0xAD, 0x16, 0xFA, 0xFC, 0x16, 0xD4, 0xE1, 0x31, -0xA4, 0x9E, 0xB4, 0x06, 0x95, 0x58, 0x9A, 0x2C, 0x8B, 0xE1, -0x44, 0xED, 0x51, 0x6C, 0x3C, 0xF2, 0x19, 0xAE, 0xF9, 0xAE, -0xC0, 0x0A, 0x0B, 0xB0, 0x5E, 0xC0, 0x0A, 0x03, 0x86, 0xA9, -0x02, 0x9C, 0x30, 0xF9, 0xE5, 0xB1, 0x73, 0x53, 0x8D, 0x91, -0xEA, 0x2B, 0x35, 0xC6, 0x31, 0xAB, 0x29, 0xBF, 0x4B, 0x49, -0x31, 0x06, 0xAA, 0x01, 0x44, 0x03, 0x88, 0x0C, 0x0C, 0xCE, -0x04, 0x25, 0x14, 0xB1, 0x44, 0x0C, 0xDB, 0x8E, 0x7F, 0x8B, -0x6D, 0xE7, 0xBE, 0x41, 0x28, 0x1A, 0x04, 0x4F, 0x0D, 0x3C, -0xDA, 0x00, 0xAA, 0x03, 0xAE, 0x32, 0x3B, 0xB8, 0x22, 0xAE, -0x53, 0x45, 0xB6, 0xA1, 0xC7, 0x1F, 0x3F, 0xE9, 0xCC, 0xD5, -0xFB, 0x5D, 0x65, 0x3A, 0xA8, 0x0E, 0x50, 0x13, 0x90, 0x4C, -0x40, 0x32, 0x08, 0xA8, 0x9C, 0x2E, 0x57, 0x49, 0x92, 0xD0, -0x19, 0xF0, 0x61, 0xC3, 0xA1, 0x35, 0xF8, 0xEE, 0xE2, 0x06, -0x84, 0x95, 0x20, 0xA8, 0x31, 0xA0, 0xEB, 0x00, 0x24, 0x03, -0x50, 0x32, 0x08, 0xF2, 0xC6, 0x3A, 0xD0, 0x1B, 0x49, 0x1C, -0xA5, 0x00, 0xB0, 0x72, 0xCE, 0xBA, 0xCB, 0x56, 0x98, 0x56, -0x3F, 0x3E, 0xCD, 0x03, 0xD5, 0x2D, 0x81, 0xE8, 0x00, 0x35, -0x06, 0x80, 0xA5, 0x74, 0x1F, 0xDF, 0x68, 0xBF, 0x86, 0x8A, -0x83, 0x8B, 0x50, 0x79, 0x6B, 0x07, 0xB8, 0xBD, 0x1F, 0xCA, -0x00, 0x20, 0x35, 0x01, 0x62, 0xA4, 0xF5, 0x5D, 0xA3, 0x34, -0xE4, 0x14, 0x99, 0xB7, 0x57, 0xCF, 0xD8, 0x58, 0x25, 0x03, -0x80, 0xCB, 0x74, 0xB3, 0x72, 0x7D, 0xDA, 0xE6, 0x66, 0xCF, -0xA9, 0xA7, 0x8A, 0x9E, 0x71, 0xE6, 0xB6, 0x36, 0x04, 0x00, -0x0D, 0xE8, 0x57, 0x62, 0xA8, 0xF3, 0x9D, 0x41, 0x67, 0xA8, -0x1D, 0x55, 0x2D, 0x7B, 0xD0, 0x16, 0x6F, 0x02, 0x14, 0x01, -0x89, 0x51, 0x70, 0xCE, 0xD3, 0xB3, 0x83, 0x02, 0x0C, 0x80, -0x91, 0x21, 0xA3, 0xFC, 0xF9, 0x3C, 0xCB, 0x43, 0x8A, 0x7F, -0x2C, 0xCF, 0x79, 0xBA, 0xFE, 0xDE, 0xAC, 0x98, 0x35, 0x72, -0xC1, 0xD9, 0xDF, 0x4F, 0x1F, 0xDA, 0x3C, 0x71, 0xAA, 0x77, -0x8D, 0xB0, 0x31, 0xD3, 0x77, 0x27, 0x84, 0x28, 0x0F, 0xA1, -0xAA, 0xE5, 0x07, 0x64, 0x3A, 0x32, 0x21, 0x3B, 0x24, 0x8C, -0x70, 0x17, 0x40, 0x08, 0x81, 0xBE, 0xBE, 0x3E, 0x84, 0xC3, -0x61, 0x24, 0x12, 0x09, 0x50, 0x22, 0xA0, 0x39, 0x14, 0x8C, -0x19, 0x97, 0xCF, 0x75, 0x22, 0xD5, 0x15, 0xD0, 0x71, 0x1B, -0x4B, 0x87, 0x8D, 0x4A, 0x3C, 0x30, 0x36, 0x4F, 0x34, 0x54, -0x29, 0xBB, 0x1B, 0x57, 0x7F, 0xEE, 0x2E, 0xD7, 0x2A, 0x1A, -0x5B, 0xBB, 0xCC, 0xD6, 0xC6, 0x1E, 0xD8, 0x64, 0x1D, 0xC3, -0xF3, 0x87, 0xC3, 0x99, 0x9D, 0x0D, 0xC3, 0x30, 0x20, 0x04, -0x47, 0x6F, 0x38, 0x0C, 0x7F, 0x77, 0x37, 0xFC, 0x81, 0xBF, -0xA1, 0x9A, 0x04, 0x65, 0xA3, 0x3D, 0x4C, 0x8E, 0x8A, 0x33, -0x45, 0xFD, 0x2F, 0x7C, 0xB4, 0x6E, 0xFE, 0xF6, 0x86, 0x21, -0x07, 0xFD, 0x95, 0x8E, 0x1A, 0xF3, 0x62, 0xCF, 0xE1, 0x37, -0x1B, 0xE8, 0xF1, 0xD5, 0x51, 0x09, 0xB9, 0xFD, 0x11, 0x55, -0xD2, 0x55, 0x37, 0xB2, 0x32, 0xB3, 0xE1, 0x70, 0x98, 0x60, -0x8C, 0xA3, 0x37, 0x1C, 0x42, 0x38, 0x7C, 0x17, 0x49, 0x04, -0x85, 0x6E, 0x4B, 0x24, 0xEC, 0xC1, 0xCC, 0xFD, 0x8B, 0x4A, -0xD7, 0xAF, 0x2E, 0x74, 0x8E, 0xB9, 0x9D, 0xA9, 0x39, 0xC5, -0x23, 0x57, 0xD3, 0xAE, 0xF3, 0x6B, 0x8B, 0x7B, 0xA4, 0xBF, -0x96, 0xC6, 0x8C, 0xAE, 0xE7, 0xF2, 0x3C, 0x25, 0x65, 0x59, -0x5A, 0x6E, 0xA6, 0x43, 0x71, 0x49, 0x16, 0x4F, 0xE2, 0x6E, -0xDC, 0x17, 0xED, 0x0E, 0xB5, 0xB5, 0x87, 0xBA, 0x42, 0x7F, -0x7A, 0xAC, 0x09, 0xBB, 0x17, 0x3E, 0xF1, 0xC9, 0x29, 0x4F, -0x86, 0x37, 0xF5, 0xBF, 0x76, 0x1E, 0x00, 0xF8, 0x42, 0xCD, -0x72, 0x47, 0xEF, 0xD5, 0x11, 0x2D, 0xBD, 0x35, 0x25, 0xA7, -0x9A, 0xB6, 0x7A, 0x34, 0xD5, 0xE6, 0xE2, 0x8C, 0x27, 0xB2, -0xD4, 0xE2, 0x8E, 0xD7, 0xC7, 0xAD, 0xF2, 0x11, 0xA6, 0x35, -0x8F, 0x2F, 0x98, 0x1E, 0x1D, 0xCA, 0xF6, 0x9F, 0x01, 0x00, -0xB7, 0x74, 0x73, 0x9F, 0x7C, 0x6F, 0x3C, 0xA6, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Refresh3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xD8, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xF7, -0xFA, 0x03, 0xE6, 0xE8, 0xF4, 0x0F, 0xD1, 0xD4, 0xEC, 0x1F, -0x10, 0x0E, 0x0F, 0x25, 0x04, 0x04, 0x03, 0x02, 0xEF, 0xF2, -0xF1, 0xDF, 0x2D, 0x29, 0x12, 0xDE, 0x19, 0x17, 0x0C, 0xEF, -0x0B, 0x09, 0x05, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, -0xF2, 0xF8, 0x07, 0xBA, 0xC3, 0xE0, 0x42, 0xC1, 0xC9, 0xE1, -0x62, 0x0F, 0x0A, 0x12, 0x3F, 0x2D, 0x26, 0x22, 0x14, 0x04, -0x05, 0x0F, 0x01, 0x08, 0x07, 0x03, 0x00, 0x03, 0xF3, 0x0A, -0x00, 0xAC, 0xB2, 0xE0, 0xEF, 0xE6, 0xED, 0xE4, 0xC1, 0x22, -0x1F, 0x0F, 0x9E, 0x5D, 0x51, 0x2D, 0xBB, 0x13, 0x11, 0x0A, -0xF8, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF9, 0xFC, 0x04, 0xD8, -0xDB, 0xFD, 0x33, 0x09, 0x08, 0xFB, 0xD2, 0x01, 0xD8, 0xFE, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB9, 0xC1, 0xDD, 0x1E, 0xB9, 0xC1, -0xE1, 0x8E, 0x16, 0x12, 0x19, 0x4D, 0x2B, 0x25, 0x22, 0x06, -0x09, 0x08, 0x06, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x03, 0x01, 0x00, 0xF7, 0xF8, 0xFA, 0x00, 0xD6, 0xDC, -0xDF, 0xFB, 0xE6, 0xEC, 0xE5, 0xB8, 0x48, 0x3F, 0x20, 0x70, -0x3F, 0x37, 0x1F, 0xE4, 0xA3, 0xAB, 0xD8, 0x78, 0x07, 0x06, -0x18, 0x79, 0x17, 0x15, 0xF9, 0x38, 0x01, 0xD8, 0xFE, 0xFE, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, -0xBB, 0xD7, 0x34, 0xB0, 0xB7, 0xDF, 0xA0, 0x3E, 0x35, 0x39, -0x2A, 0x0F, 0x0D, 0x0C, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, -0x00, 0xF2, 0xF4, 0xF5, 0xFF, 0xCC, 0xD3, 0xD0, 0xD9, 0x0B, -0x09, 0x00, 0xC6, 0x17, 0x13, 0x20, 0x5B, 0x0D, 0x0B, 0x07, -0x07, 0x17, 0x16, 0xF9, 0x34, 0x01, 0xD8, 0xFE, 0xFE, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB1, 0xBA, 0xD6, 0x21, 0xA5, 0xAE, -0xD5, 0xB4, 0x43, 0x38, 0x40, 0x29, 0x07, 0x06, 0x07, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFA, 0xFB, 0xFB, 0x00, 0xF0, 0xF2, 0xF0, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0x0A, 0x09, 0x09, 0x00, 0x0D, 0x0B, -0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFE, 0xFF, 0xF8, 0xFA, -0xFA, 0x00, 0x09, 0x06, 0x07, 0x01, 0xF1, 0xF4, 0xF3, 0x00, -0x22, 0x1F, 0xFD, 0x34, 0x04, 0x00, 0x00, 0x00, 0x00, 0xF0, -0xF1, 0xF7, 0x07, 0xB0, 0xB4, 0xD2, 0x8F, 0x2F, 0x26, 0x2F, -0x29, 0xFA, 0xFB, 0xFA, 0x01, 0xFA, 0xFB, 0xFA, 0x00, 0x00, -0x00, 0x01, 0x00, 0xFA, 0xFB, 0xFA, 0x00, 0xD0, 0xD3, 0xCE, -0x00, 0xE1, 0xE1, 0xDD, 0x00, 0xFC, 0xFA, 0xFA, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x03, 0x03, 0x00, 0x10, 0x14, 0x17, -0x00, 0x2B, 0x28, 0x2D, 0x00, 0x1F, 0x1B, 0x1D, 0x00, 0x02, -0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, -0x00, 0xF5, 0xF6, 0xF6, 0x00, 0xF9, 0xF9, 0xF9, 0x00, 0x01, -0x01, 0x04, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0xBC, 0xC3, -0xDA, 0x43, 0xFC, 0xFC, 0x08, 0x4A, 0x01, 0x01, 0x02, 0x01, -0xF2, 0xF4, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xEF, -0xED, 0x00, 0xCF, 0xCE, 0xC8, 0x00, 0xF6, 0xF5, 0xF3, 0xFF, -0xFF, 0xFD, 0xFD, 0xF4, 0x0A, 0x08, 0x04, 0xEC, 0x00, 0x00, -0x00, 0xFF, 0xF6, 0xF8, 0xFA, 0x15, 0xF0, 0xF1, 0xF0, 0x0C, -0xCB, 0xD6, 0xD0, 0x01, 0xEE, 0xF2, 0xF0, 0x00, 0x2C, 0x25, -0x28, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFE, 0xFD, 0x00, -0xFD, 0xFD, 0xFD, 0x00, 0xF9, 0xFA, 0xF9, 0x00, 0x02, 0x01, -0x06, 0x01, 0x04, 0xF5, 0xF6, 0xFA, 0x03, 0xAC, 0xB3, 0xD0, -0x60, 0x16, 0x14, 0x22, 0x05, 0xF3, 0xF5, 0xF3, 0x00, 0x00, -0x00, 0x00, 0x00, 0xF5, 0xF6, 0xF5, 0x00, 0xD0, 0xCE, 0xC8, -0x00, 0xFB, 0xFC, 0xFB, 0xFC, 0x0D, 0x10, 0x0D, 0xB4, 0x6A, -0x65, 0x43, 0x88, 0x2E, 0x2B, 0x1D, 0xCF, 0xFF, 0xFF, 0xFE, -0xFF, 0xD3, 0xD5, 0xE4, 0x31, 0xA9, 0xAD, 0xC9, 0x7A, 0xF3, -0xF9, 0x03, 0x4D, 0xFA, 0xFA, 0xFA, 0x02, 0xEB, 0xEC, 0xEB, -0x00, 0x15, 0x13, 0x14, 0x00, 0xFB, 0xFC, 0xFC, 0x00, 0xFB, -0xFB, 0xFC, 0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x01, 0x02, 0x01, -0x00, 0x04, 0xE5, 0xE7, 0xF2, 0x0E, 0xEB, 0xEC, 0xF4, 0x41, -0x13, 0x10, 0xFC, 0x00, 0xF2, 0xF4, 0xF3, 0x00, 0x00, 0x00, -0x00, 0x00, 0xDA, 0xDA, 0xD6, 0x00, 0xFB, 0xFB, 0xFA, 0xFF, -0x0F, 0x13, 0x11, 0xB3, 0x7E, 0x75, 0x4A, 0x5C, 0x3A, 0x35, -0x22, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x1A, 0x17, 0x0E, 0xD2, 0xCB, 0xCE, 0xDF, 0xE1, 0xE8, 0xEC, -0x06, 0x00, 0x1D, 0x1A, 0x1C, 0x00, 0x02, 0x03, 0x03, 0x00, -0x00, 0x00, 0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0xFB, 0xFC, -0xFA, 0x00, 0xF8, 0xF9, 0xF7, 0x00, 0xFD, 0xFD, 0xFE, 0x02, -0x04, 0xC0, 0xC8, 0xDE, 0x1A, 0xFF, 0xFF, 0x00, 0x13, 0xF2, -0xF6, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFA, 0xF9, -0x00, 0xF4, 0xF2, 0xF0, 0x00, 0x00, 0x01, 0x02, 0xF5, 0x68, -0x62, 0x40, 0x8B, 0x3A, 0x35, 0x22, 0xF6, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0xFB, 0xFD, 0x02, 0x84, -0x8A, 0xB4, 0x77, 0xF9, 0xFC, 0x10, 0x69, 0x49, 0x43, 0x38, -0x02, 0xFF, 0xFE, 0x01, 0x00, 0xF6, 0xF7, 0xFB, 0x00, 0xEF, -0xF0, 0xF0, 0x00, 0xEF, 0xF2, 0xF0, 0x00, 0xE6, 0xEB, 0xE9, -0x00, 0xF5, 0xF6, 0xF5, 0x00, 0x36, 0x32, 0x11, 0x01, 0x04, -0xFC, 0xFC, 0xFB, 0x21, 0xFD, 0xFD, 0xFD, 0x01, 0xF1, 0xF6, -0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF7, 0xF6, 0x00, -0x03, 0x08, 0x09, 0x00, 0x09, 0x04, 0xFF, 0xED, 0x2D, 0x29, -0x19, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFF, 0x0B, 0xEE, 0xF3, -0x0D, 0x59, 0xF7, 0xF1, 0xE9, 0x05, 0xB7, 0xB5, 0xB4, 0xFD, -0xFA, 0xFB, 0xFC, 0xFB, 0xF8, 0xFC, 0xFC, 0x04, 0xF3, 0xF8, -0xF7, 0x03, 0xF9, 0xFC, 0xFC, 0x01, 0xFE, 0x01, 0x01, 0x00, -0x08, 0x09, 0x0A, 0xD3, 0x1D, 0x1B, 0x0B, 0xDB, 0x04, 0x00, -0xFF, 0xFE, 0xFF, 0xF8, 0xF1, 0xEE, 0x00, 0xFD, 0xFC, 0xFB, -0x00, 0x02, 0x06, 0x07, 0x00, 0x04, 0x06, 0x07, 0x00, 0x07, -0x0F, 0x11, 0x00, 0x02, 0xFA, 0xF4, 0x00, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x0A, 0x09, 0x03, 0xF3, 0x97, 0x8B, 0x44, -0x28, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFD, 0x00, 0xA4, -0xA7, 0xC4, 0x02, 0xF6, 0xF8, 0xFC, 0xFF, 0x35, 0x33, 0x22, -0xFF, 0x26, 0x24, 0x17, 0x00, 0x05, 0x05, 0x04, 0x00, 0x0B, -0x0A, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, -0x02, 0xDF, 0xFF, 0xFC, 0xFB, 0xFF, 0xFE, 0xFB, 0xFA, 0x01, -0x02, 0x06, 0x07, 0x00, 0x04, 0x06, 0x07, 0x00, 0x11, 0x0D, -0x0D, 0x00, 0xF4, 0xF0, 0xFF, 0x13, 0xD4, 0xD8, 0xE8, 0x32, -0x23, 0x1F, 0x13, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB4, 0xB9, 0xD1, 0x04, 0xA4, 0xA7, -0xC9, 0x10, 0x07, 0x0C, 0x0E, 0xFB, 0xAC, 0xB1, 0xCF, 0xFB, -0xFE, 0xFE, 0xFE, 0xFB, 0x13, 0x16, 0x10, 0xFD, 0x56, 0x51, -0x34, 0xFE, 0x56, 0x4E, 0x31, 0x00, 0x02, 0x3F, 0x38, 0x22, -0xE7, 0x01, 0x03, 0x05, 0xEC, 0x03, 0x09, 0x0B, 0x00, 0x08, -0x0C, 0x0D, 0x00, 0x12, 0x0D, 0x0E, 0x00, 0x10, 0x0B, 0x0D, -0x00, 0x1A, 0x1A, 0x1D, 0x0B, 0xA2, 0xAF, 0xD3, 0x78, 0xCE, -0xD4, 0xE8, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, -0xE1, 0xED, 0x03, 0x98, 0x9C, 0xBF, 0x2E, 0x21, 0x28, 0x2C, -0x2B, 0x26, 0x27, 0x2B, 0x21, 0x2B, 0x2E, 0x34, 0x19, 0x24, -0x29, 0x2F, 0x12, 0x00, 0x07, 0x11, 0x0C, 0x9A, 0xA7, 0xCC, -0x06, 0xF2, 0xF4, 0xF9, 0x00, 0x03, 0x77, 0x89, 0x85, 0xFB, -0xBB, 0xC0, 0xD6, 0x32, 0xFB, 0x03, 0x09, 0x2C, 0x10, 0x0E, -0x0F, 0x00, 0x10, 0x0B, 0x0D, 0x00, 0x07, 0x05, 0x06, 0x00, -0x09, 0x08, 0x07, 0x01, 0x0A, 0x07, 0x0B, 0x22, 0xC5, 0xCC, -0xE1, 0x2C, 0x0A, 0x09, 0x04, 0xD4, 0x06, 0x04, 0x03, 0xED, -0xF1, 0xF3, 0xF9, 0x00, 0xC2, 0xC9, 0xDE, 0x1D, 0x97, 0x9C, -0xC0, 0x5F, 0x0F, 0x10, 0x1B, 0x42, 0x15, 0x14, 0x17, 0x12, -0x01, 0x01, 0x01, 0x0B, 0x00, 0x00, 0x00, 0x08, 0x03, 0x02, -0x02, 0x05, 0x01, 0x00, 0x01, 0x04, 0x09, 0x0A, 0x00, 0xFA, -0x51, 0x48, 0x2B, 0xF9, 0x01, 0xD8, 0xFE, 0xFE, 0x00, 0xA9, -0xAE, 0xCA, 0x47, 0x9B, 0xA6, 0xCC, 0xB3, 0x1E, 0x1D, 0x22, -0x05, 0x0A, 0x07, 0x08, 0x00, 0x05, 0x05, 0x04, 0x00, 0x06, -0x04, 0x06, 0x00, 0x05, 0x05, 0x05, 0x00, 0x01, 0x02, 0x02, -0xFF, 0xF1, 0xF4, 0xF3, 0xF0, 0xF3, 0xF7, 0xF1, 0xED, 0xFA, -0xF9, 0xF8, 0xFD, 0x00, 0xFF, 0x04, 0x0E, 0x1A, 0x16, 0x19, -0x00, 0x0D, 0x0A, 0x0B, 0xE9, 0xFC, 0xFD, 0xFC, 0xE0, 0xFB, -0xFB, 0xFB, 0xE0, 0xFB, 0xFC, 0xFB, 0xE3, 0xFC, 0xFC, 0xFC, -0xE7, 0xE8, 0xEE, 0xEB, 0xE8, 0x34, 0x30, 0x16, 0xCB, 0x74, -0x67, 0x3C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x46, 0x42, -0x2C, 0xBF, 0xB0, 0xB5, 0xD1, 0xB3, 0x01, 0x00, 0xFF, 0x51, -0x03, 0x03, 0x03, 0x01, 0x04, 0x03, 0x04, 0x00, 0x04, 0x04, -0x04, 0x00, 0x05, 0x05, 0x05, 0x00, 0x05, 0x04, 0x06, 0x01, -0x0F, 0x0C, 0x0D, 0x11, 0x05, 0x04, 0x1F, 0x11, 0x02, 0x03, -0x02, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFB, 0xFC, 0xFC, 0xFE, -0xFA, 0xFB, 0xFA, 0x06, 0x02, 0xFB, 0x03, 0x00, 0x00, 0x01, -0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFC, 0xFD, 0xFD, 0x00, -0x09, 0x0A, 0xFF, 0xE3, 0x60, 0x56, 0x32, 0xF5, 0x00, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x0A, -0xFA, 0x55, 0x50, 0x33, 0x70, 0xE9, 0xE9, 0xE5, 0xD4, 0x01, -0x01, 0x00, 0xFF, 0x03, 0x03, 0x03, 0x00, 0x04, 0x04, 0x04, -0x00, 0x05, 0x03, 0x05, 0x00, 0x08, 0x07, 0x06, 0x00, 0x0D, -0x0C, 0x0E, 0x00, 0x12, 0x12, 0x11, 0x00, 0x15, 0x13, 0x13, -0x00, 0x12, 0x12, 0x11, 0x01, 0x10, 0x0F, 0x0F, 0x03, 0x0A, -0x09, 0x0A, 0x11, 0x05, 0x05, 0x04, 0x1F, 0x05, 0x03, 0x05, -0x1E, 0x03, 0x03, 0x04, 0x1C, 0xE2, 0xE9, 0xE4, 0x04, 0x4F, -0x47, 0x28, 0xD2, 0x14, 0x11, 0x0A, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x52, 0x4D, 0x32, 0xE3, 0x61, 0x58, 0x32, 0x5F, 0xE4, 0xE5, -0xE1, 0xD2, 0xFF, 0x00, 0x01, 0xFF, 0x04, 0x03, 0x04, 0x00, -0x04, 0x04, 0x04, 0x00, 0x09, 0x08, 0x09, 0x00, 0x0D, 0x0D, -0x0B, 0x00, 0x10, 0x0F, 0x09, 0x00, 0x13, 0x12, 0x06, 0x00, -0x12, 0x10, 0x07, 0x00, 0x0F, 0x0E, 0x09, 0x00, 0x0C, 0x0B, -0x0B, 0x02, 0x08, 0x07, 0x07, 0x0F, 0xFE, 0xFF, 0xFF, 0x1C, -0xDA, 0xDF, 0xD9, 0xFE, 0x5D, 0x52, 0x2B, 0xAA, 0x50, 0x46, -0x2B, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x53, 0x4E, 0x32, 0xCF, 0x02, 0x03, 0x02, -0x4B, 0xB6, 0xBE, 0xDE, 0x89, 0xF8, 0xF9, 0x15, 0x52, 0x17, -0x14, 0x16, 0x09, 0x07, 0x07, 0x07, 0x00, 0x0A, 0x09, 0x04, -0x00, 0x0D, 0x0D, 0x02, 0x00, 0x0C, 0x0B, 0x01, 0x00, 0xFB, -0xFC, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0xEE, 0xF0, 0xFB, -0x00, 0xDD, 0xE1, 0xDE, 0xFC, 0xF5, 0xF6, 0xE9, 0xBF, 0x5B, -0x52, 0x2B, 0x75, 0x50, 0x49, 0x2D, 0xE4, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -0xD8, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xEF, 0xF1, 0xF7, 0x04, 0xBD, 0xC2, 0xD9, 0x3A, 0xB1, 0xB7, -0xD4, 0x62, 0x01, 0x00, 0x0C, 0x41, 0x11, 0x0F, 0x0F, 0x1D, -0x1F, 0x1F, 0x16, 0x01, 0x09, 0x08, 0x01, 0x00, 0xE8, 0xE8, -0xF4, 0xFF, 0xE6, 0xE9, 0xE9, 0xE6, 0xFA, 0xFA, 0xF3, 0xC4, -0x23, 0x16, 0xF8, 0x9C, 0x69, 0x6A, 0x53, 0xC4, 0x15, 0x15, -0x0F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xD8, -0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF5, 0xF9, -0x02, 0xE1, 0xE2, 0xED, 0x0D, 0xBF, 0xC3, 0xD7, 0x14, 0x00, -0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, -0xE8, 0x41, 0x3C, 0x27, 0xE8, 0x20, 0x20, 0x16, 0xF3, 0x0C, -0x0B, 0x07, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xB4, 0x89, -0xF5, 0x1D, 0x8B, 0x7B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xF2, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x84, 0x94, 0x5D, 0x6C, 0x5C, 0x47, 0x19, -0x86, 0x9F, 0x6F, 0xCE, 0xD9, 0xB3, 0x67, 0xD7, 0xBB, 0xD9, -0x6C, 0xBC, 0x6B, 0x36, 0x26, 0x69, 0x12, 0x3B, 0x89, 0x13, -0x29, 0xA5, 0x6E, 0xD5, 0x82, 0x5A, 0x1C, 0x85, 0x82, 0xAA, -0x48, 0xA4, 0x95, 0x90, 0x40, 0xA8, 0x02, 0x89, 0x0A, 0x95, -0x04, 0xB8, 0x01, 0xC1, 0x05, 0x70, 0x81, 0xB8, 0x69, 0x91, -0x0A, 0x17, 0x5C, 0x70, 0x47, 0xA3, 0x14, 0xC2, 0x5F, 0x24, -0x24, 0x4A, 0x69, 0x2B, 0x2E, 0x12, 0xD4, 0x16, 0x9A, 0xA6, -0xA2, 0x8D, 0x42, 0x12, 0x7E, 0x92, 0xD4, 0xD9, 0xD8, 0x69, -0x36, 0xF6, 0xAE, 0xBD, 0x6B, 0xEF, 0x8F, 0x7D, 0xCE, 0xEE, -0xD9, 0x33, 0x33, 0x5C, 0xB8, 0x6E, 0x9D, 0x10, 0xD5, 0xAF, -0x34, 0xD2, 0x5C, 0xCC, 0x3C, 0xF3, 0x7E, 0xDF, 0x7C, 0x7A, -0xE5, 0x8B, 0x3B, 0x00, 0x0B, 0xC6, 0x80, 0x00, 0xAE, 0x78, -0xE4, 0x71, 0xA8, 0xF6, 0x43, 0x95, 0x57, 0x89, 0x6D, 0x9E, -0xE3, 0xEF, 0x18, 0xC8, 0x6C, 0xD8, 0x93, 0x4A, 0xA5, 0x0A, -0x08, 0x12, 0x04, 0xE1, 0x7C, 0x10, 0xB4, 0xAF, 0xF4, 0xA2, -0x70, 0xAA, 0x69, 0xE3, 0xE9, 0x8F, 0xB8, 0x49, 0xD3, 0xC4, -0xD0, 0xB7, 0x7D, 0x10, 0x10, 0x07, 0x10, 0x70, 0x59, 0xE1, -0x62, 0xED, 0x7B, 0x4B, 0x59, 0x2C, 0x76, 0xF3, 0xAE, 0x81, -0xE2, 0x93, 0x13, 0xF7, 0x1D, 0x38, 0x34, 0xF2, 0xC0, 0xC4, -0xD8, 0xE0, 0xCE, 0x3D, 0x79, 0x2F, 0x9B, 0x01, 0xA0, 0xD7, -0xE9, 0xB0, 0x30, 0x79, 0x69, 0xB1, 0xFC, 0x8F, 0xD7, 0xDF, -0x79, 0xFD, 0x9F, 0x7F, 0x7F, 0xB9, 0x13, 0x75, 0x9E, 0xB3, -0xD6, 0xCE, 0x18, 0x56, 0xA4, 0xEC, 0x8A, 0x41, 0x59, 0x6A, -0x2D, 0x80, 0x5D, 0x81, 0x57, 0xA7, 0xCB, 0xDE, 0xB1, 0xAF, -0x7F, 0xF9, 0xB1, 0x4F, 0x6D, 0xD9, 0xF7, 0xD4, 0x43, 0x8F, -0x7F, 0x6D, 0xD7, 0xC0, 0xC8, 0x36, 0x57, 0xB0, 0x88, 0x89, -0x41, 0x84, 0x55, 0x59, 0xE5, 0x62, 0x05, 0x96, 0xDE, 0xB9, -0x1A, 0x9F, 0x3E, 0x71, 0x6C, 0xF2, 0xA5, 0x0B, 0xAF, 0xFD, -0xA8, 0xD6, 0x6B, 0xBF, 0x88, 0x22, 0x52, 0xCE, 0xCA, 0x51, -0xB1, 0xD6, 0x02, 0x30, 0x3B, 0x75, 0x35, 0x71, 0xE2, 0xDB, -0x87, 0xBF, 0xF2, 0x99, 0xAD, 0xE3, 0xCF, 0x7C, 0xEC, 0xE0, -0xA3, 0x05, 0x49, 0x02, 0x5A, 0xBF, 0x0F, 0x43, 0xFE, 0x6F, -0x03, 0x4E, 0x02, 0xD3, 0xED, 0x73, 0xE1, 0xE5, 0xE7, 0xEB, -0xCF, 0x9E, 0xFC, 0xDD, 0x0F, 0xAA, 0x71, 0xE7, 0x37, 0xCA, -0x25, 0x12, 0xD6, 0x80, 0x7F, 0x7C, 0xF0, 0x13, 0x9F, 0x7B, -0x74, 0xF8, 0xDE, 0x67, 0xEF, 0xFE, 0xE4, 0xFE, 0x82, 0xE8, -0xAE, 0x60, 0x2D, 0x82, 0xB9, 0xC5, 0xE9, 0x07, 0x5C, 0x01, -0x11, 0xAC, 0x15, 0x50, 0x0A, 0x8B, 0x6B, 0xCF, 0xBF, 0x7A, -0xB2, 0x71, 0xF4, 0xAD, 0x17, 0xBF, 0x51, 0x8B, 0x5A, 0x7F, -0x94, 0xD5, 0x1E, 0x9F, 0x3D, 0xF9, 0xC2, 0xD0, 0x83, 0x6E, -0xF1, 0xE9, 0xBB, 0x47, 0xC7, 0x8A, 0xF6, 0x46, 0x99, 0xA8, -0xDF, 0xA5, 0xE5, 0xBA, 0xC4, 0x8E, 0xB3, 0x06, 0x78, 0xDB, -0x03, 0x40, 0x22, 0x8E, 0xC9, 0xA3, 0x70, 0x13, 0x09, 0xB9, -0x67, 0x6C, 0x5F, 0xE1, 0xB3, 0x37, 0xA7, 0x9E, 0x3E, 0x3E, -0x75, 0xFA, 0xB4, 0x31, 0xD4, 0xDC, 0x5E, 0x18, 0xA8, 0x99, -0x93, 0xA7, 0x9E, 0x98, 0xD8, 0xBA, 0x77, 0xF7, 0xE2, 0xEC, -0x35, 0x74, 0xBF, 0x47, 0xE4, 0x38, 0x24, 0x8F, 0x1C, 0x26, -0x5D, 0x1A, 0xBE, 0xA5, 0xF2, 0xDB, 0x15, 0x57, 0x6E, 0xB0, -0xF0, 0xAB, 0xE3, 0x24, 0x2C, 0x88, 0x38, 0x3C, 0x30, 0xB2, -0x6F, 0xE7, 0xDF, 0xAA, 0x97, 0xBE, 0x7A, 0x2D, 0x68, 0xFC, -0xD4, 0xBD, 0x74, 0xE6, 0x95, 0x8F, 0xDA, 0xD3, 0x67, 0x1F, -0x6B, 0xDD, 0xB5, 0x3B, 0xD1, 0x0C, 0x9A, 0x2B, 0xAD, 0xCB, -0x0E, 0xB0, 0xBB, 0x50, 0xC4, 0xDF, 0x5C, 0xE2, 0xC3, 0x14, -0x86, 0x21, 0xD7, 0x1A, 0x0D, 0xE8, 0x45, 0x68, 0x6D, 0xF0, -0x3D, 0xDF, 0xBD, 0x3F, 0xBB, 0xE5, 0xD0, 0x4C, 0xBF, 0xF9, -0x7B, 0xD7, 0xEF, 0x99, 0x1D, 0xA5, 0xE4, 0xC6, 0xB1, 0xE9, -0xEB, 0x65, 0xC2, 0x38, 0x42, 0x09, 0x24, 0xC2, 0x1C, 0x23, -0x71, 0xCC, 0x7A, 0x8A, 0xE3, 0x98, 0xF9, 0xF9, 0x79, 0x74, -0x10, 0xA2, 0xB5, 0x41, 0x09, 0x14, 0xC5, 0x1F, 0xCB, 0xA8, -0xF4, 0x88, 0xFB, 0xEB, 0xEF, 0x1D, 0xD9, 0xFE, 0xF9, 0xF4, -0xDE, 0xC2, 0xCD, 0x99, 0x0A, 0x31, 0x16, 0x27, 0xE1, 0x90, -0x8C, 0x63, 0xF4, 0xDA, 0x89, 0xF8, 0x10, 0x70, 0xBD, 0x5E, -0xA7, 0xBF, 0xB4, 0x8C, 0x36, 0x1A, 0xAB, 0x0D, 0xA5, 0xEC, -0x60, 0x21, 0xEF, 0x7A, 0xE3, 0x6E, 0xCA, 0x3A, 0x83, 0x95, -0xE5, 0x8E, 0x9A, 0x6E, 0xB7, 0xC9, 0x27, 0x1C, 0xFC, 0xD8, -0x85, 0xA4, 0x8F, 0xB5, 0x66, 0x5D, 0xB0, 0xB5, 0x86, 0x6E, -0xB7, 0x4B, 0xD4, 0x0D, 0xB1, 0x5A, 0x63, 0x62, 0x8D, 0xF6, -0x32, 0x92, 0x52, 0x6A, 0x9B, 0xAB, 0xFA, 0x56, 0x5F, 0xA7, -0xCB, 0x2F, 0x83, 0x36, 0x79, 0x6B, 0x19, 0x71, 0x1D, 0xC6, -0x12, 0x0E, 0x91, 0x5E, 0x1F, 0x1C, 0x6B, 0xC3, 0x5C, 0xBB, -0xCD, 0x62, 0xA7, 0xCD, 0x42, 0x3F, 0x66, 0xCE, 0x68, 0xC6, -0xBD, 0x34, 0xF8, 0xD6, 0xB8, 0x5A, 0xEB, 0x7A, 0xD1, 0xF7, -0x75, 0x1E, 0x71, 0x22, 0x65, 0xA9, 0x18, 0x8D, 0xF4, 0xBA, -0x44, 0x66, 0x7D, 0x70, 0x57, 0x6B, 0x2E, 0x74, 0xDA, 0xCC, -0x06, 0xCB, 0xB4, 0x04, 0x02, 0x11, 0xC6, 0x95, 0x63, 0x8C, -0xB5, 0x65, 0xF5, 0xA5, 0x9F, 0x1D, 0xBD, 0x3E, 0xE8, 0xF9, -0xB5, 0x51, 0xCF, 0x27, 0x67, 0x21, 0x07, 0xA4, 0xE4, 0x8E, -0x63, 0x7B, 0x87, 0x56, 0x58, 0x0C, 0x16, 0x57, 0x20, 0x05, -0x0C, 0xE3, 0xB0, 0xC5, 0xF7, 0xE7, 0x7B, 0x51, 0xFF, 0xDF, -0x2A, 0xF2, 0x9C, 0x6B, 0x91, 0xEE, 0x5F, 0xBE, 0x2F, 0x37, -0x48, 0xD6, 0x40, 0x1A, 0x18, 0x00, 0xD4, 0xFA, 0x5C, 0x14, -0x30, 0x60, 0x21, 0xF3, 0xDE, 0x9D, 0x3D, 0xE9, 0x2C, 0x3E, -0x5C, 0x8E, 0xE2, 0xB8, 0xEC, 0xEE, 0x3C, 0xF0, 0x70, 0xB5, -0xBA, 0xFF, 0xAF, 0x7F, 0x7A, 0xF0, 0x8D, 0x73, 0x13, 0x37, -0x5B, 0x75, 0xAF, 0xD9, 0x0F, 0x49, 0xC6, 0x9A, 0x4E, 0xE5, -0x26, 0xE9, 0x4C, 0x66, 0x25, 0x9D, 0xEE, 0x24, 0x81, 0xA0, -0x56, 0x23, 0x65, 0x0D, 0x03, 0x02, 0x39, 0x27, 0xC1, 0xC4, -0xD0, 0xD6, 0xFE, 0xBB, 0xCD, 0xEA, 0x0B, 0xBA, 0x17, 0xCD, -0xB8, 0x5E, 0x3A, 0x6D, 0x87, 0x0E, 0x3E, 0xFC, 0xDB, 0xFA, -0xDB, 0xFF, 0x79, 0xE2, 0x91, 0xE1, 0x9D, 0xF7, 0xBF, 0xF2, -0xEE, 0x7F, 0x91, 0x66, 0x9B, 0x97, 0xBE, 0xF5, 0x4D, 0xD2, -0x99, 0x2C, 0x62, 0x41, 0x94, 0x42, 0x44, 0x90, 0xD5, 0xF2, -0x8D, 0xC1, 0x0A, 0x04, 0xCD, 0x16, 0x4E, 0xD4, 0x65, 0x03, -0xC2, 0xBD, 0x9B, 0x86, 0xF1, 0x95, 0xF7, 0xAF, 0xD9, 0x6E, -0xEB, 0x38, 0x0A, 0xFB, 0x7E, 0x08, 0x1D, 0xFB, 0xF8, 0xFE, -0x4F, 0xDF, 0xA3, 0x33, 0xCF, 0x55, 0x6A, 0x93, 0x77, 0x5D, -0x9C, 0x9B, 0x16, 0x6D, 0x35, 0x0A, 0xC1, 0xF7, 0x92, 0xE4, -0xF2, 0x1B, 0xF1, 0xBD, 0x24, 0xE2, 0x28, 0xFA, 0x51, 0x44, -0xAB, 0xD9, 0x22, 0x08, 0x03, 0xB4, 0x35, 0x28, 0x51, 0x6C, -0xCF, 0x0D, 0xD9, 0x6D, 0xC5, 0xD1, 0xCA, 0x9B, 0x95, 0xC9, -0x27, 0x1B, 0xC1, 0xE2, 0x29, 0x8B, 0xFD, 0x20, 0xDD, 0x1A, -0x57, 0xCB, 0xEA, 0xD4, 0xE1, 0xEF, 0x1C, 0xDA, 0xDB, 0xD6, -0x3F, 0x0F, 0x3A, 0x33, 0xDB, 0x2F, 0xCE, 0x96, 0x09, 0x1C, -0x28, 0x0E, 0x0D, 0x51, 0x2A, 0x95, 0xC8, 0x64, 0x32, 0x28, -0xA5, 0x08, 0xC3, 0x90, 0xB9, 0xFA, 0x3C, 0x73, 0xB3, 0x55, -0x08, 0xBB, 0xEC, 0xDE, 0xB4, 0x95, 0x6C, 0x66, 0xF3, 0xF5, -0x33, 0x95, 0xC9, 0xEF, 0x56, 0x97, 0xE7, 0xFF, 0x0C, 0x68, -0xD6, 0xC6, 0x26, 0x40, 0x63, 0xB2, 0xAC, 0x96, 0xCE, 0x5F, -0x39, 0x50, 0xFD, 0xC9, 0xD1, 0x67, 0x36, 0x39, 0xD1, 0x78, -0x53, 0x2D, 0x7B, 0xB2, 0x71, 0x80, 0x7C, 0xA9, 0x40, 0x36, -0xB7, 0x01, 0x85, 0x10, 0x04, 0x01, 0x8B, 0x73, 0x75, 0xA2, -0xC5, 0x25, 0x52, 0x4B, 0x12, 0x2D, 0x2C, 0xDB, 0x8B, 0xE7, -0x2A, 0xE5, 0xEF, 0xCF, 0x85, 0xF5, 0xD7, 0x62, 0xE9, 0x1B, -0x8B, 0x45, 0x90, 0x95, 0xD8, 0x5C, 0xD5, 0xE0, 0xAE, 0x51, -0x33, 0xB8, 0x6B, 0xF4, 0xD5, 0x9E, 0xE7, 0x3E, 0xD2, 0xF8, -0xCB, 0x99, 0xC7, 0x9D, 0xB3, 0x97, 0xBE, 0x50, 0xF2, 0x4B, -0x63, 0x1B, 0x72, 0xC3, 0x9B, 0xBD, 0x42, 0x3E, 0x81, 0x12, -0xBC, 0x46, 0xB3, 0xAF, 0xEA, 0x99, 0xD9, 0x99, 0xCE, 0xCC, -0x95, 0xCB, 0xB5, 0xEA, 0xF3, 0xB3, 0xAD, 0xDA, 0x89, 0x4E, -0x2F, 0x68, 0xDD, 0xFE, 0xCB, 0xB7, 0x38, 0x5E, 0xAB, 0x7E, -0x10, 0xCA, 0x8D, 0x53, 0x67, 0x8A, 0x49, 0xA3, 0x76, 0xBC, -0x71, 0xE4, 0xA9, 0x2D, 0xBE, 0xE7, 0x17, 0x45, 0xC4, 0x86, -0xBD, 0x6E, 0xFD, 0xA1, 0x5F, 0xFC, 0xB0, 0x72, 0xEE, 0xF8, -0x1F, 0xA6, 0x3A, 0x6F, 0x9E, 0x9F, 0x5F, 0x08, 0x16, 0x6C, -0xB3, 0xD7, 0x24, 0x34, 0xCB, 0xC4, 0x12, 0xB3, 0xEA, 0xF8, -0x7F, 0x03, 0x00, 0xD2, 0xFB, 0x71, 0x29, 0x72, 0x54, 0xF0, -0x6D, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, -0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x0D, 0x06, -0x68, 0x67, 0x6A, 0x57, 0x5F, 0x63, 0x5F, 0x61, 0x05, 0x04, -0x05, 0xE5, 0xD9, 0xD9, 0xD9, 0xEA, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, -0x03, 0x69, 0x69, 0x6C, 0x57, 0xCD, 0xCE, 0xD0, 0xD9, 0xD4, -0xE8, 0xC6, 0xFE, 0xCE, 0xDA, 0xC2, 0xFE, 0x77, 0x76, 0x84, -0xFB, 0x9B, 0x9B, 0x9F, 0xA0, 0x2F, 0x2F, 0x30, 0x1A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, -0x02, 0x00, 0x4C, 0x4C, 0x4F, 0x3F, 0x8B, 0x8A, 0x8E, 0xA7, -0x03, 0x02, 0x0A, 0x6F, 0x1B, 0x1E, 0x10, 0x13, 0xE1, 0xDD, -0xEC, 0x00, 0x81, 0x76, 0x97, 0x00, 0xDA, 0xDA, 0xDE, 0x02, -0xD1, 0xD1, 0xD9, 0x2F, 0x5E, 0x5E, 0x5E, 0x5F, 0x0A, 0x0B, -0x07, 0xCC, 0xD7, 0xD7, 0xD6, 0xE0, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2F, 0x21, 0x70, 0x6F, 0x74, -0x89, 0x30, 0x31, 0x31, 0x53, 0xA2, 0xA1, 0xA9, 0x01, 0x11, -0x12, 0x0F, 0x00, 0xFA, 0xF9, 0xFB, 0x00, 0x0F, 0x0F, 0x0D, -0x00, 0xDD, 0xDD, 0xE0, 0x00, 0xD1, 0xD0, 0xD5, 0x00, 0x02, -0x03, 0x03, 0x00, 0x11, 0x11, 0x0F, 0x00, 0x59, 0x59, 0x51, -0xE9, 0x6B, 0x6B, 0x67, 0x46, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, 0x0B, 0x77, 0x76, -0x7C, 0x7A, 0x6F, 0x6F, 0x73, 0xA3, 0xEE, 0xEE, 0xF1, 0x30, -0xA4, 0xA4, 0xAB, 0x01, 0x58, 0x58, 0x4F, 0x00, 0xD8, 0xD8, -0xDC, 0x00, 0xC7, 0xC6, 0xCB, 0x00, 0x20, 0x21, 0x1D, 0x00, -0x6D, 0x6E, 0x64, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x04, 0x04, -0x03, 0x01, 0x43, 0x43, 0x3E, 0x00, 0x9F, 0x9E, 0xA9, 0x0C, -0x0C, 0x0C, 0x11, 0x30, 0x01, 0x04, 0x04, 0x06, 0x05, 0x30, -0x2F, 0x37, 0x5B, 0xCD, 0xCE, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, -0x57, 0x59, 0x40, 0x62, 0x61, 0x66, 0x9B, 0x13, 0x13, 0x14, -0x23, 0xB9, 0xB9, 0xBE, 0x00, 0xEB, 0xEB, 0xED, 0x00, 0x1C, -0x1C, 0x19, 0x00, 0xBD, 0xBD, 0xC3, 0x00, 0x1A, 0x1A, 0x18, -0x00, 0x49, 0x49, 0x42, 0x00, 0x1F, 0x20, 0x1C, 0x00, 0x87, -0x86, 0x92, 0x00, 0x15, 0x15, 0x14, 0x00, 0x1D, 0x1D, 0x1A, -0x00, 0xB1, 0xB1, 0xB9, 0x00, 0x06, 0x05, 0x06, 0x00, 0x04, -0x05, 0x03, 0xFB, 0x03, 0xFF, 0xFF, 0xFF, 0xFE, 0x17, 0x16, -0x1E, 0x4F, 0x33, 0x33, 0x3A, 0x59, 0xEC, 0xED, 0xE8, 0xC8, -0x07, 0x07, 0x06, 0xFB, 0x82, 0x81, 0x86, 0x87, 0x56, 0x56, -0x5B, 0x98, 0xF2, 0xF1, 0xF4, 0x13, 0xB4, 0xB4, 0xBA, 0x00, -0x53, 0x54, 0x4B, 0x00, 0xD3, 0xD3, 0xD7, 0x00, 0xBA, 0xBA, -0xC0, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFA, 0xFB, 0xFB, 0x00, -0xD4, 0xD4, 0xD8, 0x00, 0x08, 0x07, 0x07, 0x00, 0x0E, 0x0E, -0x0D, 0x00, 0xF1, 0xF1, 0xF4, 0x00, 0xC3, 0xC2, 0xC8, 0x00, -0x09, 0x09, 0x09, 0x00, 0x07, 0x07, 0x07, 0x00, 0xF7, 0xF6, -0xF3, 0xA7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x22, 0x22, 0x29, 0x33, 0x50, 0x4F, 0x57, 0x8C, 0x3E, -0x3F, 0x36, 0x01, 0x17, 0x16, 0x18, 0x3E, 0xC5, 0xC5, 0xCA, -0x00, 0xD0, 0xD0, 0xD3, 0x00, 0x46, 0x47, 0x40, 0x00, 0xAC, -0xAA, 0xB3, 0x00, 0xED, 0xEE, 0xEF, 0x00, 0x02, 0x02, 0x02, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0x0C, -0x0D, 0x0B, 0x00, 0x3B, 0x3B, 0x35, 0x00, 0xEB, 0xEA, 0xEE, -0x00, 0xD3, 0xD3, 0xD8, 0x00, 0x0A, 0x0A, 0x08, 0x00, 0x05, -0x06, 0x05, 0x00, 0xFB, 0xFA, 0xFA, 0xCA, 0xC3, 0xC4, 0xB3, -0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x17, 0x17, 0x12, 0xF0, 0x48, 0x49, 0x41, 0x1A, 0xFE, 0xFE, -0x00, 0x25, 0xBD, 0xBD, 0xC3, 0x00, 0x2F, 0x2F, 0x2A, 0x00, -0x05, 0x05, 0x04, 0x00, 0x9C, 0x9A, 0xA5, 0x00, 0x01, 0x01, -0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x03, 0x02, 0x03, 0x00, -0x05, 0x07, 0x05, 0x00, 0x02, 0x02, 0x03, 0x00, 0x3B, 0x3B, -0x35, 0x00, 0xEE, 0xED, 0xF0, 0x00, 0xD7, 0xD7, 0xDC, 0x00, -0x0E, 0x0F, 0x0D, 0x00, 0x07, 0x06, 0x06, 0x00, 0xFB, 0xFB, -0xF9, 0xD1, 0xCA, 0xCC, 0xBD, 0x4C, 0xF9, 0xFA, 0xF8, 0xF3, -0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x3A, 0x24, 0x88, -0x87, 0x8D, 0xBD, 0xDB, 0xDB, 0xDF, 0x1D, 0xB9, 0xB9, 0xBE, -0x00, 0x4F, 0x4F, 0x48, 0x00, 0xC9, 0xC9, 0xCD, 0x00, 0xD0, -0xD0, 0xD5, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x01, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0x54, 0x55, 0x4D, 0x00, 0xE7, 0xE6, 0xEA, -0x00, 0xD9, 0xD9, 0xDD, 0x00, 0x0B, 0x0B, 0x0A, 0x00, 0x07, -0x08, 0x07, 0x00, 0xFB, 0xFB, 0xF9, 0xD7, 0xBF, 0xC0, 0xB2, -0x43, 0xF1, 0xF1, 0xEE, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x01, -0x1F, 0x1F, 0x20, 0x13, 0x93, 0x92, 0x99, 0xC7, 0x18, 0x18, -0x18, 0x24, 0xD0, 0xD1, 0xD4, 0x00, 0x0E, 0x0D, 0x0C, 0x00, -0xA7, 0xA7, 0xAF, 0x00, 0xF0, 0xF0, 0xF1, 0x00, 0xFC, 0xFB, -0xFC, 0x00, 0x03, 0x04, 0x03, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x15, 0x15, 0x13, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0x43, 0x44, -0x3D, 0x00, 0xCF, 0xCF, 0xD5, 0x00, 0xEC, 0xEB, 0xED, 0x00, -0x0C, 0x0C, 0x0C, 0x00, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xBA, 0xBC, 0xAD, 0x3B, 0xEA, 0xEA, 0xE6, 0xE1, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7E, -0x7D, 0x83, 0x9C, 0xD2, 0xD2, 0xD7, 0x24, 0xFF, 0xFF, 0x00, -0x00, 0xFA, 0xF9, 0xF9, 0x00, 0x98, 0xA4, 0xAC, 0x00, 0xFA, -0xFB, 0xFB, 0x00, 0x04, 0x03, 0x04, 0x00, 0xFE, 0xFF, 0xFF, -0x01, 0x06, 0x02, 0x02, 0xFF, 0x20, 0x21, 0x1E, 0x00, 0xF8, -0xF8, 0xF9, 0x00, 0x3B, 0x3B, 0x37, 0x00, 0xC1, 0xC0, 0xC6, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0x12, 0x13, 0x12, 0x00, 0x09, -0x09, 0x08, 0x00, 0x01, 0x01, 0x01, 0xF3, 0xBB, 0xBB, 0xAF, -0x4F, 0xEA, 0xEA, 0xE6, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x34, 0x34, -0x34, 0x3D, 0x12, 0x12, 0x0F, 0x00, 0x9E, 0x9E, 0xA7, 0x00, -0xC3, 0xC3, 0xC8, 0x00, 0xF2, 0xF2, 0xF4, 0x00, 0x07, 0x08, -0x06, 0x00, 0x01, 0x02, 0x01, 0x00, 0xFE, 0xFE, 0xFE, 0xFF, -0x01, 0x02, 0x02, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0x2F, 0x2E, -0x2A, 0x00, 0xB9, 0xB8, 0xBF, 0x00, 0x09, 0x0A, 0x0A, 0x00, -0x13, 0x12, 0x0E, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xFE, 0xFE, -0xFE, 0xFB, 0xC1, 0xC1, 0xB8, 0x57, 0xE1, 0xE2, 0xDC, 0xCD, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x2B, 0x2A, 0x2D, -0x20, 0x36, 0x37, 0x34, 0x34, 0x20, 0x21, 0x1C, 0x00, 0xC1, -0xC0, 0xC7, 0x00, 0x08, 0x08, 0x07, 0x00, 0xFC, 0xFB, 0xFC, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x0D, 0x0C, 0x0B, 0x00, 0x2E, -0x2F, 0x2A, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xC7, 0xC6, 0xCD, -0x00, 0x0E, 0x0E, 0x0E, 0x00, 0x11, 0x12, 0x11, 0x00, 0x11, -0x11, 0x10, 0x00, 0xFF, 0xFE, 0xFE, 0xFE, 0xCE, 0xCF, 0xC8, -0x6A, 0xD6, 0xD7, 0xCD, 0xB0, 0x8D, 0x8D, 0x8D, 0x99, 0x63, -0x63, 0x63, 0x6B, 0x3A, 0x3A, 0x3A, 0x3A, 0x03, 0x03, 0x03, -0xFC, 0xDB, 0xDB, 0xDB, 0xDD, 0x01, 0x23, 0x23, 0x24, 0x18, -0xB0, 0xAF, 0xB5, 0xD1, 0x22, 0x23, 0x1D, 0x15, 0xCE, 0xCE, -0xD3, 0x00, 0x7C, 0x7B, 0x88, 0x00, 0x05, 0x04, 0x04, 0x00, -0x0B, 0x0C, 0x0A, 0x00, 0x3E, 0x3E, 0x39, 0x00, 0xC9, 0xC8, -0xCF, 0x00, 0xEE, 0xEE, 0xF0, 0x00, 0x0E, 0x0F, 0x0D, 0x00, -0x0E, 0x0E, 0x0E, 0x00, 0x0D, 0x0D, 0x0C, 0x00, 0xFB, 0xFB, -0xFB, 0xFD, 0xCF, 0xCF, 0xC9, 0x72, 0xCA, 0xCA, 0xBF, 0x93, -0x57, 0x58, 0x57, 0x5C, 0x91, 0x91, 0x91, 0xA2, 0xD5, 0xD5, -0xD5, 0x00, 0xED, 0xED, 0xED, 0x00, 0x2B, 0x2B, 0x2B, 0xF8, -0x43, 0x43, 0x43, 0x24, 0x03, 0xEF, 0xEF, 0xEE, 0xF4, 0xEE, -0xEE, 0xEF, 0xD5, 0x33, 0x33, 0x37, 0x56, 0x1D, 0x1D, 0x19, -0x03, 0x2F, 0x30, 0x2B, 0x00, 0x05, 0x05, 0x05, 0x00, 0x14, -0x14, 0x13, 0x00, 0xB7, 0xB6, 0xBE, 0x01, 0xFA, 0xFA, 0xFB, -0x00, 0x0B, 0x0C, 0x0A, 0x00, 0x09, 0x09, 0x09, 0x00, 0x06, -0x06, 0x06, 0x00, 0xF6, 0xF5, 0xF5, 0xF1, 0xC8, 0xC9, 0xC0, -0x5E, 0xD0, 0xD0, 0xC7, 0xA0, 0x00, 0x00, 0xFF, 0x00, 0x54, -0x54, 0x54, 0x60, 0x33, 0x33, 0x33, 0x39, 0xF6, 0xEE, 0xEE, -0x00, 0x01, 0xFB, 0xFB, 0x00, 0x16, 0x1B, 0x1B, 0x04, 0xC0, -0xC0, 0xC0, 0xB7, 0x03, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xD5, -0xD3, 0xDC, 0xFD, 0xFD, 0xFE, 0xE0, 0x2D, 0x2C, 0x30, 0x4B, -0xE5, 0xE4, 0xE7, 0x03, 0xB0, 0xAF, 0xB7, 0x00, 0xD2, 0xD1, -0xD6, 0x00, 0x06, 0x07, 0x06, 0x00, 0x08, 0x07, 0x07, 0x00, -0x06, 0x06, 0x06, 0x00, 0x02, 0x02, 0x01, 0x00, 0xEB, 0xEB, -0xE7, 0xB7, 0xC1, 0xC3, 0xB7, 0x4F, 0xE2, 0xE2, 0xDB, 0xC6, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, -0x20, 0x2B, 0x1F, 0x1F, 0x1F, 0x47, 0xEF, 0xEF, 0xEF, 0x00, -0x17, 0x19, 0x19, 0x00, 0x05, 0x08, 0x08, 0x01, 0xCB, 0xCB, -0xCB, 0xB6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x97, 0x97, 0x93, 0xA4, 0xD9, 0xD8, 0xD8, 0xDD, 0xEB, -0xEA, 0xF9, 0x85, 0x0A, 0x0A, 0x0C, 0x3C, 0x06, 0x06, 0x06, -0x04, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFC, 0xF0, -0xEF, 0xEC, 0xC3, 0xE0, 0xE2, 0xDA, 0x86, 0xE1, 0xE1, 0xDA, -0xBD, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xE7, 0xE7, -0xDD, 0x08, 0x08, 0x08, 0xFF, 0xEF, 0x01, 0x01, 0x01, 0x02, -0x07, 0x07, 0x00, 0x01, 0x01, 0x01, 0x00, 0x19, 0x19, 0x19, -0x1D, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xBE, 0xBF, 0xBB, 0xC7, 0x00, 0x00, -0x01, 0x42, 0x0A, 0x0A, 0x0D, 0x16, 0x0D, 0x0C, 0x10, 0x25, -0xFF, 0xFF, 0xFE, 0xFC, 0xF6, 0xF7, 0xF3, 0xDC, 0xF4, 0xF4, -0xF2, 0xED, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x06, -0x0B, 0x0B, 0x0B, 0x00, 0x1A, 0x1A, 0x1A, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x1D, 0x1D, 0x1D, 0x2F, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0x00, 0xF6, 0xF6, 0xF2, 0xEA, 0xF6, 0xF6, 0xF2, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC9, 0xC9, 0xC9, 0xF0, -0xF0, 0xF0, 0xF3, 0x0F, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, -0x00, 0xF9, 0xF9, 0xF9, 0xFE, 0xC8, 0xC8, 0xC8, 0xC9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x31, -0x31, 0x4D, 0xA0, 0xA0, 0xA0, 0xCF, 0xAC, 0xAC, 0xAC, 0xD0, -0x51, 0x51, 0x51, 0x6F, 0x01, 0x01, 0x01, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x46, 0x33, -0xDB, 0xDA, 0xDB, 0xE3, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm index 8fbe5c3d1f..8ec3f4bddb 100644 --- a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm @@ -1,241 +1,239 @@ /* XPM */ -static const char *Platform_Gamecube_xpm[] = { +static const char * Platform_Gamecube_xpm[] = { "96 32 204 2", -"E. c #B1B0B0", -"] c #8E8B8C", -"`. c #E8E8E8", -"O c #CFCECF", -"q. c #F7F7F7", -" . c #231F20", -"N. c #191415", -"x. c #191416", -"~ c #322E2F", -"G. c #4B4849", -"S. c #646263", -"@. c #5A5758", -"^. c #504C4D", -"4 c #828080", -"p. c #C3C3C3", -":. c #B9B8B8", -"H c #C8C7C7", -"c. c #BEBCBC", -"L c #E1E1E1", -"G c #F0F0EF", -"n c #F0F0F0", -"L. c #E6E5E6", -". c #FFFFFF", -"! c #1C1819", -"d. c #2B2728", -"z c #535051", -"H. c #9E9E9E", -"a c #716E6F", -"9 c #8A8888", -"1X c #B2B1B1", -"V. c #8F8C8D", -"XX c #A8A6A7", -"X. c #DFDEDF", -"o. c #EEEDED", -";X c #151112", -", c #242021", -"$ c #3D3A3A", -"j. c #1A1517", -"]. c #292426", -"f. c #656364", -"[. c #6A6768", -"y. c #929091", -"& c #BAB9B9", -"I. c #D3D3D3", -"# c #B0AEAF", -"o c #C9C8C8", -"%X c #C9C8C9", -",X c #F1F1F1", -"7 c #2C2829", -"5. c #221D1E", -"!. c #3B3738", -"x c #221D1F", -"[ c #312C2D", -"u c #7C7A7A", -"-X c #8B8989", -"A c #B3B2B2", -"F. c #C2C1C1", -"a. c #B8B6B6", -"P c #C2C1C2", -">X c #D1D0D1", -"K c #EAEAEA", -"#. c #C7C5C6", -"0 c #E0DFDF", -"$X c #F9F9F9", -"}. c #EFEEEE", -"v. c #252121", -"8 c #252122", -"{ c #1B1617", -"&. c #3E3B3D", -"d c #343031", -"+X c #2A2526", -"y c #2A2527", -"< c #5C5959", -"OX c #848282", -"I c #615D5E", -"#X c #898686", -"6. c #939192", -" c #2A2627", -"v c #393535", -":X c #615E5F", -"&X c #575354", -"J c #706D6E", -"2. c #A2A1A1", -">. c #7F7C7D", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . X o O + . . . . . . . . ", -" . . . . . . . @ # $ % & * . . . . . . . ", -" . . . . . = - ; : > > , < 1 2 . . . . . ", -" . . . . 3 4 , > 5 6 7 > 5 8 9 0 . . . . ", -" . X q w e r t y u i p a 5 t s d f * . . ", -" . g h j t s k 1 . . . + l z x c v & . . ", -" b n m M N B b . V C Z b . b A S D . F G ", -" H J @ K L . . P I x r U Y T . . . R E W ", -" Q ! ~ R . T ^ / ( ) ~ j _ ` . ' ] [ { } ", -" | . .... X.o.O.+.r s @.#.$.%.&.*.=., -. ", -" | .;.:.T >.E ,.<.1.2.<.3.4.5.> M ~ , -. ", -" | .;.:.. 6.7.8.9.0.q.w.e.5 5 r.t.e , -. ", -" | .;.:.. y.u.e i.p.a.s.=.d.f.g.| h 8 -. ", -" | .;.& . h.j.~ k.l.z._ =.x.:.. c.;.8 -. ", -" | .v.b.. n.m.M.N.B.V.N.t C.Z.. O.: 8 -. ", -" O.x A.S.D.. . F.G.H.J.z K.. . L.P.7 _ I. ", -" U.Y.e M.e T.n . D R.K g.. i E.=.t M 7.3 ", -" W.Q.!. .M.~.^./.+ . . 0.(.).5.t ._.H 2 ", -" . . `.'.~ s ].5 [.{.}.|. Xt 5..XXXi . . ", -" . . . . oXOX, +X@X6.#X! 5 8 h.L . . . . ", -" . . . . . $X%X&X*X=X-X;X:X>X2 . . . . . ", -" . . . . . . . ,XC XX c #F9F8F8", +", c #C7C7C7", +"' c #534F50", +") c #252021", +"! c #2A2627", +"~ c #242021", +"{ c #5C5959", +"] c #CECDCD", +"^ c #FBFBFB", +"/ c #D8D8D8", +"( c #828080", +"_ c #292526", +": c #2D282A", +"< c #2C2829", +"[ c #252122", +"} c #8A8888", +"| c #E0DFDF", +"1 c #E5E4E4", +"2 c #9B9999", +"3 c #302C2D", +"4 c #221E1E", +"5 c #282425", +"6 c #2A2527", +"7 c #7C7A7A", +"8 c #EDEDED", +"9 c #E8E7E7", +"0 c #716E6F", +"a c #221E1F", +"b c #343031", +"c c #868383", +"d c #D6D5D6", +"e c #262122", +"f c #1F1A1B", +"g c #595656", +"h c #C4C3C4", +"i c #535051", +"j c #221D1F", +"k c #1D181A", +"l c #393535", +"m c #F5F5F5", +"n c #F0F0F0", +"o c #ADACAC", +"p c #2E2A2B", +"q c #302C2C", +"r c #B1AFAF", +"s c #F2F1F1", +"t c #A6A4A5", +"u c #AEACAC", +"v c #B3B2B2", +"w c #A6A5A5", +"x c #EBEBEB", +"y c #F3F2F2", +"z c #F0F0EF", +"A c #C8C7C7", +"B c #706D6E", +"C c #EAEAEA", +"D c #E1E1E1", +"E c #C2C1C2", +"F c #615D5E", +"G c #676465", +"H c #CBCACA", +"I c #FEFEFE", +"J c #D5D5D5", +"K c #575455", +"L c #D1D1D1", +"M c #C5C4C4", +"N c #1C1819", +"O c #322E2F", +"P c #9D9B9C", +"Q c #211D1F", +"R c #201C1D", +"S c #332E2F", +"T c #241F20", +"U c #B0AFAF", +"V c #E9E8E8", +"W c #8E8B8C", +"X c #312C2D", +"Y c #1B1617", +"Z c #D5D4D5", +"` c #C7C6C6", +" . c #231F20", +".. c #B5B3B3", +"+. c #DFDEDF", +"@. c #EEEDED", +"#. c #C3C2C2", +"$. c #545050", +"%. c #5A5758", +"&. c #C7C5C6", +"*. c #F4F4F4", +"=. c #B4B2B2", +"-. c #3E3B3D", +";. c #262123", +">. c #312D2E", +",. c #D6D5D5", +"'. c #262223", +"). c #B9B8B8", +"!. c #7F7C7D", +"~. c #DCDBDB", +"{. c #ECECEC", +"]. c #9B999A", +"^. c #A2A1A1", +"/. c #D4D3D4", +"(. c #636161", +"_. c #221D1E", +":. c #939192", +"<. c #191516", +"[. c #322F2F", +"}. c #817F7F", +"|. c #FAFAFA", +"1. c #F7F7F7", +"2. c #777475", +"3. c #2F2B2C", +"4. c #3F3C3D", +"5. c #4D494A", +"6. c #929091", +"7. c #241F21", +"8. c #1A1617", +"9. c #C3C3C3", +"0. c #B8B6B6", +"a. c #1C1719", +"b. c #2B2728", +"c. c #656364", +"d. c #EFEFEF", +"e. c #8C898A", +"f. c #1A1517", +"g. c #231E1F", +"h. c #999898", +"i. c #8F8E8E", +"j. c #191416", +"k. c #BEBCBC", +"l. c #252121", +"m. c #BCBBBB", +"n. c #E3E3E3", +"o. c #635F60", +"p. c #272324", +"q. c #191415", +"r. c #999899", +"s. c #8F8C8D", +"t. c #6E6C6C", +"u. c #F3F3F3", +"v. c #2D292A", +"w. c #646263", +"x. c #E4E3E3", +"y. c #C2C1C1", +"z. c #4B4849", +"A. c #9E9E9E", +"B. c #979596", +"C. c #CDCCCD", +"D. c #E6E5E6", +"E. c #787676", +"F. c #D3D3D3", +"G. c #CAC9CA", +"H. c #171214", +"I. c #ADACAD", +"J. c #F1F0F0", +"K. c #B1B0B0", +"L. c #FAF9FA", +"M. c #BEBDBE", +"N. c #3B3738", +"O. c #211D1E", +"P. c #504C4D", +"Q. c #C4C2C3", +"R. c #BAB8B9", +"S. c #4C4849", +"T. c #423F40", +"U. c #E8E8E8", +"V. c #9C9A9B", +"W. c #292426", +"X. c #6A6768", +"Y. c #F2F1F2", +"Z. c #EFEEEE", +"`. c #605D5E", +" + c #2A2626", +".+ c #373435", +"++ c #A8A6A7", +"@+ c #DBDADB", +"#+ c #848282", +"$+ c #2A2526", +"%+ c #1B1718", +"&+ c #898686", +"*+ c #F9F9F9", +"=+ c #C9C8C9", +"-+ c #575354", +";+ c #151012", +">+ c #979595", +",+ c #8B8989", +"'+ c #151112", +")+ c #615E5F", +"!+ c #D1D0D1", +"~+ c #F1F1F1", +"{+ c #A2A0A1", +"]+ c #B2B1B1", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . + @ # $ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . % & * = - ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . > , ' ) ! ! ~ { ] ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . / ( ~ ! _ : < ! _ [ } | . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . + 1 2 3 4 5 6 7 8 9 0 _ 5 a b c ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . d e f 5 a g ] . . . $ h i j k l - . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . m n o p q r m . s t u m . m v w x . y z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . A B % C D . . E F j 4 G H I . . . J K L . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . M N O J . I P Q R S O f T U . V W X Y Z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` . .... +.@.#.$.4 a %.&.*.=.-.;.>.~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).I !.K ~.{.].^.{./.(._.! p O ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. :.<.[.}.|.1.2.3._ _ 4.5.3 ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. 6.7.3 8.9.0.a.>.b.c.d.` e [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.- . e.f.O g.h.i.T >.j.).. k.'.[ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .l.m.. n.o.p.q.r.s.q.5 t.u.. #.) [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . #.j v.w.x.. . y.z.A.B.i C.. . D.E.< T F.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . G.H.3 p.3 I.n . x J.C d.. 8 K.>.5 p <./ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . L.M.N. .p.O.P.Q.$ . . |.R.S._.5 .T.A ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . U.V.O a W._ X.Y.Z.`. +5 _..+++8 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . @+#+~ $+%+:.&+N _ [ e.D . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . *+=+-+;+>+,+'+)+!+^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . ~+t ++{+]+*.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.xpm b/Source/Core/DolphinWX/resources/Platform_Wad.xpm index fcb309cedc..a89c3a0c9c 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wad.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wad.xpm @@ -1,384 +1,382 @@ /* XPM */ -static const char *Platform_Wad_xpm[] = { +static const char * Platform_Wad_xpm[] = { "96 32 347 2", -"hX c #71CBE2", -"v. c #DADCDC", -"a c #DDDDDE", -"!. c #DDDDDF", -"} c #E0E1E1", -"i c #76777B", -")X c #62D8F4", -"go c #5CD6F5", -"a. c #ECEBEC", -">. c #EFEFEF", -"FX c #6EDCF7", -"x. c #7C7F82", -"qo c #8CE3F7", -"sX c #9EE6F8", -"Z c #F2F3F3", -"oo c #A7E9F9", -"yX c #F2F3F4", -"Bo c #AAEAFA", -"c c #828488", -"3. c #85888A", -"X c #F8F8F8", -"*X c #85888B", -"do c #D1F4FC", -"po c #CEF3FC", -"H c #88898C", -"K. c #85888C", -"gX c #D7FCFF", -"6. c #8B8D8F", -"*o c #F8FEFE", -"`X c #F2FCFF", -" o c #EFFBFF", -";X c #F5FDFF", -"M. c #9A9B9E", -"] c #B8BABB", -"z. c #BEBFC1", -", c #D6D6D8", -"N c #E8E8E9", -"BX c #58D6F4", -"vo c #6AD9F5", -"ao c #79DEF7", -"zX c #4FD9FA", -"V c #7B7D81", -" . c #F1F1F0", -"r c #7E8184", -"!X c #94E4F8", -"m. c #F1F1F2", -"IX c #9DE7FA", -"Fo c #BEEFFB", -"Do c #B5ECFB", -"` c #84868A", -".. c #FAFAF9", -"PX c #B8F0FE", -"8 c #FAFAFA", -"Ho c #DCF6FD", -"yo c #E5F9FD", -"wo c #E2F8FD", -"rX c #DFF7FD", -"3X c #E2F8FE", -"# c #FDFEFD", -"QX c #FDFEFE", -"qX c #848C92", -"6X c #8A8E92", -"r. c #8D8F93", -"_ c #909396", -"u c #96989A", -">X c #84959C", -",. c #9C9DA0", -"A c #9FA1A3", -"'. c #9FA1A4", -"2 c #ABABAD", -"D. c #AEAFB2", -"l. c #B1B3B4", -"iX c #BDBDC0", -"D c #C3C5C5", -"( c #C6C6C8", -"v c #C9CACB", -"<. c #CCCECF", -" c None", -"| c #DBDCDD", -"w. c #E1E1E2", -"> c #E4E5E5", -"EX c #60D7F5", -" X c #EDEBEC", -"RX c #72DDF6", -"8o c #69DAF6", -"+X c #F0ECED", -"Y. c #EDEEEF", -"eo c #8AE2F8", -"g. c #F3F3F4", -"0o c #ABEAFA", -"]. c #F9F8F7", -"'X c #CCF2FC", -"no c #D8F6FD", -"J c #86888C", -"HX c #E7F8FC", -"$ c #FCFCFC", -"Jo c #F0FBFE", -"_X c #DEF8FF", -"to c #F3FCFE", -"/. c #8F9194", -"k c #8F9195", -"n c #95969A", -"`. c #989A9C", -"h c #9E9FA2", -"5X c #899EA7", -"0X c #8FA6AD", -"[. c #AAACAE", -"&. c #B9BABC", -"M c #C2C3C4", -"H. c #C5C7C8", -"f. c #CBCCCD", -"c. c #D1D1D2", -"1 c #DDDEDF", -"6o c #38CEF3", -"/X c #44CFF2", -"#o c #56D5F4", -"VX c #53D4F4", -"9X c #D4E7ED", -"jo c #59D6F5", -"bX c #56D5F5", -"Y c #ECECED", -".X c #F2EEEF", -"-. c #EFF0F0", -"LX c #74DCF7", -"aX c #80E0F8", -"7o c #7DDFF8", -"#X c #7F8184", -"xo c #95E4F8", -"o c #88E1F7", -"5o c #91E4F8", -"TX c #8BE2F8", -"pX c #F1F2F3", -".o c #9AE7F9", -"+. c #818387", -"YX c #B5EDFA", -"S. c #818388", -"R c #F7F7F7", -"Q c #F7F7F8", -"o c #FAFBFA", -"* c #FAFBFB", -"[ c #8A8C8E", -"WX c #EEFAFD", -"R. c #8A8C8F", -"W. c #909194", -"^. c #9C9EA1", -"V. c #A2A3A6", -";. c #A5A7A9", -"/ c #AEB0B1", -"U. c #B4B5B7", -"' c #BDBEC0", -"t c #C0C2C4", -"OX c #CCCCCD", -"C c #CCCCCE", -"j. c #CFD0D1", -"jX c #A5CBD6", -"P c #D5D5D6", -"f c #DBDDDC", -"t. c #E1E2E3", -"y c #E7E7E9", -"1o c #57D5F4", -"%o c #54D4F4", -":o c #66DAF6", -"4X c #CFE8EF", -"B. c #EDECED", -"nX c #45D5F9", -"4 c #F0F0F0", -"^X c #72DEF9", -"&o c #9FE7F8", -"s c #808184", -"(X c #99E5F8", -"d. c #7D8084", -"i. c #838588", -"2X c #F0F6F7", -"^ c #838589", -"Mo c #C0EFFB", -"Lo c #C3F0FC", -". c #F9F9FA", -"tX c #E7F9FD", -"L c #FFFEFE", -"d c #8C8E91", -"Q. c #929397", -"(. c #959799", -"XX c #9B999C", -"B c #989B9E", -"s. c #9EA0A3", -"$. c #A7A9AB", -"0 c #ADAEB1", -"A. c #C8C9CA", -"$X c #CECECF", -"q c #D1D2D4", -"wX c #CBD3D7", -"J. c #D7D7D8", -"o. c #DADBDB", -"fo c #50D4F4", -"j c #76797C", -"UX c #5FD6F4", -"Xo c #56D6F5", -"ZX c #7ADCF4", -"lX c #56D9FA", -"|X c #98E6F8", -"=o c #92E4F8", -"AX c #D4EEF5", -"CX c #86E3FA", -"Oo c #AAE9F9", -"Go c #B3ECFA", -"#. c #F5F6F6", -"m c #828688", -"]X c #B0EBFB", -"oX c #85878A", -"Po c #CEF2FC", -") c #85878B", -"! c #FBFBFB", -"co c #D1F3FD", -"JX c #D1F6FE", -"KX c #F8FDFE", -"}. c #8B8C8F", -"Ao c #F8FDFF", -"%. c #8B8C90", -"I c #8E9092", -"b. c #8E9094", -"U c #97999B", -"9. c #97999C", -"e. c #97999D", -"6 c #A3A6A9", -"3 c #BBBDBE", -"9 c #C1C2C4", -"p. c #CACBCC", -"- c #D9D9DA", -"8. c #DFDEE0", -"9o c #31CBF2", -"SX c #46D2F5", -"mo c #5ED7F4", -"~. c #EBEBEB", -"$o c #64D9F5", -"5. c #EBEBEC", -"2o c #88E2F7", -"1X c #DFEDF1", -"k. c #818486", -"< c #F4F4F5", -"Ko c #C7F1FB", -"@ c #F7F8F8", -"Vo c #CDF3FC", -"4o c #C7F1FC", -":. c #87898C", -"{. c #8A8A8D", -"-X c #EEFBFE", -"ro c #E8F9FE", -"x c #909295", -"7. c #909296", -"*. c #939698", -",X c #8A9398", -"u. c #96979B", -"n. c #999B9E", -"@. c #9FA0A3", -"h. c #A2A4A6", -"L. c #B1B2B5", -"~ c #B4B6B8", -"%X c #BDBFC1", -"N. c #CCCDCE", -"7X c #CCD0D2", -"T. c #DBDBDD", -"X. c #E4E4E4", -"l c #E4E4E6", -"so c #33CDF3", -"E c #E7E8E8", -"w c #E7E8E9", -"xX c #C0E1EB", -"No c #48D1F4", -"T c #EAE9EA", -"zo c #45D0F4", -"kX c #4ED6F6", -"g c #EDEDED", -"1. c #EDEDEE", -"b c #EDEDEF", -";o c #78DEF7", -"}X c #8DE2F7", -"3o c #93E4F8", -"&X c #808286", -"{X c #B1EBF9", -"G. c #838688", -"io c #B7EDFA", -",o c #B7EDFB", -"DX c #C9F3FC", -"& c #F9FAFA", -"fX c #C6F8FF", -"Zo c #D8F5FD", -"S c #898B8E", -": c #FFFFFE", -"bo c #F9FDFF", -"O c #FFFFFF", -"G c #8C8F92", -"E. c #929498", -"{ c #A1A2A5", -"q. c #AAABAE", -" , < ", -"1 2 3 4 O O + 5 6 7 8 O O . 9 0 q w e r t O y u i p ", -"a s d f O O g h j k l O O z x c v b n m M O N B V C ", -"Z A S D O O F G H J K L O P I U Y O T a R O O E W Q ", -"! ~ ^ / O O ( ) _ ` ' & O ] [ { + 8 } | .O ..X.o.4 ", -"O O.+.@.#.X $.%.&.*.=.-.: ;.:.M O >.,.[ <.O 1.2.3.4. ", -"O 5.6.7.8.z e 9.0.q.` w.N e.r.t.O y.u.i.p.O a.s.d.f. ", -"O g.h.:.j.a k.l.+ z.x.c.v.b.n.m.O z M.:.N.O B.V.C.Z. ", -"O $ A.S.D.F.G.H.O J.K.L.P.I.U.$ O Y.M.:.N.O B.V.C.Z. ", -"O O T.R.E.W.Q.!.O ~.^./.(.)._.+ O z M.:.N.O B.V.C.Z. ", -"O O z `.I.:.'.Y.O ].[.{.}.|. XO O .XXXoXOXO +X@X#X$X ", -"O O 8 %X&X*X=XO -X;X:X>X,Xo,oO QX c #E5E5E5", +", c #D9D9DA", +"' c #F5F5F5", +") c #FFFFFE", +"! c #E4E5E5", +"~ c #D6D6D8", +"{ c #F4F4F5", +"] c #DDDEDF", +"^ c #ABABAD", +"/ c #BBBDBE", +"( c #F0F0F0", +"_ c #D3D3D5", +": c #A3A6A9", +"< c #C7C9CA", +"[ c #FAFAFA", +"} c #C1C2C4", +"| c #ADAEB1", +"1 c #D1D2D4", +"2 c #E7E8E9", +"3 c #919396", +"4 c #7E8184", +"5 c #C0C2C4", +"6 c #E7E7E9", +"7 c #96989A", +"8 c #76777B", +"9 c #CACACC", +"0 c #DDDDDE", +"a c #808184", +"b c #8C8E91", +"c c #DBDDDC", +"d c #EDEDED", +"e c #9E9FA2", +"f c #76797C", +"g c #8F9195", +"h c #E4E4E6", +"i c #EEEEEF", +"j c #909295", +"k c #828488", +"l c #C9CACB", +"m c #EDEDEF", +"n c #95969A", +"o c #828688", +"p c #C2C3C4", +"q c #E8E8E9", +"r c #989B9E", +"s c #7B7D81", +"t c #CCCCCE", +"u c #F2F3F3", +"v c #9FA1A3", +"w c #898B8E", +"x c #C3C5C5", +"y c #D6D7D9", +"z c #8C8F92", +"A c #88898C", +"B c #86888C", +"C c #CECFD1", +"D c #FFFEFE", +"E c #D5D5D6", +"F c #8E9092", +"G c #97999B", +"H c #ECECED", +"I c #EAE9EA", +"J c #F7F7F7", +"K c #E7E8E8", +"L c #DCDCDD", +"M c #F7F7F8", +"N c #FBFBFB", +"O c #B4B6B8", +"P c #838589", +"Q c #AEB0B1", +"R c #C6C6C8", +"S c #85878B", +"T c #909396", +"U c #84868A", +"V c #BDBEC0", +"W c #B8BABB", +"X c #8A8C8E", +"Y c #A1A2A5", +"Z c #E0E1E1", +"` c #DBDCDD", +" . c #F1F1F0", +".. c #FAFAF9", +"+. c #E4E4E4", +"@. c #DADBDB", +"#. c #D4D4D5", +"$. c #818387", +"%. c #9FA0A3", +"&. c #F5F6F6", +"*. c #A7A9AB", +"=. c #8B8C90", +"-. c #B9BABC", +";. c #939698", +">. c #9A9C9F", +",. c #EFF0F0", +"'. c #A5A7A9", +"). c #87898C", +"!. c #EFEFEF", +"~. c #9C9DA0", +"{. c #CCCECF", +"]. c #EDEDEE", +"^. c #A3A5A7", +"/. c #85888A", +"(. c #CECFCF", +"_. c #EBEBEC", +":. c #8B8D8F", +"<. c #909296", +"[. c #DFDEE0", +"}. c #97999C", +"|. c #E5E5E6", +"1. c #AAABAE", +"2. c #E1E1E2", +"3. c #97999D", +"4. c #8D8F93", +"5. c #E1E2E3", +"6. c #EEEEEE", +"7. c #96979B", +"8. c #838588", +"9. c #CACBCC", +"0. c #ECEBEC", +"a. c #9EA0A3", +"b. c #7D8084", +"c. c #CBCCCD", +"d. c #F3F3F4", +"e. c #A2A4A6", +"f. c #CFD0D1", +"g. c #818486", +"h. c #B1B3B4", +"i. c #BEBFC1", +"j. c #7C7F82", +"k. c #D1D1D2", +"l. c #DADCDC", +"m. c #8E9094", +"n. c #999B9E", +"o. c #F1F1F2", +"p. c #9A9B9E", +"q. c #CCCDCE", +"r. c #EDECED", +"s. c #A2A3A6", +"t. c #828588", +"u. c #CDCECF", +"v. c #C8C9CA", +"w. c #818388", +"x. c #AEAFB2", +"y. c #B8B8BA", +"z. c #838688", +"A. c #C5C7C8", +"B. c #D7D7D8", +"C. c #85888C", +"D. c #B1B2B5", +"E. c #B5B7B9", +"F. c #888A8D", +"G. c #B4B5B7", +"H. c #EDEEEF", +"I. c #DBDBDD", +"J. c #8A8C8F", +"K. c #929498", +"L. c #909194", +"M. c #929397", +"N. c #DDDDDF", +"O. c #EBEBEB", +"P. c #9C9EA1", +"Q. c #8F9194", +"R. c #959799", +"S. c #888A8E", +"T. c #CECFD2", +"U. c #989A9C", +"V. c #9FA1A4", +"W. c #F9F8F7", +"X. c #AAACAE", +"Y. c #8A8A8D", +"Z. c #8B8C8F", +"`. c #8E8F93", +" + c #EDEBEC", +".+ c #F2EEEF", +"++ c #9B999C", +"@+ c #85878A", +"#+ c #CCCCCD", +"$+ c #F0ECED", +"%+ c #A3A2A4", +"&+ c #7F8184", +"*+ c #CECECF", +"=+ c #BDBFC1", +"-+ c #808286", +";+ c #85888B", +">+ c #BEC0C1", +",+ c #EEFBFE", +"'+ c #F5FDFF", +")+ c #CBCBCD", +"!+ c #84959C", +"~+ c #8A9398", +"{+ c #B3B4B6", +"]+ c #DFEDF1", +"^+ c #F0F6F7", +"/+ c #E2F8FE", +"(+ c #CFE8EF", +"_+ c #899EA7", +":+ c #8A8E92", +"<+ c #CCD0D2", +"[+ c #E9FAFF", +"}+ c #D4E7ED", +"|+ c #8FA6AD", +"1+ c #848C92", +"2+ c #CBD3D7", +"3+ c #E3F8FD", +"4+ c #DFF7FD", +"5+ c #E7F9FD", +"6+ c #F2F3F4", +"7+ c #B9B9BD", +"8+ c #BDBDC0", +"9+ c #F1F2F3", +"0+ c #80E0F8", +"a+ c #9EE6F8", +"b+ c #5FDEFD", +"c+ c #C6F8FF", +"d+ c #D7FCFF", +"e+ c #71CBE2", +"f+ c #A5CBD6", +"g+ c #4ED6F6", +"h+ c #56D9FA", +"i+ c #4FD9FA", +"j+ c #C0E1EB", +"k+ c #CBF6FF", +"l+ c #52D8F9", +"m+ c #56D5F5", +"n+ c #45D5F9", +"o+ c #A7F0FF", +"p+ c #98E8FC", +"q+ c #67D9F6", +"r+ c #58D6F4", +"s+ c #53D4F4", +"t+ c #86E3FA", +"u+ c #7ADCF4", +"v+ c #D4EEF5", +"w+ c #46D2F5", +"x+ c #C9F3FC", +"y+ c #6EDCF7", +"z+ c #AFE5F4", +"A+ c #E7F8FC", +"B+ c #D1F6FE", +"C+ c #F8FDFE", +"D+ c #74DCF7", +"E+ c #B8F0FE", +"F+ c #9DE7FA", +"G+ c #5FD6F4", +"H+ c #B5EDFA", +"I+ c #8BE2F8", +"J+ c #72DDF6", +"K+ c #60D7F5", +"L+ c #EEFAFD", +"M+ c #FDFEFE", +"N+ c #94E4F8", +"O+ c #70DCF8", +"P+ c #72DEF9", +"Q+ c #44CFF2", +"R+ c #99E5F8", +"S+ c #62D8F4", +"T+ c #DEF8FF", +"U+ c #F2FCFF", +"V+ c #CCF2FC", +"W+ c #B0EBFB", +"X+ c #61D7F5", +"Y+ c #B1EBF9", +"Z+ c #8DE2F7", +"`+ c #98E6F8", +" @ c #EFFBFF", +".@ c #9AE7F9", +"+@ c #56D6F5", +"@@ c #A7E9F9", +"#@ c #AAE9F9", +"$@ c #6ADAF6", +"%@ c #98E5F9", +"&@ c #56D5F4", +"*@ c #64D9F5", +"=@ c #54D4F4", +"-@ c #9FE7F8", +";@ c #F8FEFE", +">@ c #92E4F8", +",@ c #70DCF6", +"'@ c #78DEF7", +")@ c #66DAF6", +"!@ c #88E1F7", +"~@ c #B7EDFB", +"{@ c #92E3F8", +"]@ c #57D5F4", +"^@ c #88E2F7", +"/@ c #93E4F8", +"(@ c #C7F1FC", +"_@ c #91E4F8", +":@ c #38CEF3", +"<@ c #7DDFF8", +"[@ c #69DAF6", +"}@ c #31CBF2", +"|@ c #ABEAFA", +"1@ c #8CE3F7", +"2@ c #E2F8FD", +"3@ c #8AE2F8", +"4@ c #E8F9FE", +"5@ c #F3FCFE", +"6@ c #E5F9FD", +"7@ c #6DDBF5", +"8@ c #B7EDFA", +"9@ c #CEF3FC", +"0@ c #79DEF7", +"a@ c #33CDF3", +"b@ c #D1F4FC", +"c@ c #50D4F4", +"d@ c #5CD6F5", +"e@ c #E3F8FE", +"f@ c #59D6F5", +"g@ c #6DDBF6", +"h@ c #9BE6FA", +"i@ c #45D0F4", +"j@ c #95E4F8", +"k@ c #D1F3FD", +"l@ c #6AD9F5", +"m@ c #F9FDFF", +"n@ c #D8F6FD", +"o@ c #5ED7F4", +"p@ c #C0EFFB", +"q@ c #48D1F4", +"r@ c #AAEAFA", +"s@ c #CDF3FC", +"t@ c #BFEFFB", +"u@ c #D8F5FD", +"v@ c #F8FDFF", +"w@ c #C5F1FB", +"x@ c #B5ECFB", +"y@ c #BEEFFB", +"z@ c #B3ECFA", +"A@ c #DCF6FD", +"B@ c #F0FBFE", +"C@ c #C7F1FB", +"D@ c #C3F0FC", +"E@ c #CEF2FC", +"F@ c #ECFBFE", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . + @ # . . . . $ % & . . . . * = - ; > , ' . ) ! ~ { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . ] ^ / ( . . $ _ : < [ . . + } | 1 2 3 4 5 . 6 7 8 9 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . 0 a b c . . d e f g h . . i j k l m n o p . q r s t . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . u v w x . . y z A B C D . E F G H . I 0 J . . K L M . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . N O P Q . . R S T U V - . W X Y $ [ Z ` .. ..+.@.( . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . #.$.%.&.@ *.=.-.;.>.,.) '.).p . !.~.X {.. ].^./.(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . _.:.<.[.i 3 }.|.1.U 2.q 3.4.5.. 6.7.8.9.. 0.a.b.c.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . d.e.).f.0 g.h.$ i.j.k.l.m.n.o.. i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . * v.w.x.y.z.A.. B.C.D.E.F.G.* . H.p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . I.J.K.L.M.N.. O.P.Q.R.S.T.$ . i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . i U.F.).V.H.. W.X.Y.Z.`. +. . .+++@+#+. $+%+&+*+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . [ =+-+;+>+. ,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . 6+7+8+9+. 0+a+. b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+q+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+. @.@+@@@#@$@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . %@s+&@*@=@-@;@>@,@'@)@V+!@~@. M+{@]@^@/@(@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . _@:@<@[@}@3+|@1@2@W+3@4@3@5@. 6@7@8@. 9@4+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . 0@a@b@c@d@e@f@g@h@i@j@k@l@m@. n@o@/@p@q@r@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . s@t@. (@u@v@w@x@y@z@A@B@C@v@. B@(@D@E@p@F@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.xpm b/Source/Core/DolphinWX/resources/Platform_Wii.xpm index eb163b80f0..c9781b427f 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wii.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wii.xpm @@ -1,195 +1,192 @@ /* XPM */ -static const char *Platform_Wii_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 187 2", -":. c #C5C6C8", -"V c #D4D5D6", -"k c #E3E4E4", -"w. c #CACACC", -"5. c #E8E8E9", -"5 c #F7F7F8", -"8 c #8C8E91", -".X c #AAACAF", -"+. c #AFB0B2", -"= c #DCDDDE", -"L. c #EBECED", -"H c #FAFBFB", -"%. c #F0F0F0", -"J. c #F0F0F1", -"+ c #FFFFFF", -"O. c #808386", -"U. c #8F9294", -"0. c #85878A", -"S. c #949698", -"K. c #949699", -"2. c #B2B4B6", -"!. c #A8A9AC", -"z. c #B7B8BA", -"S c #C6C7C8", -"7. c #D5D6D7", -"P c #F3F4F4", -") c #E9E9E9", -"m. c #E9E9EB", -"% c #F8F8F8", -"n. c #F8F8F9", -"p. c #888B8D", -"h c #7E8084", -"n c #8D8F92", -"k. c #9C9EA0", -"8. c #8D8F93", -"u c #BABCBE", -"} c #E2E2E2", -"N c #E2E2E3", -"( c #F1F1F1", -">. c #818487", -"x. c #818488", -"K c #86888B", -"A. c #959799", -"<. c #86888C", -"r. c #95979A", -"j. c #8B8C8F", -"v c #B3B5B7", -"9. c #A9AAAD", -", c #C7C8C9", -"* c #E5E6E7", -"*. c #F9F9F9", -"Q. c #7F8184", -",. c #8E9092", -"B c #8E9093", -"U c #9D9FA3", -"R. c #A2A3A6", -"[ c #CFD0D0", -"e c #C0C1C3", -"d c #EDEEEE", -"(. c #FCFDFD", -"b c #87898C", -"/ c #96989A", -"^ c #87898D", -"t c #96989B", -"L c #A5A7A9", -"- c #E6E7E8", -"X c #DCDCDD", -"]. c #FAFAFA", -"e. c #8A8D90", -"N. c #8F9194", -"d. c #9EA0A3", -"{. c #9EA0A4", -"=. c #A3A4A7", -" X c #A3A4A8", -"s. c #CBCDCE", -"| c #C1C2C3", -"o c #DFE0E0", -"Z c #C6C6C8", -" c None", -"|. c #D5D5D7", -"R c #E4E4E5", -"XX c #F3F3F3", -"! c #F3F3F4", -"O c #F8F7F7", -"#. c #838689", -"' c #888A8D", -"x c #888A8E", -"Q c #97999C", -";. c #A6A8AA", -"c c #C4C6C6", -"@. c #C4C6C7", -"b. c #BABBBD", -"4. c #C9CACB", -"P. c #C9CACC", -"1. c #BFBFC2", -"; c #F6F7F7", -"r c #ECECED", -"f c #FBFBFB", -"T. c #FBFBFC", -"p c #909296", -"7 c #86878A", -"{ c #BDBFC0", -"] c #A4A5A8", -"_ c #D1D2D4", -"D c #E0E1E1", -"~. c #C7C7C9", -"Y. c #EFF0F0", -"I c #F4F4F4", -"f. c #F4F4F5", -"w c #84878A", -"s c #939699", -"W c #898B8E", -"6. c #898B8F", -"B. c #989A9D", -"g. c #989A9E", -"` c #A7A9AB", -"^. c #8E8F93", -" . c #C5C7C7", -"E. c #ACADAF", -"[. c #BBBCBF", -"c. c #C0C0C2", -"6 c #D9DADB", -"0 c #DEDEDF", -". c #EDEDEE", -"@ c #FCFCFC", -"a c #7D8083", -"j c #828487", -"F c #9B9EA1", -"z c #96979A", -"`. c #A5A6A8", -"W. c #A5A6A9", -"y. c #B4B5B7", -"Z. c #D2D3D4", -"2 c #E1E2E2", -"h. c #C8C8CA", -"# c #E1E2E3", -"l. c #F0F1F2", -"). c #E6E6E7", -"M c #F5F5F6", -"Y c #8A8C8F", -"X. c #8A8C90", -"3 c #999B9D", -"A c #999B9E", -"q. c #ADAEB0", -"&. c #CBCCCD", -"G. c #CBCCCE", -"$ c #DADBDC", -"/. c #F8F9F9", -"l c #EEEEEE", -"'. c #EEEEEF", -"< c #FDFDFD", -"C c #FDFDFE", -"3. c #7E8184", -"u. c #838588", -"M. c #929496", -"y c #838589", -"H. c #929497", -"V. c #88898C", -"i. c #B0B2B3", -"J c #B0B2B4", -"> c #97989B", -"C. c #B5B6B9", -"~ c #C4C5C6", -"9 c #D3D4D4", -"4 c #ABABAF", -"D. c #D3D4D6", -".. c #E7E7E7", -"G c #F6F6F7", -"-. c #7C7E81", -"o. c #8B8D90", -"a. c #9A9C9E", -"q c #8B8D91", -"m c #9A9C9F", -"$. c #A9ABAD", -"v. c #A9ABAE", -"E c #BDBEBF", -"g c #AEAFB2", -"}. c #BDBEC1", -"t. c #EAEBEB", -"i c #EFEFF0", -"& c #FEFEFE", -"1 c #FEFEFF", -"I. c #848689", -"T c #8E9195", -"F. c #A2A4A6", -"_. c #A2A4A7", -": c #C5C6C7", -/* pixels */ +static const char * Platform_Wii_xpm[] = { +"96 32 186 2", +" c #FFFFFF", +". c #EDEDEE", +"+ c #DCDCDD", +"@ c #DFE0E0", +"# c #F8F7F7", +"$ c #FCFCFC", +"% c #E1E2E3", +"& c #DADBDC", +"* c #F8F8F8", +"= c #FEFEFE", +"- c #E5E6E7", +"; c #DCDDDE", +"> c #E6E7E8", +", c #F6F7F7", +"' c #C5C6C7", +") c #97989B", +"! c #C7C8C9", +"~ c #FDFDFD", +"{ c #FEFEFF", +"] c #E1E2E2", +"^ c #999B9D", +"/ c #ABABAF", +"( c #F7F7F8", +"_ c #D9DADB", +": c #86878A", +"< c #8C8E91", +"[ c #D3D4D4", +"} c #DEDEDF", +"| c #8B8D91", +"1 c #84878A", +"2 c #C0C1C3", +"3 c #ECECED", +"4 c #96989B", +"5 c #838589", +"6 c #BABCBE", +"7 c #EFEFF0", +"8 c #909296", +"9 c #7D8083", +"0 c #939699", +"a c #EDEEEE", +"b c #FBFBFB", +"c c #AEAFB2", +"d c #7E8084", +"e c #828487", +"f c #E3E4E4", +"g c #EEEEEE", +"h c #96979A", +"i c #888A8E", +"j c #C4C6C6", +"k c #B3B5B7", +"l c #87898C", +"m c #8D8F92", +"n c #9A9C9F", +"o c #F5F5F6", +"p c #E2E2E3", +"q c #8E9093", +"r c #D4D5D6", +"s c #FDFDFE", +"t c #C6C6C8", +"u c #999B9E", +"v c #C6C7C8", +"w c #E0E1E1", +"x c #9B9EA1", +"y c #F6F6F7", +"z c #FAFBFB", +"A c #B0B2B4", +"B c #86888B", +"C c #A5A7A9", +"D c #F3F4F4", +"E c #F4F4F4", +"F c #9D9FA3", +"G c #8A8C8F", +"H c #8E9195", +"I c #E4E4E5", +"J c #BDBEBF", +"K c #898B8E", +"L c #97999C", +"M c #F3F3F4", +"N c #C4C5C6", +"O c #87898D", +"P c #96989A", +"Q c #F1F1F1", +"R c #E9E9E9", +"S c #D1D2D4", +"T c #A7A9AB", +"U c #888A8D", +"V c #A4A5A8", +"W c #CFD0D0", +"X c #BDBFC0", +"Y c #E2E2E2", +"Z c #C1C2C3", +"` c #C5C7C7", +" . c #E7E7E7", +".. c #8A8C90", +"+. c #8B8D90", +"@. c #808386", +"#. c #AFB0B2", +"$. c #C4C6C7", +"%. c #838689", +"&. c #A9ABAD", +"*. c #F0F0F0", +"=. c #CBCCCD", +"-. c #F9F9F9", +";. c #A3A4A7", +">. c #7C7E81", +",. c #A6A8AA", +"'. c #C5C6C8", +"). c #818487", +"!. c #8E9092", +"~. c #86888C", +"{. c #BFBFC2", +"]. c #B2B4B6", +"^. c #7E8184", +"/. c #C9CACB", +"(. c #E8E8E9", +"_. c #898B8F", +":. c #D5D6D7", +"<. c #8D8F93", +"[. c #A9AAAD", +"}. c #85878A", +"|. c #ADAEB0", +"1. c #CACACC", +"2. c #8A8D90", +"3. c #95979A", +"4. c #EAEBEB", +"5. c #B4B5B7", +"6. c #838588", +"7. c #B0B2B3", +"8. c #888B8D", +"9. c #9A9C9E", +"0. c #CBCDCE", +"a. c #9EA0A3", +"b. c #F4F4F5", +"c. c #989A9E", +"d. c #C8C8CA", +"e. c #8B8C8F", +"f. c #9C9EA0", +"g. c #F0F1F2", +"h. c #B7B8BA", +"i. c #818488", +"j. c #C0C0C2", +"k. c #A9ABAE", +"l. c #BABBBD", +"m. c #F8F8F9", +"n. c #E9E9EB", +"o. c #929496", +"p. c #8F9194", +"q. c #989A9D", +"r. c #88898C", +"s. c #B5B6B9", +"t. c #D2D3D4", +"u. c #959799", +"v. c #949698", +"w. c #D3D4D6", +"x. c #A2A4A6", +"y. c #CBCCCE", +"z. c #929497", +"A. c #F0F0F1", +"B. c #949699", +"C. c #EBECED", +"D. c #C9CACC", +"E. c #848689", +"F. c #8F9294", +"G. c #EFF0F0", +"H. c #FBFBFC", +"I. c #A2A3A6", +"J. c #ACADAF", +"K. c #A5A6A9", +"L. c #7F8184", +"M. c #A8A9AC", +"N. c #C7C7C9", +"O. c #8E8F93", +"P. c #F8F9F9", +"Q. c #FCFDFD", +"R. c #E6E6E7", +"S. c #A2A4A7", +"T. c #A5A6A8", +"U. c #EEEEEF", +"V. c #FAFAFA", +"W. c #BBBCBF", +"X. c #9EA0A4", +"Y. c #BDBEC1", +"Z. c #D5D5D7", +"`. c #A3A4A8", +" + c #AAACAF", +".+ c #F3F3F3", " ", " ", " ", @@ -199,19 +196,20 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -". X o O + + + @ # $ % + + + & * = - ; : > , < 1 2 3 4 5 ", -"6 7 8 9 + + + 0 q w e + + + r t y u i p a s d f g h j k ", -"l z x c < + f v b n m M + + N 8 B V C Z A S @ & D F g G ", -"H J K L P + I U Y B T R + < E W Q ! + f I f + + & I % + ", -"+ ~ ^ / ( + ) q s A b _ < & ` ' ] & @ [ { 9 + + } | .P ", -"+ ..X.o.$ + , O.+.@.#.$.< %.z ' &.& *.=.-.;.+ + :.>.,.) ", -"+ 5 3 <.1.f 2.3.4.5.6.t ( 7.8.p - + *.9.0.q.+ + w.e.r.t. ", -"+ f y.u.i.( 3 p.5.G a.<.R s.<.d.f.+ *.9.0.q.+ + w.e.r.t. ", -"+ & $ <.g.h.j.k.l.@ z.x.c.v.K b.& + n.9.0.q.+ + w.e.r.t. ", -"+ + m.M.N.B.V.C.< + Z.o.A.S.6.D.+ + *.9.0.q.+ + w.e.r.t. ", -"+ + f F.Y N.' G.+ + k H.n B p J.+ + *.9.0.q.+ + w.e.K.L. ", -"+ + + P.I.x U.Y.+ + T.R.<.K E.n.+ + n.W.Q.!.+ + ~.w ^.i ", -"+ + + /.C.m Z.(.+ + + )._.`.'.+ + + ].[.{.}.+ + |. X.XXX ", +" ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( ", +" _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f ", +" g h i j ~ b k l m n o p < q r s t u v $ = w x c y ", +" z A B C D E F G q H I ~ J K L M b E b = E * ", +" N O P Q R | 0 u l S ~ = T U V = $ W X [ Y Z ` D ", +" ...+.& ! @.#.$.%.&.~ *.h U =.= -.;.>.,. '.).!.R ", +" ( ^ ~.{.b ].^./.(._.4 Q :.<.8 > -.[.}.|. 1.2.3.4. ", +" b 5.6.7.Q ^ 8.(.y 9.~.I 0.~.a.b. -.[.}.|. 1.2.3.4. ", +" = & ~.c.d.e.f.g.$ h.i.j.k.B l.= m.[.}.|. 1.2.3.4. ", +" n.o.p.q.r.s.~ t.+.u.v._.w. -.[.}.|. 1.2.3.4. ", +" b x.G p.U y. f z.m q 8 A. -.[.}.|. 1.2.B.C. ", +" D.E.i F.G. H.I.~.B J.m. m.K.L.M. N.1 O.7 ", +" P.s.n t.Q. R.S.T.U. V.W.X.Y. Z.`. +.+ ", " ", " ", " ", @@ -220,6 +218,4 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -" ", -" " -}; +" "}; diff --git a/Source/Core/DolphinWX/resources/Vista.h b/Source/Core/DolphinWX/resources/Vista.h deleted file mode 100644 index af66498caf..0000000000 --- a/Source/Core/DolphinWX/resources/Vista.h +++ /dev/null @@ -1,2751 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_1_H_ -#define _WXINCLUDE_MYHEADER_1_H_ - -static const unsigned char Toolbar_Browse1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0xE7, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x6D, 0x68, 0x5B, 0x55, 0x18, -0x7E, 0xCF, 0x39, 0xF7, 0x2B, 0x1F, 0xB7, 0x89, 0x69, 0x12, -0x93, 0xB2, 0x76, 0x6D, 0xA2, 0xC6, 0xD6, 0xA4, 0x5D, 0xD3, -0xD0, 0x3A, 0x59, 0x41, 0xD0, 0x49, 0xD7, 0x6D, 0xB0, 0xA9, -0x9B, 0x53, 0x51, 0xFC, 0xA1, 0xA2, 0x7F, 0x64, 0x3A, 0x29, -0x22, 0x4C, 0x87, 0xB0, 0xE1, 0x10, 0x3A, 0xFD, 0xE1, 0xC7, -0xE8, 0x0F, 0xB1, 0x6C, 0x0A, 0x9D, 0x1F, 0xC8, 0x56, 0x70, -0x2A, 0x3A, 0x36, 0x3F, 0x26, 0xFE, 0xD0, 0x29, 0xEA, 0x7E, -0xA8, 0xC8, 0x1C, 0x43, 0x9D, 0x73, 0x49, 0x9B, 0x5C, 0xD3, -0xDC, 0xDC, 0x73, 0x7C, 0xCF, 0x8D, 0x83, 0x75, 0x36, 0xEB, -0x1D, 0xEE, 0xC0, 0xC3, 0x79, 0x73, 0x73, 0xDE, 0xE7, 0x79, -0xBF, 0xCE, 0xBD, 0x00, 0x97, 0xB0, 0xFE, 0x7C, 0xA1, 0xE7, -0xBE, 0xD3, 0xE3, 0xCB, 0xD6, 0xFC, 0xF1, 0xC1, 0x43, 0xCC, -0xAB, 0x0F, 0xF1, 0x7A, 0xF0, 0xC8, 0x13, 0xDD, 0xB4, 0x53, -0x58, 0x27, 0x59, 0xAC, 0x23, 0x11, 0x7F, 0xE0, 0xC1, 0x4D, -0x4A, 0xE8, 0x9E, 0x29, 0x2F, 0x7E, 0xD4, 0xAB, 0xC0, 0x35, -0xA6, 0x92, 0xAB, 0x9E, 0xB4, 0x92, 0x46, 0xE6, 0x6A, 0xA0, -0x1A, 0x19, 0xF5, 0xEA, 0xE7, 0x39, 0xD5, 0xCD, 0xFD, 0x2D, -0xF7, 0xD6, 0x2B, 0x73, 0x37, 0xC7, 0xEE, 0x58, 0x09, 0x2C, -0xA8, 0xC7, 0xEF, 0xDF, 0x58, 0xD8, 0xB5, 0xEB, 0x95, 0x43, -0x8B, 0xFA, 0x79, 0xCE, 0x80, 0xF3, 0xFA, 0x4A, 0x23, 0x15, -0x24, 0x6A, 0x3C, 0x88, 0x3F, 0xCA, 0xC9, 0x64, 0x1C, 0xFA, -0xBC, 0xF8, 0x29, 0x5E, 0x0E, 0xFD, 0xF8, 0x5C, 0x9F, 0x9F, -0xCD, 0x9E, 0x5D, 0x11, 0x18, 0x58, 0x0A, 0x50, 0x9F, 0x91, -0x8F, 0x08, 0x11, 0x7F, 0x8F, 0xE0, 0xFE, 0xF5, 0x65, 0x11, -0x88, 0x46, 0x60, 0xD8, 0x0E, 0x11, 0xC3, 0x97, 0x6A, 0x15, -0x60, 0x97, 0x24, 0xBF, 0x00, 0xA7, 0xB6, 0x0A, 0x8D, 0x67, -0x2F, 0x8B, 0x00, 0x6D, 0xA9, 0xDF, 0xE2, 0x0B, 0x6B, 0x84, -0x99, 0x3E, 0x10, 0xB5, 0x19, 0x41, 0xE4, 0xF4, 0x09, 0xB1, -0xBC, 0xF4, 0xFA, 0xF0, 0x70, 0xF9, 0x9B, 0xDF, 0x52, 0x40, -0x9D, 0x5E, 0x35, 0xCE, 0x72, 0x46, 0x87, 0x91, 0xD5, 0xDB, -0xA2, 0xDF, 0x12, 0x1A, 0x19, 0xD3, 0x06, 0xDF, 0x3A, 0xE6, -0x49, 0xE0, 0xCC, 0xDE, 0x6C, 0x48, 0x6D, 0x75, 0x46, 0x58, -0xD4, 0x87, 0x71, 0xDB, 0x00, 0x35, 0xFB, 0x9C, 0xAC, 0x02, -0x06, 0x3F, 0x1C, 0x1C, 0x6A, 0x03, 0x3D, 0x61, 0x0A, 0x25, -0x6C, 0x12, 0xC2, 0x34, 0x00, 0x9B, 0x9B, 0x4E, 0xA9, 0xE2, -0x9C, 0xF3, 0x9F, 0x77, 0x0F, 0x4E, 0xED, 0xE8, 0x8B, 0x28, -0x50, 0xEF, 0x17, 0xCC, 0xCE, 0x2B, 0x61, 0x18, 0x50, 0x23, -0x34, 0x4F, 0x45, 0x25, 0xAD, 0x46, 0x14, 0xA2, 0xB4, 0xB5, -0xE3, 0xCC, 0x05, 0x1A, 0x1E, 0x32, 0x07, 0x69, 0xC8, 0x9D, -0xE3, 0x9C, 0x88, 0x7F, 0x51, 0x27, 0x8E, 0x53, 0xAE, 0xDE, -0xAA, 0xAD, 0x98, 0xDE, 0x3F, 0x4F, 0xE0, 0xD7, 0x6D, 0xBD, -0x99, 0xCA, 0xF7, 0xA7, 0xA7, 0xFD, 0x49, 0xB5, 0xCB, 0xDF, -0xE9, 0xA7, 0x7A, 0xC2, 0x10, 0x5A, 0x44, 0x27, 0x2C, 0xEC, -0x07, 0xA2, 0x33, 0x41, 0x28, 0x27, 0xB2, 0xEC, 0x2E, 0x90, -0x4A, 0xFA, 0x09, 0x41, 0x04, 0xE1, 0x14, 0x77, 0x0A, 0x82, -0x53, 0x01, 0x78, 0x84, 0x97, 0xEB, 0x8F, 0x6B, 0x37, 0x7E, -0x38, 0x7E, 0x7E, 0xD0, 0xAE, 0xC0, 0x77, 0x5B, 0x7B, 0xB5, -0x50, 0xD5, 0x7A, 0x4A, 0x4F, 0xB0, 0xB1, 0x50, 0x3A, 0xAC, -0x50, 0xC6, 0xB1, 0x02, 0x1C, 0x90, 0x18, 0x40, 0xC7, 0xC8, -0x0C, 0x06, 0x44, 0x16, 0x53, 0x0E, 0x35, 0x95, 0x1D, 0x40, -0x83, 0xCB, 0x36, 0x50, 0x37, 0x03, 0xE1, 0x50, 0xE0, 0x16, -0xDF, 0xAD, 0xDD, 0x74, 0xF8, 0xE1, 0x0B, 0x4B, 0x3C, 0xAF, -0x44, 0xA5, 0xC9, 0xBE, 0x82, 0x12, 0xA9, 0xBF, 0xAA, 0x31, -0xF5, 0x3A, 0xCA, 0x19, 0x91, 0x22, 0xC0, 0x30, 0x56, 0x4C, -0x02, 0x34, 0x4C, 0x42, 0x45, 0x32, 0x37, 0x76, 0x8C, 0x1C, -0x64, 0xD4, 0xB8, 0xA3, 0x90, 0x63, 0x91, 0xF7, 0x8B, 0x25, -0xB2, 0x3A, 0xBE, 0xE1, 0xB3, 0xFA, 0x45, 0x05, 0xDC, 0x3E, -0xBC, 0x5D, 0x30, 0x62, 0x4B, 0xF8, 0x36, 0xA7, 0x58, 0xDB, -0xC2, 0x6C, 0x45, 0xC1, 0x56, 0x36, 0x04, 0x90, 0xCF, 0x85, -0xE2, 0x1A, 0x44, 0x2A, 0x61, 0x16, 0xC4, 0x99, 0xA3, 0x3F, -0xD7, 0x2C, 0x65, 0x20, 0xB0, 0xEE, 0xF3, 0xE2, 0x42, 0x43, -0xD2, 0xF4, 0x65, 0x37, 0xFB, 0x46, 0xFF, 0xF2, 0x99, 0x63, -0x7F, 0x4D, 0x06, 0x3B, 0x8D, 0xB4, 0x99, 0x36, 0x1A, 0x3D, -0x68, 0xDC, 0x7B, 0xE1, 0xDE, 0x33, 0x42, 0x65, 0x17, 0x88, -0x53, 0x65, 0xC7, 0xD5, 0xD1, 0x2F, 0xBB, 0x9B, 0xF1, 0x5C, -0xF4, 0x6D, 0x7A, 0xE2, 0x91, 0xA5, 0xEF, 0x72, 0x31, 0xB7, -0xB6, 0x7D, 0x34, 0x21, 0x4B, 0xD5, 0x38, 0x4D, 0x1A, 0x12, -0xEE, 0x04, 0x21, 0xB8, 0x4D, 0xB9, 0x35, 0xA3, 0xB6, 0x86, -0xEE, 0x3A, 0x5A, 0x5A, 0x88, 0xA3, 0xE9, 0xBB, 0xE8, 0xC9, -0xD5, 0x09, 0xC6, 0x42, 0x70, 0x83, 0x99, 0x0D, 0x80, 0x5B, -0x12, 0x2E, 0x41, 0xB0, 0xE0, 0x72, 0x34, 0x89, 0xB4, 0x01, -0x6D, 0x34, 0x80, 0x69, 0x84, 0xF7, 0x37, 0xE3, 0x39, 0xFF, -0xA2, 0x49, 0x31, 0x03, 0xA1, 0x23, 0x7C, 0x07, 0x7F, 0x98, -0xCD, 0x6D, 0xD9, 0x60, 0xB4, 0xFA, 0xA3, 0x06, 0xB8, 0xA4, -0xB4, 0x91, 0x30, 0x77, 0x38, 0x8E, 0xA5, 0xBC, 0x66, 0xB2, -0x6A, 0xAE, 0x98, 0x1C, 0xAA, 0x02, 0xFE, 0x79, 0x68, 0x31, -0x01, 0x49, 0x9E, 0x44, 0xC4, 0x11, 0xD1, 0x42, 0x8F, 0xB1, -0x2E, 0x70, 0xAD, 0x0E, 0xF4, 0xAC, 0x06, 0xC2, 0xC6, 0x06, -0x20, 0x99, 0xE3, 0x08, 0x31, 0x36, 0x71, 0xEA, 0xE0, 0x50, -0x98, 0x76, 0xAD, 0x2A, 0x84, 0x33, 0x66, 0x2A, 0x28, 0x70, -0xA6, 0x50, 0x80, 0x14, 0x9A, 0x65, 0x40, 0x2E, 0xB0, 0x55, -0x84, 0x16, 0xF4, 0x51, 0x7D, 0xCF, 0x8E, 0x8E, 0x89, 0x35, -0x23, 0xBE, 0xF5, 0xE2, 0x78, 0x10, 0x5B, 0x49, 0x08, 0x47, -0xAA, 0x47, 0x77, 0x9F, 0xD8, 0xF3, 0xE2, 0x7B, 0xBF, 0x7F, -0x24, 0xCF, 0xDC, 0xD6, 0x63, 0xE6, 0xB7, 0xAF, 0x8F, 0x6E, -0xEA, 0xCC, 0x5D, 0x11, 0x22, 0x54, 0xFD, 0x49, 0xDF, 0xF8, -0xC5, 0x55, 0xCD, 0x44, 0x16, 0x5C, 0xD5, 0xAF, 0x72, 0xBF, -0xCC, 0x7D, 0xDA, 0x23, 0xEC, 0x37, 0x87, 0xB8, 0xC4, 0x63, -0x6B, 0x93, 0x2F, 0xE3, 0xE3, 0x34, 0x22, 0x82, 0xC0, 0xAE, -0x43, 0x57, 0xAC, 0x45, 0x19, 0x7C, 0xE6, 0xEE, 0x2B, 0xC7, -0x8F, 0xEC, 0xEC, 0xFE, 0x64, 0xEF, 0xE6, 0x8C, 0xEE, 0x99, -0xBC, 0x78, 0x60, 0xB0, 0xBD, 0x7A, 0x34, 0xC3, 0xAD, 0x77, -0xB2, 0xBC, 0x36, 0x75, 0x3D, 0xDF, 0x7A, 0xFB, 0x92, 0xE7, -0xF1, 0x71, 0x0C, 0xFE, 0x3B, 0x14, 0x44, 0x65, 0x84, 0x76, -0xC4, 0x34, 0xCF, 0x1F, 0x2E, 0x77, 0x59, 0xD3, 0xF9, 0x3B, -0x8B, 0xFB, 0x52, 0xA2, 0x32, 0xB9, 0x8C, 0x7F, 0xFC, 0x74, -0x76, 0x67, 0xD4, 0x54, 0x8C, 0x4B, 0x22, 0x58, 0x6C, 0x95, -0xA7, 0xF2, 0x03, 0x67, 0x5E, 0xCA, 0xBC, 0x36, 0x3B, 0x91, -0xDF, 0xFE, 0x7F, 0xB9, 0xFE, 0x01, 0x8C, 0x37, 0x4F, 0xD9, -0x44, 0x8F, 0x9A, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x38, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xCD, 0x54, 0x6B, 0x6C, 0x54, 0x45, 0x14, -0x3E, 0x33, 0x77, 0xEF, 0xDD, 0x47, 0xB7, 0xA5, 0x2D, 0x74, -0xEF, 0x76, 0xDB, 0x66, 0x97, 0x2D, 0x15, 0x4A, 0x5B, 0x11, -0x69, 0xC0, 0x48, 0x1A, 0x05, 0x8D, 0x40, 0x85, 0x60, 0x6C, -0x1B, 0x30, 0xFE, 0x32, 0x6A, 0x7C, 0x01, 0x6D, 0x28, 0x85, -0xA0, 0x3F, 0x40, 0xA3, 0xE1, 0x25, 0x31, 0x46, 0x0D, 0xA9, -0x31, 0x08, 0x34, 0x50, 0x82, 0xA0, 0x06, 0x45, 0x14, 0xE8, -0x83, 0xA0, 0xF2, 0x2A, 0x06, 0x52, 0xA8, 0x31, 0xC4, 0x06, -0x69, 0x83, 0xB4, 0xB4, 0xDB, 0xBD, 0xDD, 0x3E, 0x76, 0xEF, -0x63, 0xC6, 0x33, 0x2D, 0x5B, 0x29, 0xD4, 0x6A, 0xF8, 0xE5, -0x24, 0xBB, 0x73, 0xEE, 0x3C, 0xCE, 0x77, 0xBE, 0xEF, 0x9C, -0x33, 0x04, 0xC6, 0x18, 0x07, 0x6A, 0xF7, 0x2F, 0xE4, 0x9C, -0xAF, 0xD5, 0x0D, 0xDD, 0x66, 0xB7, 0xDB, 0x3B, 0x82, 0x39, -0x39, 0xD5, 0x85, 0xB3, 0x66, 0x9D, 0x18, 0xEB, 0xEC, 0xBF, -0x0D, 0x7A, 0xF7, 0xC2, 0x8F, 0x27, 0x4F, 0x15, 0xA6, 0xA6, -0xA6, 0x1E, 0x55, 0x14, 0x65, 0xDE, 0xB5, 0xD6, 0x6B, 0x45, -0x47, 0x0E, 0x7F, 0x53, 0x7A, 0xB0, 0x76, 0xFF, 0xF1, 0xF6, -0xB6, 0xB6, 0x6D, 0xF1, 0x33, 0x8D, 0xF5, 0x0D, 0xF2, 0xE9, -0x9F, 0x7E, 0xAE, 0x38, 0xD5, 0x78, 0xF2, 0x60, 0xCD, 0xE7, -0xBB, 0x0E, 0xBF, 0xBF, 0x79, 0xCB, 0xF6, 0x37, 0xAB, 0xAA, -0x66, 0xFF, 0x27, 0x00, 0xC3, 0x30, 0x6A, 0x92, 0x92, 0x93, -0xA1, 0xE5, 0xCA, 0x65, 0x08, 0xF7, 0xF4, 0x80, 0xD3, 0xE9, -0x64, 0x97, 0x2F, 0x37, 0x43, 0x6B, 0x6B, 0xEB, 0x42, 0xB1, -0x5F, 0x7F, 0xAC, 0x6E, 0xB2, 0x47, 0x55, 0xFB, 0x3B, 0xFE, -0xBC, 0xF9, 0xC1, 0xD7, 0x87, 0xBE, 0x2C, 0x39, 0x73, 0xFA, -0xCC, 0x92, 0x96, 0x2B, 0x57, 0x56, 0xFF, 0xDE, 0xDA, 0x7A, -0xF6, 0xB9, 0xD2, 0x92, 0x8F, 0xC6, 0x05, 0xA8, 0x3F, 0x76, -0x62, 0xB9, 0x69, 0x18, 0xD3, 0x2E, 0x36, 0x5D, 0xE0, 0x7A, -0xCC, 0x60, 0x8C, 0x59, 0xF8, 0x63, 0x84, 0x52, 0xCA, 0xED, -0x0E, 0x7B, 0xBE, 0x38, 0xE3, 0x70, 0x38, 0xCA, 0x63, 0xB1, -0x98, 0xDC, 0x74, 0xFE, 0x3C, 0x77, 0x20, 0x38, 0x32, 0x65, -0xB2, 0x22, 0x73, 0xC5, 0xA6, 0xF0, 0x68, 0x4C, 0x7F, 0x69, -0x5C, 0x00, 0x59, 0x51, 0xB6, 0x35, 0x5F, 0x6A, 0x86, 0xAE, -0xAE, 0x10, 0x47, 0x26, 0x94, 0x59, 0x16, 0xB5, 0x98, 0xC5, -0x2D, 0xC3, 0x20, 0x2E, 0x97, 0x0B, 0xBE, 0x3B, 0xF2, 0xED, -0x63, 0xCE, 0x04, 0xD7, 0xF3, 0xBF, 0xB5, 0xFC, 0x0A, 0x8A, -0xAC, 0x70, 0x71, 0x9F, 0x73, 0xA0, 0x04, 0x08, 0x27, 0x94, -0x88, 0xC9, 0x81, 0x2C, 0xE6, 0x8E, 0x09, 0x70, 0xB2, 0xBE, -0x71, 0xC1, 0xAD, 0x8E, 0xCE, 0x4C, 0xD3, 0x34, 0xC0, 0xB4, -0x74, 0x60, 0xCC, 0x04, 0x13, 0x6F, 0x33, 0x93, 0x81, 0x85, -0x73, 0x82, 0xD3, 0x09, 0x86, 0xAE, 0xBF, 0xE6, 0x76, 0x27, -0x4C, 0x6A, 0x6F, 0x6B, 0x07, 0x64, 0x35, 0x3A, 0x54, 0x82, -0xCE, 0x08, 0x85, 0x98, 0x6E, 0x2C, 0xBE, 0x73, 0xD9, 0x16, -0x37, 0x90, 0xEA, 0x8A, 0xF6, 0xF6, 0x76, 0x71, 0x0E, 0x03, -0xB7, 0x88, 0x65, 0x72, 0xC6, 0x4D, 0x0B, 0x4C, 0x66, 0x12, -0x2A, 0x51, 0x86, 0x1B, 0x04, 0xF3, 0x51, 0x12, 0xEA, 0x0E, -0x71, 0xD3, 0x34, 0x39, 0xC1, 0x81, 0xD7, 0x58, 0xDC, 0x3D, -0xD2, 0x61, 0xB8, 0x44, 0x0D, 0xD3, 0x78, 0x12, 0xBF, 0xD7, -0xDF, 0xC3, 0xA0, 0x57, 0xEB, 0x5D, 0x6C, 0x1A, 0x26, 0x30, -0xCE, 0x29, 0xBA, 0xE6, 0x26, 0xB7, 0xA8, 0xC9, 0x4D, 0xCA, -0xD0, 0x99, 0x43, 0x51, 0x70, 0x8D, 0x21, 0x80, 0xCB, 0xD6, -0xDD, 0xD5, 0xC5, 0xA5, 0xE1, 0xF0, 0xF9, 0xED, 0xFB, 0xB7, -0x6D, 0x4E, 0x85, 0x89, 0xD1, 0x15, 0xDE, 0x23, 0x11, 0xCA, -0x33, 0xAF, 0x57, 0xD3, 0x86, 0xCE, 0xA1, 0xE6, 0x28, 0x91, -0x05, 0xDC, 0x32, 0x01, 0x51, 0x90, 0x01, 0x03, 0x4C, 0x26, -0xE8, 0xBA, 0x0E, 0x98, 0x48, 0xE8, 0xED, 0x8D, 0xC0, 0x70, -0xF0, 0x77, 0x0D, 0x84, 0x10, 0xB0, 0x58, 0x14, 0xB0, 0xBC, -0xF4, 0xD9, 0xE0, 0x28, 0x89, 0x64, 0x59, 0x7E, 0x24, 0x1C, -0x0E, 0x03, 0x36, 0x97, 0x28, 0x1C, 0x74, 0x6C, 0x11, 0xD3, -0xB4, 0x18, 0x32, 0x00, 0x21, 0x97, 0x3B, 0xD1, 0xCD, 0xA2, -0xD1, 0x41, 0xB0, 0x29, 0x0A, 0x0C, 0xF6, 0x0D, 0x08, 0x75, -0xD8, 0xB0, 0xEA, 0x7F, 0x4B, 0x14, 0xB7, 0x91, 0x1C, 0x8D, -0xC5, 0xF4, 0x3C, 0x34, 0x5B, 0xEF, 0x94, 0x68, 0xDA, 0xC0, -0xC0, 0x80, 0x00, 0xA0, 0x26, 0xC3, 0xCA, 0xC1, 0xD0, 0x85, -0x8D, 0x13, 0xB5, 0x30, 0x19, 0x89, 0x89, 0x89, 0xD4, 0x88, -0xE9, 0x78, 0x96, 0xD0, 0xC1, 0xD8, 0x60, 0x5C, 0x9A, 0xBB, -0x24, 0x1A, 0xB1, 0x45, 0x50, 0xFE, 0x51, 0x0C, 0x62, 0xBA, -0x9E, 0x86, 0x89, 0x03, 0x51, 0xF5, 0x1C, 0xAB, 0xC6, 0xB4, -0x38, 0x26, 0x19, 0xD3, 0xCB, 0x51, 0x2E, 0xDD, 0x20, 0x1E, -0x8F, 0x87, 0xE9, 0xB8, 0x6F, 0x97, 0xF0, 0xDB, 0x30, 0xC7, -0x61, 0xC0, 0x87, 0x82, 0x96, 0x24, 0xC9, 0x33, 0x0A, 0x20, -0xDA, 0xDF, 0x6F, 0xD7, 0x63, 0x3A, 0x18, 0xA6, 0x8E, 0x0C, -0x4C, 0x91, 0x28, 0xD1, 0x62, 0x14, 0x9B, 0x0E, 0x24, 0x59, -0x66, 0xAA, 0xEA, 0xA1, 0x62, 0x9F, 0x12, 0x79, 0x48, 0xC6, -0xDB, 0x91, 0xC6, 0x67, 0x88, 0xDB, 0x48, 0x1A, 0x44, 0x7A, -0xDC, 0xEE, 0xC4, 0x84, 0x51, 0x49, 0x9E, 0x9A, 0x37, 0x5D, -0x53, 0x7D, 0x5E, 0x28, 0x9C, 0x33, 0x5B, 0x34, 0x1B, 0x68, -0xBD, 0x1A, 0x84, 0xB5, 0x30, 0x08, 0xA7, 0x8B, 0x8A, 0x17, -0x41, 0x66, 0x86, 0x0F, 0xA2, 0xD1, 0x81, 0xA1, 0xEF, 0xB1, -0xF2, 0x7B, 0xA7, 0x33, 0x42, 0x24, 0xF0, 0xE1, 0xF9, 0x51, -0x00, 0x4E, 0x97, 0xF3, 0x8F, 0xA7, 0x97, 0x2E, 0x81, 0xAC, -0x80, 0x1F, 0x16, 0x14, 0x2F, 0x84, 0xB2, 0x65, 0x65, 0xB0, -0x66, 0x5D, 0x15, 0x7C, 0xBC, 0xE3, 0x13, 0xC8, 0xCB, 0xCF, -0x45, 0x16, 0x12, 0x50, 0x9B, 0x04, 0x22, 0xD1, 0xD1, 0x68, -0x4C, 0x68, 0x8C, 0x62, 0x60, 0x85, 0x89, 0xA6, 0xC4, 0x9F, -0xF8, 0x8E, 0x7B, 0x2B, 0x29, 0x2B, 0x03, 0xD5, 0xEB, 0x0D, -0xC7, 0x01, 0x24, 0xF1, 0x57, 0x59, 0x59, 0xE9, 0xC5, 0xC0, -0x9E, 0x99, 0x90, 0xE4, 0x66, 0xC9, 0x29, 0x29, 0xDC, 0xAB, -0xAA, 0xA2, 0x12, 0x79, 0xC7, 0xCD, 0x1B, 0x7C, 0xA0, 0xBF, -0x9F, 0xA0, 0x03, 0x21, 0x2E, 0x99, 0xFD, 0xE8, 0x5C, 0x8E, -0xE5, 0x4A, 0x6E, 0xB4, 0xDF, 0xE0, 0x7D, 0xB8, 0x3E, 0x73, -0xD6, 0xC3, 0x3C, 0x10, 0x0C, 0xF0, 0xB6, 0xEB, 0xD7, 0x49, -0x4F, 0xA8, 0x87, 0x3F, 0x38, 0x63, 0x06, 0xCF, 0xCA, 0xF2, -0x91, 0x60, 0x76, 0x70, 0xCF, 0xAE, 0xDD, 0x7B, 0x2E, 0x8E, -0x30, 0xA8, 0xAE, 0xAE, 0xAE, 0x97, 0x24, 0x02, 0x7D, 0x7D, -0xFD, 0x34, 0x1C, 0x0A, 0xD1, 0xCE, 0xCE, 0x9B, 0xBC, 0x2F, -0x12, 0xA1, 0xD8, 0xFA, 0x54, 0x92, 0x6D, 0xA2, 0x6B, 0x69, -0x5F, 0x5F, 0xE4, 0xAA, 0xA8, 0x81, 0xA2, 0xC7, 0x8B, 0x60, -0xE5, 0x9A, 0x55, 0xF4, 0x95, 0x37, 0x5E, 0xE5, 0x53, 0xA6, -0xE6, 0xD0, 0x60, 0xCE, 0x14, 0xFA, 0xC2, 0xCB, 0x2F, 0xF2, -0x77, 0xDE, 0x7B, 0x9B, 0x16, 0x17, 0x3F, 0x45, 0x5D, 0x2E, -0x07, 0x68, 0xA1, 0xEE, 0x0B, 0x23, 0x49, 0xCE, 0xCD, 0xCD, -0x25, 0x35, 0x35, 0x35, 0xD1, 0x27, 0xE6, 0xCF, 0xEF, 0x48, -0xF3, 0xA4, 0xA9, 0xD8, 0x09, 0x88, 0x4A, 0x86, 0x0B, 0x03, -0x69, 0x78, 0xD4, 0x74, 0x12, 0xEA, 0xBA, 0x05, 0x75, 0x0D, -0x8D, 0xF5, 0x99, 0xFE, 0x29, 0xC6, 0xD4, 0x07, 0x72, 0xA6, -0x23, 0x0E, 0xD8, 0x64, 0x1B, 0xB8, 0x1C, 0x76, 0x88, 0x45, -0xA3, 0x20, 0x04, 0xEB, 0xEC, 0xEC, 0xC0, 0xF7, 0x82, 0x03, -0xF6, 0x00, 0x5B, 0x5A, 0xB2, 0xAC, 0x79, 0x04, 0x40, 0x68, -0x91, 0x94, 0x94, 0x24, 0x6D, 0xD8, 0xB8, 0x71, 0x43, 0x65, -0xE5, 0xEA, 0x77, 0xFD, 0x59, 0x59, 0x93, 0x0C, 0xF1, 0x8A, -0xA2, 0xB6, 0xF8, 0x62, 0x00, 0x3E, 0x0D, 0xD6, 0xDE, 0xBD, -0xB5, 0x07, 0x8F, 0xD7, 0x35, 0x7C, 0x38, 0x39, 0x98, 0xD3, -0x9D, 0x36, 0x31, 0x65, 0xFA, 0xA5, 0x8B, 0x97, 0x58, 0x5E, -0x7E, 0x1E, 0x19, 0x8C, 0xEA, 0x2C, 0x12, 0x89, 0x80, 0x5D, -0x91, 0x49, 0xEA, 0x44, 0x95, 0x69, 0x5A, 0x88, 0xE2, 0x9B, -0xF6, 0xD5, 0xA8, 0xC4, 0xB7, 0xB4, 0xB4, 0x70, 0x5C, 0xEC, -0xD4, 0x34, 0xAD, 0xA6, 0xAA, 0x6A, 0xED, 0xCC, 0x95, 0xE5, -0x15, 0x4B, 0x36, 0x6D, 0xDE, 0x52, 0xBE, 0x69, 0xEB, 0xF6, -0xF2, 0x75, 0xEB, 0xDF, 0x2A, 0x5D, 0xB1, 0xB2, 0xE2, 0xA1, -0xB3, 0xE7, 0x9A, 0x5E, 0x77, 0x3A, 0x1C, 0x57, 0xF7, 0xED, -0xAB, 0xDD, 0xC1, 0x91, 0x59, 0x41, 0x41, 0x01, 0x3E, 0xE3, -0xD8, 0xF1, 0xF8, 0x5E, 0x29, 0xB2, 0x24, 0xEA, 0x1E, 0xB4, -0x70, 0x17, 0x4D, 0x49, 0x9E, 0x00, 0x07, 0xBE, 0x38, 0xB4, -0xE3, 0x9F, 0xEB, 0x6C, 0x9C, 0x11, 0x08, 0x04, 0x68, 0x46, -0x46, 0x86, 0xB7, 0xA8, 0xA8, 0x68, 0xD5, 0x96, 0xAD, 0x9B, -0x7F, 0xF9, 0xE1, 0xFB, 0xA3, 0x83, 0x17, 0x9A, 0xCE, 0xF1, -0xF3, 0x67, 0x4F, 0xF3, 0x86, 0xBA, 0xE3, 0x7C, 0xF7, 0xCE, -0xCF, 0xDA, 0x2A, 0x2A, 0x56, 0x7D, 0xAA, 0xAA, 0xDE, 0xF4, -0x60, 0x30, 0x28, 0xDD, 0x17, 0x48, 0x76, 0x76, 0xB6, 0xCD, -0xEF, 0xF7, 0x27, 0xA6, 0xA7, 0xFB, 0x32, 0x55, 0x55, 0xCD, -0xF7, 0xF9, 0x7C, 0x73, 0x02, 0x01, 0xFF, 0x5C, 0xEC, 0xF4, -0x02, 0xAF, 0xD7, 0x9B, 0x89, 0x23, 0xF1, 0xBE, 0x9D, 0xFF, -0x6F, 0xC7, 0x5F, 0x02, 0xE8, 0xB0, 0xF1, 0x7A, 0x17, 0xEF, -0x2F, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, -0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Fullscreen1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x44, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xD5, 0x55, 0x59, 0x6F, 0x1B, 0x55, 0x14, -0x3E, 0x77, 0x3C, 0xFB, 0x6A, 0x8F, 0x67, 0xF3, 0x32, 0xB6, -0xE3, 0x38, 0x69, 0x12, 0x48, 0x4A, 0xD3, 0x84, 0x38, 0x64, -0x48, 0x2B, 0xCA, 0x03, 0xAA, 0x90, 0x28, 0x48, 0x50, 0x56, -0xA1, 0x56, 0xA8, 0x50, 0xAA, 0x4A, 0x80, 0x04, 0x0F, 0x88, -0x4D, 0xC0, 0xAF, 0x42, 0x55, 0x9F, 0x78, 0xE1, 0x89, 0x7F, -0x80, 0x84, 0x2A, 0x20, 0xDD, 0xD2, 0xA6, 0x49, 0x6C, 0x27, -0x1E, 0xDF, 0xC3, 0xB9, 0xC6, 0x69, 0xC3, 0x4F, 0xE8, 0x48, -0xDF, 0xF5, 0x78, 0xE6, 0x9E, 0xEF, 0x3B, 0xEB, 0x1D, 0x80, -0xA7, 0xFD, 0x2A, 0x88, 0x65, 0x6D, 0x6D, 0x7D, 0xA1, 0x5E, -0x4F, 0x2F, 0x37, 0x9A, 0xCD, 0x6C, 0x7A, 0x7A, 0x26, 0x9B, -0x9F, 0x9F, 0xCF, 0x16, 0x97, 0x96, 0xB2, 0x53, 0xA7, 0x96, -0xB3, 0xD5, 0x95, 0xD5, 0x6C, 0x6D, 0x6D, 0x2D, 0xEB, 0xAE, -0x77, 0xB3, 0xF5, 0xEE, 0x3A, 0xDD, 0x77, 0xB3, 0x95, 0xD5, -0xD5, 0xF1, 0x3B, 0xB1, 0x67, 0x7E, 0x61, 0x21, 0x9B, 0xE9, -0xCC, 0x64, 0xCD, 0x56, 0x2B, 0x8B, 0xA2, 0x84, 0x10, 0x65, -0x49, 0x92, 0x64, 0x71, 0x9C, 0xDC, 0xBA, 0x7D, 0x7B, 0x6B, -0x67, 0xAC, 0xD2, 0x6A, 0x4D, 0x7D, 0x9B, 0x24, 0x55, 0x5E, -0xF2, 0x03, 0x5E, 0x0E, 0x63, 0x9E, 0xD4, 0x52, 0x9E, 0xB6, -0xDA, 0xBC, 0x3D, 0x3B, 0xC7, 0x4F, 0x3C, 0x7B, 0x92, 0x2F, -0x2E, 0x3F, 0xCF, 0x57, 0x5F, 0x7C, 0x89, 0x6F, 0xBE, 0xF2, -0x06, 0x3F, 0xFB, 0xEA, 0x45, 0xBE, 0x71, 0xEE, 0x3C, 0x5F, -0x79, 0xE1, 0x0C, 0x3F, 0xB9, 0xDA, 0xE5, 0xCF, 0x3C, 0xB7, -0xCC, 0x67, 0x17, 0x16, 0x79, 0x63, 0x6A, 0x9A, 0x27, 0xD5, -0x94, 0xFB, 0x61, 0xC4, 0xCB, 0x41, 0xC8, 0x93, 0xA4, 0xF2, -0xD1, 0xE3, 0x08, 0x3C, 0xAF, 0x78, 0xBE, 0x7F, 0x30, 0xD8, -0xD8, 0xDB, 0xEF, 0x33, 0x0E, 0xC0, 0x38, 0x63, 0x80, 0x92, -0xCC, 0x0A, 0x8A, 0xCE, 0x64, 0xCD, 0x04, 0xCD, 0x2E, 0xB2, -0x62, 0x32, 0xC5, 0x4A, 0x8D, 0x0E, 0xB3, 0x83, 0x18, 0x14, -0x59, 0x67, 0x28, 0xD1, 0x46, 0x59, 0x61, 0x92, 0xAC, 0xB2, -0xD1, 0x48, 0x58, 0x49, 0x0C, 0x09, 0x83, 0xFE, 0x00, 0x00, -0x05, 0x03, 0xDC, 0xEC, 0xF5, 0xF6, 0x7F, 0x93, 0x84, 0x80, -0x24, 0x49, 0xA6, 0x24, 0x15, 0x40, 0x56, 0x35, 0xD0, 0x0C, -0x0B, 0x0C, 0xDB, 0x05, 0xDB, 0x2B, 0x82, 0x57, 0x0E, 0xA1, -0x14, 0x25, 0x90, 0xA4, 0x6D, 0x68, 0xCC, 0xCD, 0x41, 0x6B, -0xBA, 0x09, 0x69, 0xAB, 0x06, 0x95, 0x34, 0x85, 0x6A, 0x2D, -0x85, 0x5A, 0xBD, 0x01, 0x3E, 0xED, 0xF1, 0x69, 0x4F, 0x39, -0xAE, 0x81, 0xA6, 0x1B, 0xC4, 0xA1, 0x82, 0x54, 0x18, 0xFB, -0x6D, 0x8D, 0xB9, 0xC5, 0xA2, 0xA8, 0x8A, 0x55, 0x90, 0x15, -0xD0, 0x0D, 0x0B, 0x0D, 0xC7, 0x47, 0xDB, 0x0D, 0xC0, 0xF3, -0x2B, 0xE8, 0x47, 0x29, 0xC6, 0xB5, 0x29, 0x68, 0xCC, 0xCE, -0xE2, 0x6C, 0xA7, 0x81, 0x9D, 0x46, 0x82, 0x8D, 0x24, 0x84, -0x4A, 0x2D, 0xC6, 0x7A, 0x73, 0x0A, 0x82, 0xB8, 0x86, 0x41, -0x52, 0xC7, 0x4A, 0xA3, 0x03, 0x4E, 0x29, 0x44, 0x49, 0xD5, -0x50, 0x38, 0x48, 0x5C, 0x48, 0xB4, 0xE6, 0x63, 0x01, 0xF2, -0xDE, 0x96, 0x55, 0x13, 0x74, 0x27, 0x60, 0x76, 0x39, 0x61, -0x6E, 0x58, 0x85, 0x52, 0xB5, 0xCE, 0xE2, 0xA9, 0x16, 0x6B, -0xCE, 0xCD, 0xC0, 0xDC, 0x4C, 0x8B, 0xB5, 0xAB, 0x31, 0x4B, -0xFC, 0x22, 0x2B, 0x7B, 0x0E, 0x24, 0x71, 0xC0, 0xCA, 0x51, -0x44, 0x9E, 0xD3, 0xB3, 0x34, 0x65, 0x7E, 0x92, 0x80, 0x44, -0xE9, 0x32, 0x2C, 0x97, 0x89, 0xE8, 0x29, 0x13, 0x8C, 0xB2, -0x75, 0x2C, 0x02, 0x45, 0x36, 0x65, 0xDD, 0x04, 0x93, 0x8C, -0x9C, 0x98, 0xD2, 0x92, 0x56, 0x20, 0x4A, 0xAB, 0xD0, 0x6E, -0x37, 0xE0, 0x44, 0xAB, 0x0E, 0x9D, 0x5A, 0x02, 0x15, 0xBF, -0x08, 0xB6, 0xA9, 0x83, 0x67, 0x5B, 0xE0, 0xB9, 0x36, 0x78, -0x25, 0x17, 0xE2, 0x2A, 0x89, 0x84, 0x65, 0xCA, 0x80, 0x0A, -0xBA, 0x69, 0x83, 0xE5, 0xFA, 0x94, 0xDE, 0x12, 0xFD, 0x37, -0x80, 0xC1, 0x31, 0x01, 0x92, 0xB3, 0x15, 0xC7, 0x01, 0x3F, -0x0E, 0x31, 0x22, 0x84, 0xBE, 0x0F, 0x8D, 0x0A, 0xA5, 0x23, -0x0A, 0xB1, 0x5A, 0xF6, 0x21, 0x2A, 0x79, 0x68, 0x69, 0x2A, -0xEA, 0x0A, 0x81, 0xC8, 0x1C, 0xD3, 0xC0, 0x98, 0x04, 0x49, -0x0C, 0x35, 0x8D, 0xD2, 0x42, 0xC2, 0xA6, 0xEB, 0xA1, 0xE9, -0xFA, 0xA8, 0xDB, 0x3E, 0xC8, 0xBA, 0x85, 0xA4, 0xF0, 0x44, -0x80, 0x2E, 0xC3, 0xF1, 0x3C, 0xA8, 0x46, 0x11, 0xAB, 0x04, -0x14, 0x7E, 0xD1, 0x03, 0x22, 0x60, 0x45, 0xD7, 0xA1, 0x94, -0xB8, 0x40, 0xA4, 0x6C, 0x84, 0xC8, 0x38, 0x81, 0xBA, 0x03, -0x6C, 0xC3, 0x60, 0x86, 0xA6, 0x82, 0x5C, 0x28, 0x30, 0x5D, -0x53, 0x99, 0xA1, 0xEB, 0xA0, 0x59, 0x3A, 0x53, 0x1D, 0x4B, -0x00, 0x64, 0xC3, 0x64, 0x47, 0x45, 0x96, 0xC5, 0xC2, 0x39, -0xB7, 0x03, 0x22, 0xAA, 0x84, 0x01, 0xAA, 0x9A, 0x06, 0x86, -0x61, 0x80, 0xA6, 0xAA, 0x68, 0xEA, 0x74, 0xAF, 0xAB, 0x70, -0x98, 0x8F, 0xB0, 0x77, 0x90, 0x43, 0x7F, 0x98, 0x83, 0xAA, -0x8C, 0x4D, 0x90, 0xA3, 0x88, 0x9C, 0xA1, 0xA6, 0x28, 0xE2, -0x06, 0x0A, 0xB4, 0x5F, 0x16, 0xA2, 0xB4, 0xBF, 0xA0, 0x6B, -0x08, 0x78, 0xAC, 0xC8, 0x79, 0x9E, 0x9B, 0x45, 0xD7, 0x03, -0x22, 0x64, 0xC2, 0x2B, 0x4A, 0x19, 0xBD, 0xA7, 0x55, 0x92, -0x58, 0xFF, 0x70, 0x08, 0x3B, 0xBD, 0x01, 0xDB, 0xD9, 0x1F, -0xB0, 0x11, 0x17, 0x51, 0x00, 0x1C, 0x0C, 0x73, 0x76, 0x30, -0x1C, 0x81, 0x44, 0x95, 0x24, 0x6D, 0xF2, 0x96, 0x89, 0x46, -0x61, 0x05, 0xB2, 0xA5, 0x8E, 0x24, 0x07, 0x69, 0x4E, 0x10, -0x9F, 0x44, 0x30, 0x1A, 0x8D, 0x2C, 0xD3, 0x32, 0x05, 0xA9, -0x30, 0x06, 0x59, 0xA3, 0xA8, 0x88, 0xA8, 0x77, 0x70, 0x08, -0x43, 0x9A, 0xA1, 0xA1, 0x18, 0x24, 0x9A, 0x13, 0x95, 0x3C, -0xE5, 0x87, 0xF9, 0xD8, 0x7D, 0x8A, 0x8A, 0xDE, 0xF1, 0xF1, -0x3B, 0x61, 0x27, 0x7A, 0xBF, 0x20, 0x49, 0xA0, 0x51, 0x84, -0x22, 0x3F, 0xFF, 0x13, 0x18, 0x0E, 0x87, 0xA6, 0x98, 0x83, -0xBD, 0xDE, 0x00, 0x72, 0x72, 0x48, 0xD5, 0x47, 0x63, 0xF2, -0x3B, 0x0F, 0x76, 0xA9, 0xA7, 0x65, 0x50, 0xA9, 0xB0, 0xA2, -0x53, 0x68, 0x5A, 0xA1, 0x40, 0x5A, 0x23, 0xE4, 0x63, 0x47, -0x06, 0x14, 0x45, 0xCE, 0x71, 0x2C, 0xC0, 0xFE, 0x4B, 0x35, -0x8C, 0xE8, 0xB9, 0xF0, 0xE7, 0xA8, 0x06, 0xAC, 0x52, 0xA9, -0x2A, 0x74, 0xED, 0x6D, 0x5E, 0x78, 0x57, 0xC9, 0x59, 0x41, -0x4C, 0x1D, 0x58, 0x96, 0x43, 0xB0, 0xC0, 0x34, 0x0D, 0x70, -0x1C, 0x1B, 0x34, 0x4D, 0x07, 0x8B, 0x3A, 0xC5, 0xA0, 0xFA, -0xC8, 0x05, 0x09, 0x72, 0x62, 0x38, 0x1C, 0x0E, 0x09, 0x87, -0xB0, 0xBB, 0xDF, 0x87, 0x87, 0x0F, 0x1F, 0xC1, 0x5F, 0x5B, -0xB7, 0xE1, 0xE1, 0xFD, 0x7B, 0xF0, 0xE0, 0xFE, 0x7D, 0xE8, -0x3D, 0xB8, 0x0B, 0xB7, 0x7E, 0xFF, 0x75, 0xEB, 0xDE, 0xBD, -0xBB, 0x55, 0x39, 0x08, 0x02, 0x6D, 0x7B, 0x7B, 0x5B, 0xFE, -0xE7, 0xCF, 0x3F, 0x00, 0x69, 0x58, 0x98, 0xAC, 0xC2, 0x36, -0x15, 0x4C, 0xA2, 0xB3, 0xC8, 0x25, 0x72, 0xCB, 0x32, 0x51, -0xA5, 0xC1, 0x31, 0x0D, 0x3A, 0x46, 0x28, 0xBF, 0x94, 0x06, -0x24, 0x4F, 0x59, 0x4E, 0xC9, 0x1F, 0xE6, 0x43, 0xD6, 0x1F, -0x1C, 0xC0, 0xCE, 0xA3, 0x5D, 0xFC, 0x7B, 0xEB, 0x0E, 0xEB, -0xED, 0xEE, 0xC2, 0xA0, 0xB7, 0x87, 0xC3, 0xFD, 0x47, 0x54, -0x47, 0x36, 0x2E, 0x32, 0x9C, 0x3B, 0xF7, 0xB2, 0x55, 0xAB, -0xD5, 0xFB, 0x74, 0x5C, 0x73, 0x3A, 0xAE, 0xB1, 0xDD, 0x9E, -0xC6, 0x4E, 0x67, 0x86, 0xCF, 0xCD, 0xCD, 0xE3, 0xD2, 0xD2, -0x49, 0x3C, 0x7D, 0x7A, 0x85, 0x77, 0xBB, 0xEB, 0xB8, 0x91, -0x65, 0xB8, 0xB9, 0x79, 0x46, 0x80, 0x6F, 0x6C, 0x64, 0xB8, -0xD6, 0xED, 0xF2, 0xE5, 0xD3, 0x2B, 0x48, 0x47, 0x36, 0xD2, -0x5E, 0x3E, 0x3D, 0xDD, 0xC1, 0x66, 0xB3, 0x85, 0xC4, 0xC5, -0x29, 0x2B, 0x48, 0x7C, 0x77, 0x1E, 0x7F, 0x14, 0x2C, 0xCB, -0x2E, 0x52, 0x4A, 0x12, 0xDB, 0xB6, 0x13, 0xC7, 0x71, 0x12, -0xD7, 0x75, 0x13, 0xCF, 0xF3, 0x12, 0xDF, 0xF7, 0x2B, 0xEF, -0xBD, 0xFF, 0xC1, 0xA5, 0x2F, 0xBE, 0xFC, 0x8A, 0x5F, 0xBD, -0x76, 0x9D, 0x5F, 0xF9, 0xE4, 0x2A, 0xFF, 0xF8, 0xD3, 0x6B, -0xFC, 0xFA, 0x67, 0x9F, 0xF3, 0x6F, 0xBE, 0xFB, 0x9E, 0xBF, -0xF9, 0xD6, 0xC5, 0xCD, 0x52, 0xC9, 0xAF, 0x88, 0xBD, 0x8E, -0xE3, 0x8E, 0x6D, 0x05, 0x87, 0xE0, 0x22, 0x4E, 0x77, 0x5C, -0x83, 0x09, 0xE4, 0xC9, 0xD1, 0x7D, 0x04, 0xF9, 0x08, 0x1F, -0x5E, 0xBA, 0x7C, 0xED, 0xE2, 0xDB, 0xEF, 0x7C, 0x9D, 0x8F, -0x72, 0xD1, 0xF7, 0xE3, 0x19, 0x10, 0xED, 0x4B, 0xC3, 0x85, -0x3F, 0xFF, 0xF4, 0xE3, 0xE5, 0x9B, 0x37, 0x6E, 0xFC, 0x22, -0x3A, 0xFD, 0x18, 0x46, 0x13, 0x0C, 0xC5, 0xAF, 0x34, 0x21, -0x14, 0xF9, 0x2A, 0x11, 0x62, 0x42, 0x83, 0x30, 0x43, 0x58, -0xA4, 0x8F, 0xC6, 0xF9, 0xD7, 0x2E, 0xBC, 0x7E, 0x45, 0x37, -0xF4, 0x5E, 0xA9, 0x58, 0xEA, 0x87, 0x41, 0xD0, 0x8F, 0xC2, -0x70, 0xE0, 0x3A, 0x4E, 0x1F, 0x11, 0xFA, 0x24, 0xFE, 0x83, -0xAE, 0x1B, 0x99, 0xD8, 0x3B, 0xB1, 0x69, 0x4C, 0x38, 0x3C, -0x82, 0x3E, 0x71, 0x7E, 0xBC, 0x08, 0x11, 0x1A, 0x49, 0xD0, -0xC4, 0xB1, 0x31, 0x69, 0x31, 0x77, 0x22, 0x5A, 0x25, 0xA4, -0x13, 0xE3, 0xA6, 0xF8, 0x00, 0x4E, 0xEE, 0xC5, 0xB3, 0xCA, -0x64, 0x8F, 0x3B, 0xB1, 0x31, 0x26, 0x1C, 0xCA, 0xB1, 0x63, -0xE8, 0x29, 0xBF, 0xFE, 0x05, 0xBF, 0xC0, 0xA7, 0xEC, 0x02, -0xFF, 0xAC, 0x09, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0xCE, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xD5, 0x94, 0x6B, 0x6C, 0x14, 0x55, 0x14, -0xC7, 0xFF, 0xF3, 0x9E, 0xD9, 0xC7, 0x74, 0x1F, 0x5D, 0xD8, -0x6E, 0x5B, 0x28, 0xDB, 0xD2, 0x94, 0x16, 0x04, 0xAC, 0xDA, -0x07, 0xB4, 0x54, 0x49, 0x0B, 0x94, 0xF4, 0x43, 0x6D, 0x04, -0xC5, 0xA6, 0x01, 0xA1, 0x1A, 0x89, 0x90, 0x18, 0x3F, 0x91, -0x26, 0xA4, 0xBE, 0x48, 0x3F, 0xA8, 0x11, 0x79, 0x24, 0x10, -0x21, 0x21, 0xFA, 0x41, 0xA2, 0xD1, 0x08, 0x06, 0xD1, 0xD4, -0x14, 0x14, 0x4A, 0xC5, 0x44, 0x41, 0x85, 0x86, 0xA6, 0xD0, -0x74, 0x41, 0x96, 0xB2, 0xDD, 0xED, 0x76, 0x77, 0x67, 0x76, -0x67, 0x67, 0x67, 0xC7, 0x5B, 0x62, 0xD0, 0x18, 0x6C, 0xA8, -0x21, 0x31, 0x9E, 0xE4, 0xE6, 0xDE, 0xDC, 0x73, 0xEE, 0xF9, -0xDD, 0x7B, 0xCE, 0x3D, 0x07, 0xF8, 0xBF, 0x0B, 0x35, 0x9D, -0x52, 0xD7, 0x75, 0x81, 0x4C, 0x0E, 0x8E, 0xE3, 0xC6, 0x1E, -0x38, 0x20, 0x95, 0x4A, 0x49, 0x44, 0x7D, 0x36, 0x14, 0x8D, -0x3D, 0xE4, 0x75, 0x3B, 0x4E, 0x98, 0xA6, 0xB9, 0x97, 0x6C, -0xF7, 0xF2, 0x3C, 0x9F, 0x7D, 0x20, 0x80, 0x74, 0x3A, 0xFD, -0xD6, 0xB1, 0xB3, 0x3F, 0xBF, 0x72, 0x59, 0xD1, 0x51, 0xBB, -0xD8, 0x0F, 0xBF, 0x4D, 0x84, 0xCF, 0x22, 0x5E, 0xA1, 0x29, -0x6A, 0x3F, 0x51, 0x1F, 0x21, 0xA0, 0xC9, 0x7F, 0x0D, 0xD0, -0x34, 0xAD, 0x7E, 0x28, 0x30, 0xD6, 0xD7, 0xF3, 0x59, 0x3F, -0xFD, 0x6C, 0xD0, 0x84, 0xA7, 0x79, 0x11, 0xE2, 0xD5, 0xF3, -0x21, 0xEA, 0x69, 0xB8, 0x90, 0x45, 0x9E, 0xC0, 0xC5, 0x45, -0x96, 0xF9, 0x90, 0x98, 0xEE, 0x15, 0x04, 0xE1, 0xF2, 0x8C, -0x00, 0x24, 0x34, 0xF6, 0xB4, 0x9E, 0xB9, 0xB0, 0x75, 0xF7, -0xA7, 0xFE, 0x9C, 0xA2, 0x02, 0x3C, 0xAE, 0xC4, 0xE1, 0x98, -0xA3, 0x81, 0x5B, 0x54, 0x09, 0x5D, 0xCE, 0x07, 0x4D, 0x6C, -0x26, 0x14, 0x15, 0xA2, 0xAA, 0x61, 0x81, 0x5D, 0x30, 0x7D, -0xB2, 0xA5, 0x8F, 0x6C, 0xED, 0x23, 0xE3, 0x98, 0x28, 0x8A, -0x99, 0xFB, 0x01, 0x1C, 0xDC, 0xFB, 0xC9, 0xB7, 0x9D, 0xA7, -0x87, 0x82, 0x78, 0xB8, 0x6E, 0x09, 0x68, 0x33, 0x86, 0xE7, -0xAC, 0x03, 0x48, 0xF1, 0x39, 0x18, 0xF2, 0x3F, 0x03, 0x92, -0x0B, 0x4C, 0xC4, 0x35, 0x24, 0x93, 0x69, 0xE8, 0x86, 0x01, -0x3B, 0x32, 0xA8, 0x70, 0x58, 0x50, 0xEA, 0x92, 0x47, 0x39, -0x86, 0x3E, 0x40, 0xF4, 0xEF, 0x4B, 0x92, 0x14, 0xBA, 0x27, -0x40, 0x51, 0x94, 0xB5, 0x3F, 0x5D, 0xB9, 0x7E, 0xFC, 0xE5, -0x7D, 0xC7, 0xA9, 0xD2, 0xF2, 0x12, 0xF8, 0xCA, 0x4A, 0xC0, -0xCA, 0x22, 0x16, 0x86, 0xBE, 0x40, 0x6B, 0xA9, 0x84, 0x7E, -0xB3, 0x14, 0x61, 0x7B, 0x05, 0x52, 0xC4, 0x39, 0x28, 0x13, -0x7A, 0xD6, 0x04, 0x58, 0x86, 0xCC, 0x06, 0x32, 0x8A, 0x02, -0xBF, 0xC8, 0x61, 0xE9, 0x6C, 0x77, 0xCA, 0x69, 0x95, 0x8E, -0x12, 0xD0, 0x3E, 0x8B, 0xC5, 0xF2, 0x03, 0xF3, 0x17, 0xE7, -0xEE, 0x84, 0x9A, 0xFA, 0xF2, 0xC5, 0x9E, 0x8F, 0xED, 0x06, -0x74, 0x58, 0x1D, 0xB9, 0x30, 0x58, 0x0B, 0x24, 0xD9, 0x8E, -0x28, 0x3B, 0x1B, 0xF9, 0xE1, 0xEF, 0x90, 0x87, 0x71, 0x0C, -0xD1, 0x25, 0x10, 0xC8, 0x29, 0x9A, 0x36, 0xC1, 0x30, 0x14, -0x68, 0x32, 0x28, 0x62, 0x9F, 0x26, 0x2F, 0x19, 0x89, 0xAA, -0x38, 0x3D, 0x7C, 0x9B, 0x1D, 0xB9, 0x15, 0x59, 0x92, 0x2F, -0x4B, 0x9D, 0xBB, 0x5E, 0x7F, 0x75, 0xF8, 0x2E, 0xA0, 0xAB, -0xAB, 0xEB, 0xF0, 0xAE, 0x43, 0x7D, 0x35, 0xE7, 0x06, 0x83, -0xE0, 0x05, 0x1A, 0x26, 0x2B, 0x81, 0x11, 0xED, 0xE0, 0x79, -0x06, 0x16, 0x81, 0xC3, 0x44, 0x74, 0x02, 0x55, 0x1E, 0x05, -0xB1, 0x68, 0x08, 0xAA, 0x5C, 0x08, 0x8E, 0x38, 0x66, 0xD8, -0xA9, 0x8C, 0xA4, 0x61, 0x82, 0x84, 0x4C, 0xD3, 0xA0, 0x2A, -0x06, 0x34, 0xDD, 0x40, 0x28, 0x9E, 0x40, 0x6D, 0x51, 0x1E, -0x7A, 0xDE, 0x78, 0xAD, 0xFF, 0x0E, 0x20, 0x91, 0x48, 0xAC, -0x0F, 0x84, 0x13, 0xDD, 0x83, 0x0A, 0x03, 0x51, 0xB4, 0x90, -0x24, 0x9A, 0xA0, 0x58, 0x1E, 0xA2, 0x45, 0x82, 0xC4, 0x9B, -0xB0, 0x5B, 0x48, 0x44, 0x72, 0xBC, 0x60, 0x46, 0x4E, 0x61, -0xB1, 0x43, 0xC5, 0xA8, 0x38, 0x07, 0xB4, 0xC0, 0x83, 0xA5, -0x49, 0x49, 0xD0, 0x29, 0xE2, 0x54, 0x43, 0x2C, 0x91, 0x41, -0x8A, 0x40, 0x60, 0xC4, 0xB1, 0xCC, 0x27, 0x63, 0x5E, 0x8E, -0xAC, 0xEF, 0xD8, 0xB1, 0xE3, 0x4D, 0x2A, 0x16, 0x8B, 0xE5, -0xC5, 0x55, 0xED, 0x97, 0x8E, 0xDD, 0xFD, 0x6E, 0x4F, 0xA1, -0x07, 0xFE, 0x7C, 0x07, 0x72, 0x45, 0x1A, 0xB7, 0xC7, 0xA3, -0xB8, 0xA5, 0xA4, 0x60, 0xB1, 0x51, 0x98, 0xED, 0xE6, 0xE1, -0x76, 0xB0, 0x60, 0x6E, 0xFE, 0x88, 0xA7, 0xC4, 0x7E, 0x5C, -0x17, 0x8A, 0x30, 0x5C, 0xDC, 0x4C, 0x42, 0x04, 0x64, 0x8C, -0x2C, 0x42, 0xB1, 0x0C, 0xA2, 0x64, 0x64, 0xF5, 0x49, 0xC8, -0xDA, 0x6D, 0xB4, 0x3F, 0xD6, 0x86, 0x3D, 0xBB, 0xF7, 0x1C, -0xE9, 0xEE, 0xEE, 0xDE, 0x42, 0x8D, 0x8C, 0x8C, 0x6C, 0x4B, -0x19, 0xFC, 0x7B, 0x5D, 0x87, 0xCE, 0xE1, 0xD2, 0x78, 0x1A, -0x6E, 0xAF, 0x0B, 0xC5, 0x05, 0x76, 0xCC, 0x2D, 0x74, 0xA0, -0xD0, 0x23, 0x81, 0x35, 0x53, 0x50, 0xD3, 0x31, 0x72, 0x63, -0x9D, 0x84, 0x2A, 0x0B, 0xD7, 0xC0, 0x01, 0xAC, 0x9C, 0x0B, -0x9C, 0x2A, 0x58, 0x8D, 0x49, 0xD9, 0x05, 0x33, 0x4B, 0x21, -0x46, 0x5E, 0x6C, 0xA4, 0xA2, 0x10, 0x13, 0xD7, 0x50, 0xE9, -0x6D, 0x80, 0xA0, 0xBB, 0x23, 0x75, 0x75, 0x75, 0x8F, 0x46, -0x22, 0x91, 0x6B, 0x4C, 0x32, 0x99, 0x5C, 0xB2, 0xA6, 0xE9, -0x89, 0x96, 0xB6, 0x15, 0xA5, 0x58, 0x5E, 0xE6, 0x41, 0x22, -0x3A, 0x89, 0xE1, 0x60, 0x14, 0x71, 0x9A, 0x41, 0x86, 0x31, -0x21, 0x58, 0x59, 0xE4, 0x7B, 0x1C, 0xF0, 0xCA, 0x12, 0x38, -0x56, 0x47, 0xD8, 0x26, 0xC3, 0x13, 0x18, 0x80, 0x33, 0x13, -0xC6, 0x8D, 0xBC, 0x3C, 0x24, 0xCD, 0x08, 0xAC, 0x54, 0x18, -0x8E, 0xCC, 0x30, 0x24, 0xC6, 0x81, 0xA5, 0xF9, 0xAB, 0x30, -0x15, 0x9A, 0xF3, 0xE7, 0xCF, 0x1F, 0xBF, 0xF3, 0x4D, 0x69, -0x9A, 0x16, 0x6A, 0x6A, 0x6A, 0x9E, 0xDC, 0xB4, 0x69, 0xD3, -0xF6, 0xC6, 0xC6, 0xC6, 0x2A, 0x9B, 0xCD, 0x46, 0x45, 0xD4, -0x0C, 0x4E, 0x5C, 0x1A, 0xC3, 0x85, 0x70, 0x0C, 0x2E, 0x17, -0x0B, 0x6F, 0xAE, 0x00, 0x4F, 0x0E, 0x0B, 0x17, 0x81, 0xD9, -0xB9, 0x0C, 0x32, 0xFD, 0x1F, 0xA0, 0x96, 0xFA, 0x15, 0xA7, -0x0A, 0x2B, 0x10, 0x9C, 0xE5, 0x44, 0x56, 0x8D, 0x42, 0x57, -0x05, 0xAC, 0x9C, 0xB5, 0x01, 0xBF, 0x0D, 0xDE, 0x1C, 0x6A, -0x6A, 0x6A, 0xAA, 0x32, 0x0C, 0x23, 0xFA, 0xF7, 0x3A, 0xE0, -0xCB, 0xCB, 0xCB, 0xEB, 0xDA, 0xDB, 0xDB, 0xB7, 0xB7, 0xB5, -0xB5, 0xAD, 0x76, 0x3A, 0x9D, 0xBC, 0x41, 0x31, 0x18, 0xB8, -0x31, 0x8E, 0x8B, 0x13, 0xE3, 0xE0, 0xAC, 0x59, 0x92, 0x07, -0x86, 0x24, 0x9C, 0x82, 0xC8, 0xA4, 0x51, 0xD4, 0xBB, 0x1F, -0xD6, 0x05, 0xD5, 0xF8, 0xC6, 0xAB, 0x62, 0x2C, 0x1E, 0x87, -0x9F, 0x5A, 0x88, 0xB5, 0xB9, 0xAB, 0xCC, 0xD6, 0xD6, 0xD6, -0x0D, 0x67, 0xCE, 0x9C, 0xF9, 0xE8, 0x1F, 0x2B, 0x99, 0x08, -0xE3, 0xF3, 0xF9, 0x2A, 0xD6, 0xAD, 0x5B, 0xF7, 0x52, 0x47, -0x47, 0xC7, 0xD3, 0x64, 0x6D, 0x67, 0x79, 0x1E, 0x83, 0x91, -0x08, 0x2E, 0x4E, 0x06, 0xA1, 0x70, 0x2A, 0x9C, 0x76, 0x13, -0x39, 0x66, 0x12, 0xF3, 0xAF, 0x5E, 0xC5, 0xF8, 0xD2, 0x65, -0x08, 0xC4, 0x46, 0xD1, 0x68, 0xAB, 0xC5, 0xD7, 0x9F, 0x7F, -0xD5, 0xDB, 0xD9, 0xD9, 0xD9, 0x32, 0xD5, 0x10, 0xA6, 0x03, -0xDC, 0xD5, 0xC9, 0xB2, 0x5C, 0xD0, 0xD2, 0xD2, 0xB2, 0x65, -0xF3, 0xE6, 0xCD, 0x5B, 0xCA, 0xCA, 0xCA, 0x7C, 0xA4, 0xB1, -0xE1, 0x86, 0x3A, 0x89, 0x4B, 0x91, 0x41, 0x8C, 0xEA, 0x21, -0x98, 0x14, 0x4D, 0xBA, 0x2E, 0x85, 0x35, 0xF3, 0xAA, 0xE0, -0xD5, 0x04, 0xAD, 0xA1, 0xA1, 0x61, 0x05, 0xF9, 0x34, 0xDF, -0x4F, 0xDB, 0x8B, 0xEE, 0x05, 0x22, 0x8E, 0x9D, 0xE4, 0xF0, -0x7A, 0x02, 0xDA, 0x5A, 0x5D, 0x5D, 0xBD, 0x90, 0xF4, 0x1A, -0x4C, 0xA4, 0x15, 0xF4, 0x05, 0x87, 0x31, 0xA6, 0xC5, 0xF0, -0x7C, 0xE9, 0x72, 0xBC, 0xFB, 0xF6, 0x3B, 0x07, 0x7B, 0x7A, -0x7A, 0xB6, 0x12, 0x7B, 0x63, 0xA6, 0x80, 0x3F, 0x8D, 0x29, -0xCA, 0x52, 0x59, 0x59, 0xB9, 0x7A, 0xE3, 0xC6, 0x8D, 0xDB, -0x9A, 0x9B, 0x9B, 0xEB, 0xAD, 0x56, 0x2B, 0xCD, 0x90, 0x62, -0x08, 0x04, 0x02, 0x21, 0x72, 0x81, 0x47, 0x48, 0x4D, 0x05, -0x66, 0xE2, 0x6F, 0x3A, 0xE1, 0x8A, 0x8B, 0x8B, 0x6B, 0x77, -0xEE, 0xDC, 0x79, 0xF4, 0xE4, 0xC9, 0x93, 0x37, 0xEB, 0xEB, -0xEB, 0x5F, 0x98, 0xE9, 0x65, 0xEF, 0x57, 0xA6, 0x9A, 0x91, -0xFD, 0x8F, 0xF9, 0xBF, 0x91, 0xDF, 0x01, 0x72, 0xD8, 0xEB, -0xCC, 0xAF, 0xB0, 0x2D, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0xC5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x85, 0x55, 0x0B, 0x6C, 0x53, 0xE7, 0x15, -0xFE, 0xCE, 0x7D, 0xF8, 0x6D, 0xC7, 0xCE, 0x9B, 0xC4, 0x76, -0x12, 0x88, 0x12, 0xDA, 0x3C, 0x58, 0x43, 0x50, 0x18, 0x6B, -0xB7, 0x69, 0x19, 0xB4, 0x2A, 0x08, 0xA8, 0xA8, 0x52, 0x34, -0x06, 0x22, 0x24, 0x0D, 0x84, 0x01, 0x12, 0x4A, 0xB4, 0x57, -0xA7, 0x02, 0x6B, 0x47, 0x25, 0x36, 0x54, 0x3A, 0x75, 0x12, -0xA0, 0x11, 0x69, 0xB0, 0x89, 0x0C, 0x69, 0x5D, 0xBA, 0x08, -0x18, 0x45, 0x6B, 0x12, 0x22, 0xB2, 0x41, 0xCA, 0xD8, 0xD2, -0x50, 0x48, 0x42, 0xC8, 0x52, 0x12, 0xC7, 0x71, 0x9A, 0x97, -0xED, 0xF8, 0x11, 0xDB, 0xF7, 0xEE, 0xDC, 0x64, 0x93, 0x06, -0xA5, 0xEB, 0x91, 0x8E, 0xFF, 0xEB, 0xFF, 0xDE, 0xFF, 0xFB, -0xCF, 0x39, 0xFF, 0xF9, 0xBE, 0x9F, 0xF0, 0x7F, 0xAC, 0xAB, -0xAB, 0xCB, 0xE2, 0x70, 0x38, 0x36, 0x58, 0xAD, 0xD6, 0x6F, -0xEB, 0xF5, 0xFA, 0x62, 0x51, 0x14, 0x33, 0x89, 0x4D, 0x51, -0x94, 0xA9, 0x70, 0x38, 0xDC, 0x37, 0x3A, 0x3A, 0xDA, 0x19, -0x0C, 0x06, 0x5B, 0x2A, 0x2B, 0x2B, 0x47, 0xBF, 0x08, 0x43, -0x7C, 0xD2, 0x64, 0x73, 0x73, 0xB3, 0xA5, 0xB1, 0xB1, 0xF1, -0xF5, 0xBC, 0xBC, 0xBC, 0xF3, 0x4E, 0xA7, 0x73, 0x9B, 0x4E, -0x6F, 0x2C, 0x8B, 0x26, 0xE0, 0x8C, 0xC4, 0x54, 0x7B, 0x24, -0xAE, 0xDA, 0x12, 0x2A, 0x2D, 0x31, 0x99, 0x4D, 0x45, 0x2E, -0x67, 0xF6, 0x7A, 0x8B, 0xD9, 0x7C, 0x60, 0xDB, 0xB6, 0x6D, -0x45, 0xDB, 0xB7, 0x6F, 0xFF, 0x47, 0x53, 0x53, 0xD3, 0xD4, -0xE3, 0x58, 0xC2, 0xE3, 0x13, 0xE7, 0xCF, 0x9F, 0x2F, 0xCF, -0xCF, 0xCF, 0xEF, 0x29, 0x2E, 0x2E, 0x7E, 0x2D, 0x41, 0x3A, -0x7B, 0xEF, 0x90, 0x0F, 0xB7, 0x07, 0x7D, 0xB8, 0x37, 0xEA, -0xC7, 0x80, 0x37, 0x88, 0xFE, 0xB1, 0x20, 0x7A, 0x1F, 0xFA, -0xF1, 0xD7, 0x7B, 0xE3, 0x68, 0xBB, 0x3D, 0x0C, 0xAF, 0x3F, -0x2E, 0xE5, 0xE4, 0x2D, 0xAD, 0xE2, 0x40, 0xFE, 0xD9, 0xDD, -0xDD, 0x5D, 0xF7, 0x38, 0x1E, 0xFD, 0xEF, 0x9F, 0x33, 0x67, -0xCE, 0x54, 0x96, 0x95, 0x95, 0xBD, 0x9F, 0xED, 0x74, 0x9B, -0x86, 0x3F, 0x9B, 0x43, 0x30, 0x0A, 0x24, 0x54, 0x76, 0x45, -0x45, 0x5C, 0x51, 0x90, 0x48, 0x2C, 0x8E, 0x71, 0x6D, 0x4C, -0xFC, 0x77, 0x4C, 0x40, 0x50, 0xE6, 0xB1, 0x72, 0x69, 0x32, -0x52, 0x2C, 0x32, 0x3C, 0x1E, 0xCF, 0x9B, 0xE5, 0xE5, 0xE5, -0xAF, 0x7F, 0x2E, 0x83, 0xB3, 0x67, 0xCF, 0x16, 0x94, 0x96, -0x96, 0xBE, 0x97, 0x9A, 0x9E, 0x69, 0xEE, 0x7D, 0x38, 0x83, -0x89, 0x60, 0x82, 0x82, 0xD1, 0x38, 0x05, 0xC2, 0x31, 0x44, -0xE6, 0xE3, 0x94, 0x91, 0x64, 0xA4, 0xA2, 0x9C, 0x64, 0xFA, -0x4A, 0x5E, 0x2A, 0x9E, 0x72, 0xDA, 0x29, 0xD9, 0xA2, 0x87, -0x3F, 0x34, 0x4F, 0xD3, 0x73, 0x31, 0xF2, 0x06, 0x55, 0xFC, -0xE9, 0x96, 0x87, 0x06, 0x3C, 0xB3, 0x94, 0x9E, 0x9E, 0xFE, -0x93, 0x9B, 0x37, 0x6F, 0xEE, 0x7A, 0x64, 0x83, 0xA3, 0x47, -0x8F, 0x92, 0xCB, 0xE5, 0x6A, 0x72, 0xB9, 0x73, 0x6C, 0x77, -0x46, 0xFC, 0x98, 0x0A, 0x2B, 0xF0, 0x33, 0xF0, 0x2C, 0x7B, -0x92, 0x49, 0xC6, 0xF3, 0x65, 0x6E, 0x64, 0x58, 0x05, 0x7C, -0x3A, 0xEA, 0x85, 0xC7, 0xEB, 0xC3, 0x12, 0x9B, 0x88, 0x75, -0x3C, 0xF7, 0xCA, 0x73, 0xF9, 0xE8, 0x1B, 0x0F, 0xE0, 0xD2, -0x1D, 0x1F, 0x3E, 0xE8, 0x9B, 0xC1, 0x5B, 0x17, 0xFB, 0x31, -0x30, 0x36, 0x0B, 0x9B, 0xCD, 0xF6, 0x76, 0x5B, 0x5B, 0x9B, -0x4B, 0xC3, 0x96, 0xB4, 0x1F, 0x3E, 0xCC, 0x0D, 0x05, 0x05, -0x05, 0x6B, 0x1E, 0x78, 0x67, 0x55, 0xDF, 0x9C, 0x82, 0x98, -0x92, 0xD0, 0xD2, 0x57, 0x45, 0x52, 0xF1, 0xB5, 0xA7, 0xF3, -0x20, 0x4B, 0xA2, 0xFA, 0xE1, 0x27, 0x13, 0x38, 0xD5, 0x35, -0x8E, 0x81, 0x89, 0x10, 0x4A, 0x1D, 0xBD, 0xEA, 0xE5, 0xD7, -0x36, 0x20, 0xC5, 0x66, 0x50, 0xB7, 0x54, 0x38, 0xF1, 0xE2, -0xBB, 0x1F, 0x31, 0x8A, 0xAA, 0x82, 0xD7, 0x8D, 0x9E, 0xBB, -0x81, 0xF7, 0x1B, 0x2A, 0xAD, 0x3A, 0x9D, 0xEE, 0xC7, 0x3C, -0x59, 0xBF, 0xD0, 0x45, 0x7B, 0xF7, 0xEE, 0x3D, 0xB6, 0x64, -0x49, 0x56, 0x61, 0x67, 0xFF, 0x04, 0x05, 0x62, 0xA0, 0x50, -0x2C, 0x81, 0xB9, 0x79, 0x85, 0x48, 0x4D, 0xD0, 0x33, 0xB9, -0x29, 0x90, 0x65, 0x99, 0x62, 0xB1, 0x28, 0xBD, 0xD9, 0x36, -0x46, 0x51, 0xC9, 0x80, 0xE9, 0xB8, 0x4C, 0xAF, 0x96, 0x3B, -0xC0, 0x6D, 0x4B, 0x26, 0x21, 0x4E, 0xEF, 0x5E, 0xF7, 0x80, -0x74, 0x06, 0x22, 0x51, 0xA0, 0xC9, 0xA8, 0x8A, 0x8A, 0x2C, -0x03, 0xE5, 0xA4, 0x27, 0x15, 0xE4, 0xE4, 0xE4, 0xBC, 0x23, -0x70, 0x8B, 0x49, 0xFC, 0xF0, 0x4D, 0xEF, 0x74, 0x10, 0xBE, -0x90, 0x82, 0x69, 0x2E, 0xCB, 0x54, 0x38, 0x8E, 0xDB, 0xDE, -0x00, 0xDE, 0xB8, 0x36, 0x82, 0xC3, 0xCD, 0x1D, 0x78, 0xAF, -0xFD, 0x23, 0xBC, 0x75, 0xA9, 0x07, 0x92, 0xDD, 0x0E, 0x29, -0x29, 0x09, 0x76, 0x87, 0x79, 0xA1, 0xBE, 0xA1, 0x50, 0x08, -0x43, 0x9E, 0x09, 0x88, 0x36, 0x1B, 0x44, 0x8B, 0x19, 0x82, -0xD9, 0x04, 0x58, 0x6D, 0xE8, 0x18, 0xF8, 0x0C, 0xA9, 0xA9, -0xA9, 0xB6, 0x8C, 0x8C, 0x8C, 0x35, 0xE2, 0xEA, 0xD5, 0xAB, -0xDD, 0x9B, 0x36, 0x6D, 0xFA, 0x7E, 0xBF, 0x67, 0x1A, 0xBD, -0xBE, 0x30, 0x82, 0x31, 0x05, 0xED, 0xC3, 0x33, 0xE8, 0xF4, -0x04, 0x31, 0x2F, 0xEB, 0xD1, 0x1D, 0xD0, 0xA3, 0xE5, 0x21, -0xF0, 0x40, 0x4C, 0x65, 0x10, 0x0B, 0x44, 0x93, 0x11, 0xDF, -0x2B, 0xD1, 0xA1, 0x2C, 0xD3, 0x88, 0x48, 0x24, 0x82, 0x37, -0xDA, 0x87, 0x31, 0x24, 0x67, 0x70, 0x06, 0x12, 0x04, 0x51, -0x00, 0x89, 0x04, 0xAB, 0x12, 0xC6, 0x77, 0x9F, 0x5D, 0x8E, -0x91, 0x91, 0x91, 0xFB, 0x82, 0xC1, 0x60, 0xC8, 0x90, 0x24, -0x89, 0x02, 0xD1, 0x38, 0x26, 0xC3, 0x31, 0xFA, 0xF3, 0xD0, -0x24, 0xDD, 0x99, 0x8D, 0x42, 0x34, 0xEA, 0x49, 0xB4, 0x98, -0x48, 0xB4, 0xDB, 0x20, 0xA5, 0xA5, 0x92, 0x94, 0x62, 0x27, -0x29, 0xD9, 0x46, 0xCF, 0xE7, 0x8A, 0xD8, 0xB5, 0xC2, 0x41, -0x1A, 0xF8, 0xCF, 0x3B, 0x07, 0xE9, 0x2F, 0xBA, 0x7C, 0xED, -0x1D, 0x64, 0x87, 0x8D, 0x24, 0xBB, 0x85, 0x24, 0xAB, 0x19, -0x61, 0x10, 0x69, 0x98, 0xF1, 0x78, 0xDC, 0x21, 0xF2, 0xE1, -0x66, 0x72, 0x06, 0xAF, 0x0E, 0xFB, 0x66, 0xF0, 0x9B, 0x8F, -0xC7, 0xF1, 0x69, 0x88, 0xFB, 0x5A, 0xAF, 0x83, 0xC0, 0x91, -0x8A, 0x9C, 0xB2, 0x64, 0xE5, 0xA8, 0x79, 0x91, 0x56, 0x02, -0xB7, 0x29, 0x81, 0x5F, 0x97, 0x49, 0x08, 0x06, 0xE7, 0xF0, -0xA3, 0xBF, 0x79, 0x71, 0xD1, 0xB8, 0x1C, 0x02, 0xBF, 0x27, -0xBD, 0x04, 0x92, 0x45, 0x8E, 0x9E, 0x89, 0xC5, 0x8D, 0x51, -0x6C, 0x88, 0x60, 0x4B, 0x59, 0x2E, 0x7A, 0x7B, 0x7B, 0x3B, -0x44, 0xD6, 0x99, 0xA4, 0xAD, 0x5B, 0xB7, 0xEE, 0x8B, 0x31, -0x71, 0xDE, 0xB9, 0x3E, 0x48, 0xA4, 0x37, 0x90, 0x60, 0xE0, -0x0D, 0x8C, 0x46, 0x12, 0xCD, 0x66, 0x5A, 0x00, 0x37, 0x73, -0x26, 0x26, 0x3D, 0x35, 0x66, 0x04, 0xC8, 0x29, 0xC7, 0x50, -0xFB, 0xF7, 0x00, 0xF5, 0xA4, 0x15, 0x73, 0x96, 0x46, 0x12, -0x74, 0x22, 0x09, 0x0C, 0x2E, 0x88, 0x44, 0xDC, 0xF4, 0x2C, -0x54, 0x71, 0xBC, 0x94, 0xAE, 0xD0, 0xB3, 0x05, 0xD9, 0xC4, -0x7C, 0xB8, 0xC4, 0x18, 0x66, 0x61, 0xDD, 0xBA, 0x75, 0x0D, -0x85, 0x79, 0x2E, 0xFA, 0x63, 0x77, 0x3F, 0x4D, 0x8B, 0x86, -0x85, 0x0C, 0x44, 0xA3, 0x81, 0xB4, 0x7A, 0xFF, 0xC7, 0x49, -0x92, 0x05, 0x34, 0xDA, 0xA7, 0xD1, 0x3C, 0x1C, 0x44, 0x47, -0x72, 0x11, 0x03, 0x73, 0xD4, 0x92, 0xC0, 0xB5, 0x10, 0x34, -0x70, 0x4D, 0x13, 0x38, 0x78, 0x05, 0xE2, 0xCC, 0x38, 0x7E, -0xBA, 0x3A, 0x8B, 0x89, 0x68, 0x44, 0x4B, 0x4B, 0x4B, 0xB3, -0xC8, 0xFD, 0x1A, 0x71, 0xBB, 0xDD, 0x35, 0x2B, 0x57, 0xAE, -0xB4, 0xD9, 0x65, 0xD0, 0xA5, 0xC1, 0x49, 0x90, 0xC1, 0xC8, -0x9B, 0xE8, 0x49, 0xD0, 0x1B, 0x20, 0x1A, 0xF4, 0x8B, 0xCF, -0x92, 0x88, 0x87, 0x0F, 0xEE, 0xE3, 0x16, 0x25, 0x63, 0xCE, -0x9A, 0x4A, 0x24, 0x30, 0x22, 0xE3, 0x93, 0xB0, 0xA8, 0x38, -0xA4, 0x24, 0x08, 0xF3, 0x51, 0xBC, 0x00, 0x2F, 0xAA, 0xBF, -0xFA, 0x14, 0x79, 0xBD, 0x5E, 0xF5, 0xC2, 0x85, 0x0B, 0xC7, -0x16, 0xB4, 0x68, 0xF3, 0xE6, 0xCD, 0x27, 0x4F, 0x9C, 0x38, -0x51, 0x97, 0x91, 0x99, 0x89, 0xDA, 0xA6, 0x0F, 0x71, 0x71, -0x8A, 0x3B, 0x82, 0xDB, 0x4D, 0xB2, 0x58, 0xB9, 0xFE, 0xDC, -0x82, 0x66, 0x33, 0x96, 0x1B, 0x62, 0xD8, 0xE7, 0x54, 0x70, -0x2D, 0x20, 0xE1, 0x0F, 0x73, 0x76, 0xAD, 0xD8, 0x8B, 0x5A, -0xC0, 0xFC, 0x52, 0x59, 0x8F, 0x54, 0x3E, 0xF4, 0xF4, 0x91, -0x8F, 0xF1, 0xFB, 0x17, 0x96, 0x22, 0x2B, 0xD5, 0x81, 0x2B, -0x57, 0xAE, 0x4C, 0x1C, 0x3E, 0x7C, 0x38, 0x77, 0xE1, 0xAB, -0xC2, 0xC2, 0xC2, 0x67, 0x0E, 0x1C, 0x38, 0x70, 0x63, 0xE7, -0xCE, 0x9D, 0x72, 0x34, 0xAE, 0xA0, 0xA6, 0xA9, 0x5D, 0xBD, -0xE6, 0xE7, 0xFA, 0x5A, 0x92, 0x20, 0x99, 0x2C, 0xAA, 0x68, -0x32, 0xD3, 0xD7, 0x75, 0x13, 0xF8, 0x61, 0xB1, 0x0E, 0x37, -0x3C, 0x21, 0xF5, 0x67, 0xFE, 0x02, 0x82, 0x24, 0x33, 0xB2, -0x4A, 0x2A, 0x97, 0x05, 0xB1, 0x79, 0x35, 0x65, 0xFC, 0x13, -0x3A, 0x56, 0x61, 0xC5, 0x8A, 0x65, 0x2E, 0x75, 0x6A, 0x6A, -0x8A, 0x4E, 0x9F, 0x3E, 0x7D, 0xEC, 0xF8, 0xF1, 0xE3, 0x3F, -0x58, 0x90, 0x8A, 0xBE, 0xBE, 0xBE, 0xDB, 0x57, 0xAF, 0x5E, -0xFD, 0x2D, 0x13, 0xA3, 0x7A, 0xFD, 0xFA, 0xF5, 0x38, 0x57, -0xF7, 0x2D, 0xBC, 0xDD, 0x7A, 0x0B, 0x27, 0x6F, 0x8D, 0x22, -0x6E, 0xC9, 0x04, 0x0C, 0x71, 0x5C, 0x13, 0xCD, 0xE8, 0xFE, -0x97, 0x1F, 0x51, 0xD9, 0x0A, 0x32, 0x85, 0x16, 0x85, 0x98, -0xA5, 0x41, 0x08, 0x4D, 0xA3, 0x34, 0x71, 0x1F, 0x7B, 0x2B, -0xD2, 0xE0, 0x62, 0x02, 0x32, 0x38, 0xEE, 0xDE, 0xBD, 0x3B, -0xD2, 0xD1, 0xD1, 0xF1, 0x8B, 0x47, 0xE4, 0x3A, 0x2B, 0x2B, -0x2B, 0xB9, 0xAA, 0xAA, 0xAA, 0x9D, 0x89, 0x57, 0xBC, 0x76, -0xED, 0x5A, 0xF0, 0xE1, 0x63, 0xD8, 0x3B, 0x89, 0x73, 0xED, -0x7D, 0xB8, 0x7A, 0xCF, 0x0F, 0x4F, 0x44, 0x0F, 0xE8, 0x18, -0x5C, 0xE0, 0x8E, 0x51, 0x62, 0xB0, 0x28, 0x01, 0xAC, 0x48, -0x8E, 0x62, 0x4D, 0xB6, 0x8A, 0x82, 0x2C, 0x1B, 0xB8, 0x1B, -0xC1, 0xB7, 0x9E, 0x46, 0xBE, 0xF0, 0xA1, 0x43, 0x87, 0x5E, -0xFA, 0x80, 0xED, 0x91, 0x1B, 0x2D, 0x10, 0x08, 0x84, 0xC7, -0xC6, 0xC6, 0x2E, 0x33, 0xF1, 0xBE, 0xD1, 0xD3, 0xD3, 0x93, -0xC9, 0x1B, 0x50, 0xC1, 0xD2, 0x5C, 0x7A, 0xAE, 0xC8, 0x89, -0xEF, 0xAC, 0x71, 0xD3, 0x96, 0x62, 0x0B, 0x55, 0xBA, 0x12, -0xF4, 0x62, 0xAE, 0x82, 0x97, 0x9F, 0x96, 0x68, 0x6B, 0x99, -0x1D, 0x15, 0x79, 0x56, 0xCA, 0x4E, 0x4B, 0xD2, 0x6E, 0x51, -0x0D, 0x58, 0x23, 0x96, 0xFF, 0xC8, 0x91, 0x23, 0xBB, 0xB8, -0x1A, 0xAD, 0x4F, 0xBC, 0x70, 0x34, 0x5B, 0xB6, 0x6C, 0x59, -0x72, 0x49, 0x49, 0xC9, 0x2F, 0x57, 0xAD, 0x5A, 0x55, 0x95, -0x96, 0x96, 0x26, 0x33, 0x11, 0xD5, 0xEC, 0xEC, 0x6C, 0xD2, -0x22, 0x64, 0x76, 0x82, 0x41, 0x54, 0x0D, 0x8C, 0xEF, 0x62, -0x75, 0x68, 0x68, 0x88, 0xB4, 0x92, 0x58, 0x2C, 0x16, 0x95, -0x83, 0xEB, 0x6B, 0x6D, 0x6D, 0xAD, 0xE5, 0xC3, 0xBD, 0xFE, -0x85, 0x37, 0x9A, 0x66, 0x1B, 0x37, 0x6E, 0x24, 0x2E, 0xD7, -0x72, 0xBF, 0xDF, 0xBF, 0x8F, 0xCF, 0xE4, 0x65, 0x6E, 0xE1, -0x34, 0x96, 0x73, 0x98, 0x4C, 0x26, 0x4D, 0x55, 0x17, 0x36, -0xD1, 0x3C, 0x16, 0x8B, 0xA1, 0xB3, 0xB3, 0x53, 0xCB, 0x3C, -0xE2, 0xF3, 0xF9, 0x6E, 0xB0, 0xB2, 0xFE, 0x4A, 0x10, 0x84, -0xCB, 0xA7, 0x4E, 0x9D, 0x9A, 0x7B, 0x1C, 0xF3, 0x73, 0xB6, -0x7B, 0xF7, 0x6E, 0xB1, 0xBE, 0xBE, 0xDE, 0xBD, 0x67, 0xCF, -0x9E, 0x57, 0x6A, 0x6B, 0x6B, 0x4F, 0xB2, 0xE2, 0x76, 0xD5, -0xD5, 0xD5, 0xDD, 0x3F, 0x78, 0xF0, 0xE0, 0x48, 0x43, 0x43, -0xC3, 0xC8, 0xFE, 0xFD, 0xFB, 0x07, 0x77, 0xEC, 0xD8, 0xD1, -0x5D, 0x5D, 0x5D, 0xFD, 0x3B, 0xFE, 0xA6, 0x9E, 0xBD, 0x84, -0xBF, 0x37, 0x7E, 0x29, 0xF0, 0x93, 0x8C, 0x41, 0x24, 0x5E, -0x6C, 0x61, 0x4F, 0x63, 0x77, 0x32, 0x98, 0x93, 0xC7, 0x74, -0x1E, 0xAD, 0x35, 0x35, 0x35, 0xF2, 0x97, 0xAD, 0xFF, 0x37, -0x84, 0x15, 0xB6, 0xDE, 0xA9, 0xD0, 0x66, 0x37, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Log1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0xE9, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x54, 0x5D, 0x6C, 0x93, 0x55, 0x18, -0x7E, 0xCE, 0xF9, 0xDA, 0x0E, 0x3B, 0xD6, 0xE2, 0x58, 0xB7, -0x76, 0x23, 0xD4, 0x64, 0xC6, 0x4D, 0x26, 0x65, 0x75, 0x84, -0xC4, 0x6B, 0x13, 0x13, 0x3B, 0xF1, 0xC2, 0x3F, 0x6C, 0x4C, -0xB8, 0x50, 0x82, 0xEE, 0xA7, 0xDB, 0x57, 0xC4, 0x71, 0xA3, -0xC3, 0x18, 0x35, 0xEE, 0xC2, 0xE8, 0x22, 0xF1, 0x82, 0x84, -0x09, 0x4A, 0x82, 0x89, 0x9A, 0x25, 0x18, 0xC0, 0x78, 0x01, -0x89, 0x3F, 0x41, 0x2E, 0x70, 0xDD, 0x20, 0x04, 0x31, 0x73, -0xE9, 0x12, 0x60, 0xA2, 0x41, 0x18, 0x0E, 0xDA, 0x2E, 0xED, -0xE7, 0x7B, 0xCE, 0x77, 0xBE, 0xBF, 0xD1, 0x7A, 0xA5, 0xA7, -0x79, 0x7B, 0xDE, 0x73, 0xBE, 0x73, 0xDE, 0xE7, 0x9C, 0xE7, -0x39, 0xEF, 0x0B, 0xFC, 0xCF, 0x4D, 0xB3, 0x9C, 0xB1, 0xB1, -0xB1, 0x47, 0x27, 0x0E, 0x1E, 0x3A, 0x95, 0xCD, 0xEE, 0xD2, -0xF5, 0x6C, 0x56, 0xD7, 0x77, 0xBE, 0xAC, 0x0F, 0x8F, 0x8C, -0xE8, 0xC3, 0x7A, 0x56, 0x1F, 0x1A, 0xD6, 0xA5, 0x65, 0x84, -0x91, 0x33, 0x28, 0x8C, 0x06, 0x03, 0x99, 0x21, 0x7D, 0x60, -0x70, 0x48, 0xEF, 0xCF, 0x64, 0xF4, 0x7E, 0xEA, 0xFB, 0x06, -0x32, 0x64, 0x83, 0x7A, 0x2C, 0x16, 0x3B, 0x77, 0xEA, 0xE4, -0xC9, 0x39, 0x11, 0x97, 0x5B, 0x00, 0xA1, 0x70, 0x38, 0x18, -0x8B, 0x46, 0xE3, 0xD1, 0x68, 0x2C, 0x1E, 0x8D, 0x91, 0x59, -0xBE, 0xEC, 0xA3, 0xF1, 0x16, 0x61, 0x2D, 0x2D, 0xD2, 0x9A, -0xDD, 0xD6, 0xDC, 0x1C, 0x8F, 0x44, 0x5A, 0xC8, 0x9A, 0xA5, -0x35, 0x91, 0x85, 0x42, 0xA1, 0xA0, 0x15, 0xD7, 0x67, 0x39, -0x8C, 0xAC, 0xB4, 0xBC, 0x8C, 0x0B, 0x17, 0x2F, 0x61, 0xD3, -0x43, 0x5D, 0x28, 0x57, 0x0C, 0x54, 0x2A, 0x15, 0xC0, 0xA0, -0xDE, 0xA0, 0x4E, 0xFC, 0xC8, 0x37, 0x2A, 0xD2, 0xA3, 0x6F, -0x62, 0x2C, 0xE6, 0x61, 0xCE, 0x8B, 0x75, 0x6A, 0x8D, 0xBB, -0xF9, 0xDC, 0x83, 0xBA, 0x40, 0x00, 0x1B, 0x3A, 0x1F, 0x00, -0x23, 0xB4, 0x8A, 0x02, 0x70, 0x02, 0x38, 0x81, 0xDC, 0xF6, -0xD7, 0xF5, 0xEB, 0x08, 0xAD, 0xB9, 0xD7, 0x99, 0x5B, 0xA1, -0x01, 0x5F, 0x31, 0x96, 0x20, 0x02, 0x81, 0x73, 0x06, 0x8D, -0x73, 0x68, 0x8C, 0x9B, 0xBD, 0x35, 0x56, 0xC6, 0xC9, 0xA6, -0x73, 0x53, 0x18, 0xD9, 0x9D, 0xC5, 0xD1, 0xC9, 0xAF, 0xA0, -0x69, 0x6A, 0x9E, 0xF6, 0xB2, 0x6A, 0x00, 0x02, 0xB9, 0x50, -0x2A, 0xE2, 0xCC, 0xD9, 0x29, 0xB9, 0x80, 0xA9, 0x3F, 0xD1, -0x8B, 0x2D, 0xCC, 0xF2, 0x99, 0xF2, 0xE9, 0xF3, 0xF8, 0x07, -0xEF, 0x13, 0x65, 0x15, 0x14, 0x4B, 0x25, 0x73, 0x0D, 0x1D, -0x82, 0x9B, 0x8B, 0xAA, 0xDF, 0xA0, 0xCE, 0x1F, 0xC0, 0x96, -0x9E, 0x6E, 0x5B, 0x95, 0x7F, 0x03, 0xF9, 0xE3, 0xFB, 0xEF, -0xF0, 0x5A, 0x2A, 0x85, 0xA6, 0xB5, 0x4D, 0x78, 0x6E, 0xDB, -0xF3, 0xCE, 0x1A, 0x5E, 0xE3, 0x06, 0x90, 0x1C, 0x9B, 0xDC, -0x1B, 0x4A, 0x74, 0x56, 0x03, 0xA4, 0x5C, 0xB8, 0x83, 0xA5, -0x43, 0x07, 0x11, 0x9D, 0x9C, 0xC4, 0xAE, 0x17, 0x5F, 0x82, -0xDF, 0xEF, 0x37, 0x03, 0xAB, 0x35, 0x55, 0x35, 0x90, 0x14, -0x15, 0x8B, 0x38, 0x3B, 0x35, 0x23, 0x91, 0x2C, 0xB9, 0xAA, -0x81, 0xE4, 0x27, 0x0E, 0xA0, 0x95, 0xBE, 0xCF, 0xB7, 0xB6, -0xA1, 0x6D, 0x53, 0xB7, 0xE2, 0x9D, 0xD9, 0x20, 0x35, 0x28, -0x32, 0x10, 0x08, 0xF8, 0xD1, 0x93, 0x4C, 0xA8, 0x17, 0x83, -0xAA, 0x20, 0x4B, 0xF3, 0x79, 0xF0, 0x6F, 0x4E, 0x20, 0x9F, -0xCF, 0xA3, 0xFD, 0xD5, 0xDD, 0x52, 0x6C, 0x71, 0x2B, 0x0F, -0x48, 0x2D, 0x8A, 0x04, 0x3D, 0x37, 0x17, 0x17, 0xED, 0xC0, -0xD5, 0x40, 0xE6, 0xC6, 0x3F, 0x44, 0x98, 0x44, 0x2D, 0x3C, -0xB1, 0x15, 0x91, 0xF6, 0x76, 0x8F, 0xF0, 0x16, 0x88, 0xBB, -0xF9, 0x5C, 0xF1, 0x65, 0xA2, 0x5D, 0x5D, 0xB8, 0x86, 0x50, -0x43, 0x83, 0x99, 0x30, 0x92, 0x2A, 0x11, 0xC1, 0x90, 0x1B, -0xAF, 0x9D, 0x3E, 0x8D, 0xE0, 0x99, 0x9F, 0x30, 0xEB, 0xF3, -0x21, 0xD1, 0xD7, 0x6F, 0x06, 0x63, 0xD6, 0x6E, 0x66, 0x9F, -0x98, 0xB9, 0x28, 0xB2, 0x6B, 0x51, 0x6F, 0x6F, 0x6F, 0x47, -0x4F, 0xCF, 0xE6, 0xF4, 0xDA, 0xC6, 0x46, 0xB9, 0xB8, 0x42, -0x4F, 0x16, 0xF4, 0xAA, 0x98, 0x3A, 0xBF, 0x78, 0x8E, 0x17, -0x86, 0x32, 0xA8, 0xBB, 0x7C, 0x19, 0xFE, 0x3D, 0x7B, 0xD0, -0x9A, 0x7C, 0xD8, 0xFE, 0xE6, 0x1C, 0xDA, 0x74, 0x66, 0xA6, -0x73, 0x47, 0x8E, 0x1F, 0x3F, 0x76, 0xC9, 0x0B, 0x90, 0xEA, -0xED, 0xE8, 0xDA, 0x98, 0x48, 0x5F, 0x59, 0xF8, 0x5D, 0xDE, -0xA0, 0x42, 0x82, 0x43, 0x24, 0x9D, 0xBA, 0xF4, 0xEC, 0xE7, -0x47, 0xC0, 0xBF, 0xFC, 0x02, 0x57, 0x89, 0x96, 0xCD, 0x6F, -0xBD, 0x0D, 0xAE, 0x71, 0x8B, 0x38, 0x77, 0x6C, 0xE9, 0xB8, -0x01, 0x3C, 0xAF, 0x48, 0xB0, 0xA2, 0x69, 0x9A, 0xB7, 0x34, -0xD0, 0xAF, 0x70, 0xE3, 0x06, 0x16, 0xC6, 0xDE, 0xC3, 0xE2, -0xED, 0xDB, 0xB8, 0x7F, 0xEF, 0x9B, 0xF0, 0x11, 0x45, 0x8E, -0xF0, 0x4A, 0x03, 0x4F, 0x9E, 0x38, 0x1A, 0xD8, 0x37, 0x48, -0x11, 0x45, 0xDD, 0xC9, 0x64, 0x7A, 0x75, 0x7D, 0xBD, 0x09, -0x58, 0x34, 0x29, 0x12, 0xED, 0xFC, 0xBB, 0xEF, 0xA0, 0xFE, -0xC7, 0x1F, 0xB0, 0xF4, 0xF4, 0x33, 0xD8, 0xB8, 0x63, 0x87, -0x62, 0x85, 0xB9, 0x34, 0x80, 0xE7, 0x26, 0xD3, 0x39, 0xBA, -0xC1, 0xB1, 0x15, 0x14, 0x3D, 0x9E, 0x4A, 0x75, 0x74, 0x6E, -0xE8, 0x4A, 0xFF, 0x3A, 0x3B, 0x47, 0xD9, 0xD9, 0x68, 0x03, -0x94, 0xEE, 0xFC, 0x0D, 0xFF, 0x9F, 0x39, 0xCC, 0xFF, 0xF2, -0x1B, 0x12, 0xFB, 0xF6, 0xE3, 0x9E, 0xD5, 0x0D, 0x36, 0xEF, -0xB5, 0x40, 0xA6, 0x73, 0x3F, 0xDB, 0x00, 0x9E, 0x6A, 0xEA, -0xD3, 0x7C, 0x58, 0xBF, 0xAE, 0x4D, 0x52, 0x53, 0x2E, 0x53, -0x25, 0x2D, 0x97, 0x51, 0xB8, 0x79, 0x05, 0xC6, 0x7D, 0x61, -0xC4, 0xF7, 0x7F, 0x8C, 0xFA, 0x48, 0x04, 0xCB, 0x34, 0xE7, -0xA1, 0x47, 0x05, 0x95, 0xCF, 0x59, 0xE5, 0x8F, 0xBB, 0x79, -0x35, 0x20, 0xAB, 0x5B, 0xB5, 0x8A, 0xEA, 0xBF, 0x61, 0x9F, -0x6A, 0x9E, 0x12, 0x6B, 0x29, 0x9C, 0xC4, 0xBA, 0x07, 0x1F, -0x71, 0x0A, 0x9D, 0x6D, 0x2A, 0xC9, 0x54, 0xA5, 0x15, 0x49, -0x67, 0x89, 0x7F, 0x17, 0x80, 0x80, 0x2E, 0x12, 0x2D, 0xB9, -0x99, 0x73, 0xE6, 0x29, 0x0C, 0x53, 0xBC, 0xA6, 0xF5, 0x09, -0xC4, 0x3B, 0xB7, 0x38, 0x42, 0x02, 0x76, 0xC9, 0xE0, 0x60, -0xAE, 0x24, 0x73, 0xCA, 0xBA, 0x5B, 0x64, 0xDB, 0x1D, 0xFF, -0x68, 0xDF, 0xD6, 0xF4, 0x0B, 0xDB, 0x8F, 0x72, 0x6E, 0x6E, -0x30, 0x6E, 0xDD, 0x82, 0x41, 0x82, 0x8B, 0x53, 0xC9, 0x93, -0x78, 0x4E, 0xEE, 0x7D, 0x39, 0x60, 0x0E, 0xA8, 0x68, 0x9F, -0x4C, 0x1C, 0x78, 0xB2, 0xBF, 0xEF, 0x95, 0xAF, 0x3D, 0x00, -0xAF, 0xBF, 0x31, 0xFA, 0xD8, 0x53, 0xCF, 0x6E, 0xFB, 0x94, -0x33, 0x73, 0x9A, 0x53, 0xC5, 0x44, 0x30, 0x68, 0x97, 0x00, -0x39, 0x7B, 0x17, 0x80, 0x95, 0xB5, 0x5E, 0x4D, 0x0E, 0x1F, -0xFE, 0x6C, 0xFB, 0xDE, 0xD1, 0xD1, 0x6F, 0xB1, 0xA2, 0x31, -0x25, 0xFA, 0x7F, 0x61, 0xF6, 0xC1, 0xFF, 0x01, 0x59, 0x9D, -0x93, 0x96, 0xAE, 0x48, 0x48, 0x15, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Open1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0x81, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x9D, 0x55, 0x5B, 0x6B, 0x13, 0x41, 0x14, -0x3E, 0xB3, 0xB3, 0xDD, 0xCD, 0x65, 0x37, 0x4D, 0xC4, 0x60, -0x55, 0x8A, 0x36, 0x50, 0xEF, 0x5A, 0xB5, 0x5E, 0xA3, 0x48, -0x45, 0x11, 0x41, 0xA4, 0x2A, 0xE8, 0x93, 0xE0, 0x83, 0xE8, -0x43, 0x2B, 0x3E, 0x48, 0x8B, 0xFA, 0xE0, 0x1F, 0x10, 0x04, -0x41, 0xC1, 0x27, 0x45, 0x14, 0x11, 0x7D, 0x16, 0x7C, 0x13, -0xA1, 0xFA, 0x28, 0x3E, 0xA8, 0x78, 0x41, 0xA8, 0x25, 0x6A, -0xB5, 0xDA, 0xDA, 0x34, 0x4D, 0xD3, 0x24, 0xBB, 0x73, 0x3C, -0xB3, 0x49, 0xB6, 0x49, 0x76, 0x13, 0x2F, 0x27, 0x0C, 0x93, -0xDD, 0xCC, 0x7C, 0xE7, 0x3B, 0xDF, 0x77, 0x66, 0xC2, 0xC0, -0x27, 0x5E, 0x3C, 0x3A, 0xDF, 0x19, 0x0C, 0x68, 0x2A, 0x63, -0x0C, 0xE4, 0x00, 0x45, 0xCE, 0x4A, 0xCD, 0xF7, 0xBC, 0xAD, -0xC3, 0x68, 0xA6, 0x2D, 0x32, 0x93, 0xF9, 0x61, 0x8F, 0xA6, -0x5E, 0xCD, 0x08, 0x6B, 0x96, 0xA9, 0xCC, 0x4A, 0x9F, 0xBE, -0xF0, 0xE0, 0x73, 0x35, 0x16, 0xAF, 0x07, 0x3F, 0xB2, 0x7F, -0x3D, 0x3B, 0xB8, 0x77, 0xDD, 0xBB, 0x68, 0xD4, 0x1C, 0x0C, -0x85, 0x43, 0xFD, 0x61, 0x23, 0xD4, 0x17, 0x36, 0x8D, 0x33, -0x46, 0x24, 0xDC, 0x1F, 0x8E, 0x18, 0xFD, 0x41, 0x23, 0xDA, -0xC7, 0xC2, 0x4B, 0xCF, 0xA8, 0x46, 0xA2, 0x8F, 0xD6, 0x9C, -0x6A, 0x8B, 0xEB, 0xA7, 0xD7, 0x2E, 0x9B, 0xD7, 0xB7, 0x3A, -0x11, 0xEB, 0xFF, 0x96, 0xFA, 0xD0, 0xF5, 0x76, 0x38, 0x7D, -0x77, 0x6C, 0x3C, 0xEB, 0xE2, 0x29, 0xF5, 0x09, 0x34, 0x3D, -0xCC, 0x50, 0x20, 0x9B, 0x35, 0xF7, 0x40, 0x36, 0xD2, 0x0B, -0x59, 0xB3, 0x17, 0x32, 0xA1, 0x03, 0x90, 0xCA, 0x27, 0xC1, -0x0A, 0xAD, 0x04, 0x6E, 0xB4, 0x43, 0x2C, 0xC2, 0x20, 0x6E, -0x4C, 0x40, 0x3C, 0x34, 0x06, 0x51, 0x7D, 0x1A, 0x54, 0x40, -0x10, 0x85, 0x3C, 0x08, 0x5B, 0x70, 0xCB, 0xB2, 0x6B, 0xF0, -0x3C, 0x09, 0xBA, 0x93, 0xFB, 0x97, 0xF0, 0xF9, 0x3B, 0x82, -0xC8, 0x4D, 0x54, 0x14, 0x8E, 0x48, 0xEF, 0x84, 0x40, 0x1C, -0xF9, 0x34, 0x8C, 0xB1, 0x88, 0x8D, 0xE1, 0x90, 0x06, 0x5C, -0x0D, 0x20, 0x28, 0x2D, 0x24, 0x15, 0x47, 0xA0, 0x81, 0x76, -0x01, 0x80, 0x58, 0xC9, 0xFD, 0x58, 0x87, 0xE7, 0x49, 0xD0, -0xA2, 0x9B, 0x8B, 0xD4, 0xC8, 0xF2, 0xA0, 0xC2, 0x35, 0x12, -0x5C, 0xCA, 0x2E, 0x27, 0x60, 0x42, 0x88, 0xB2, 0x01, 0xB4, -0x85, 0x71, 0x7A, 0xCB, 0x9D, 0x19, 0xD0, 0x66, 0xC2, 0xCE, -0x3B, 0x6B, 0x6C, 0x62, 0x22, 0x04, 0x36, 0x4F, 0xD0, 0xD1, -0xD1, 0x71, 0xAE, 0x62, 0xAE, 0xA2, 0x28, 0xEE, 0x60, 0x0A, -0x2B, 0x2F, 0xE7, 0xA5, 0x99, 0x95, 0x66, 0x51, 0x9C, 0x9E, -0xDB, 0x5C, 0x4F, 0x9F, 0x42, 0xAD, 0x7F, 0x31, 0x34, 0x34, -0x74, 0xBF, 0xBB, 0xBB, 0xFB, 0x70, 0xF5, 0x72, 0x4A, 0x86, -0xB2, 0x73, 0x5C, 0xE0, 0x92, 0x34, 0x44, 0x7E, 0x06, 0x11, -0x2D, 0x17, 0xDE, 0x07, 0xDF, 0x5B, 0xC1, 0xF3, 0x67, 0x4F, -0x1F, 0xE7, 0x67, 0xB3, 0x39, 0x62, 0xCD, 0xCA, 0x03, 0x9C, -0xD9, 0x29, 0x4B, 0x96, 0x51, 0x96, 0x46, 0x1A, 0x5B, 0x9C, -0x72, 0x64, 0xAC, 0xF0, 0xF0, 0x2B, 0xC1, 0x93, 0xC0, 0xD0, -0x0B, 0xB9, 0xDC, 0xC4, 0xFB, 0x5C, 0xB5, 0x3C, 0x8E, 0x44, -0xAC, 0x2C, 0x91, 0x3C, 0x0F, 0x94, 0x04, 0x8B, 0x93, 0xF4, -0x2C, 0x7C, 0x38, 0xD7, 0x26, 0xF1, 0x48, 0xA4, 0xAB, 0xC4, -0x2C, 0xFB, 0x91, 0x40, 0xB7, 0xB9, 0x2B, 0x49, 0x07, 0xEA, -0xA8, 0x39, 0x0F, 0x10, 0x67, 0x51, 0x58, 0x53, 0xF5, 0x68, -0xE8, 0x83, 0xEF, 0xAD, 0x80, 0xA8, 0x42, 0x0B, 0xA6, 0x21, -0x97, 0xFD, 0x55, 0x23, 0x11, 0x73, 0xE4, 0x91, 0x33, 0x25, -0xB0, 0x7E, 0x56, 0xE4, 0xA8, 0x95, 0xC8, 0x7D, 0xD5, 0xA4, -0x02, 0xF9, 0xBB, 0xAA, 0x72, 0xC8, 0xE7, 0xA6, 0xD0, 0x6C, -0x8D, 0xBB, 0x15, 0x48, 0x89, 0x50, 0xF2, 0x21, 0x53, 0xD1, -0x4A, 0x57, 0x78, 0x7A, 0x2B, 0x80, 0x3F, 0xB4, 0x29, 0x93, -0x9F, 0x32, 0x57, 0x19, 0xAE, 0xC9, 0x8A, 0x52, 0xEA, 0x5D, -0xEB, 0x87, 0x04, 0xA9, 0x32, 0xB6, 0xDA, 0xE4, 0xBF, 0x38, -0x68, 0x95, 0x08, 0x04, 0x02, 0x50, 0x2C, 0x16, 0x6B, 0x4D, -0x46, 0x41, 0xAD, 0x39, 0xDE, 0x68, 0x8B, 0x6F, 0x78, 0x12, -0xAC, 0xE8, 0x5C, 0xE8, 0x90, 0xE1, 0xAA, 0x2A, 0xA5, 0xA9, -0xEA, 0x24, 0x4A, 0x60, 0x8D, 0x51, 0x12, 0xDB, 0x07, 0xA6, -0x71, 0x78, 0x3C, 0x38, 0xB4, 0xAF, 0xEB, 0x6A, 0x50, 0x57, -0x4D, 0x5D, 0xD3, 0xB0, 0x08, 0xF2, 0x1E, 0x12, 0x32, 0x41, -0xE9, 0xA0, 0x09, 0x97, 0x7D, 0x13, 0x0F, 0x9A, 0x54, 0xB0, -0x3B, 0xB9, 0x9C, 0x45, 0xDB, 0x56, 0xF7, 0xC6, 0x96, 0xF4, -0xB4, 0x70, 0xCE, 0x99, 0xAE, 0xEB, 0xCC, 0xB2, 0x2C, 0xC7, -0x03, 0xF9, 0x0C, 0x75, 0x7A, 0x83, 0x8F, 0x07, 0x4D, 0x13, -0x48, 0x0A, 0x4C, 0xA1, 0xA2, 0x14, 0xCD, 0xBD, 0x8B, 0xE4, -0x4C, 0xE0, 0x30, 0x3F, 0xBE, 0x00, 0x3E, 0xA5, 0x9A, 0xCB, -0xE3, 0x57, 0x82, 0xB7, 0x4D, 0x2B, 0x74, 0xE8, 0xFE, 0x91, -0xED, 0x14, 0x0C, 0x06, 0xA5, 0xD9, 0xD8, 0xDA, 0x1A, 0x85, -0x89, 0xAF, 0x72, 0xB9, 0x5D, 0x8D, 0x55, 0x2B, 0x91, 0x4F, -0x06, 0x9F, 0x2E, 0x2A, 0x55, 0x9A, 0x1E, 0x4F, 0xB1, 0xF1, -0xEF, 0xC3, 0xF4, 0xE7, 0x63, 0x4B, 0x1F, 0x4A, 0x6D, 0xFA, -0x1F, 0x12, 0xD5, 0x54, 0x50, 0x28, 0x58, 0x50, 0x9C, 0xFE, -0x02, 0xF9, 0x49, 0x22, 0x3F, 0x39, 0x02, 0x74, 0x67, 0xC2, -0x94, 0x7E, 0x00, 0xD2, 0x99, 0x3C, 0x98, 0xB1, 0xC5, 0x8D, -0x8A, 0xAD, 0xE6, 0x86, 0x96, 0xED, 0xEB, 0xF5, 0x5C, 0x6C, -0xDA, 0x90, 0x58, 0xBF, 0x79, 0x63, 0x62, 0x57, 0x65, 0xAC, -0x5D, 0xD5, 0xBE, 0xBB, 0x6B, 0x4D, 0x47, 0xCF, 0xE0, 0xE0, -0xC0, 0xAD, 0xDB, 0x37, 0x06, 0xDE, 0x14, 0x7E, 0xDE, 0x13, -0xB9, 0xD1, 0x3B, 0x22, 0x33, 0x72, 0x53, 0x7C, 0x7F, 0x7D, -0x6D, 0xE6, 0xC9, 0xC3, 0xC1, 0x97, 0x57, 0x2E, 0x1D, 0xBD, -0x73, 0xF2, 0xD8, 0xF6, 0x81, 0xE4, 0x86, 0xF6, 0x2D, 0x7F, -0x66, 0xD1, 0x20, 0x48, 0xA2, 0xD6, 0xE3, 0x47, 0x93, 0x17, -0xAF, 0x5F, 0x3E, 0x71, 0xEB, 0xD4, 0xF1, 0x9E, 0xB3, 0x5B, -0x37, 0x26, 0x76, 0x46, 0xCC, 0x40, 0x2C, 0xA0, 0xAB, 0x1A, -0x8D, 0x86, 0x07, 0xF6, 0x5F, 0x42, 0xDE, 0x1C, 0xAA, 0xAE, -0xFD, 0x1B, 0xD8, 0x6F, 0xB7, 0x0F, 0x3D, 0x51, 0x8F, 0x05, -0x15, 0x71, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x6B, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x63, 0x60, 0x20, 0x03, 0x6C, 0xDB, 0xBE, -0x43, 0x73, 0xE7, 0xAE, 0x5D, 0xE2, 0xC4, 0xA8, 0x65, 0x22, -0xD5, 0xF0, 0xB2, 0xDA, 0xB6, 0x60, 0x45, 0x65, 0xB5, 0x73, -0x7A, 0x7A, 0x7A, 0x7B, 0xF6, 0xED, 0x3F, 0x40, 0xD0, 0x12, -0x16, 0x18, 0x63, 0xFA, 0xF4, 0xE9, 0x2E, 0x5C, 0x5C, 0x5C, -0x32, 0xF1, 0xF1, 0xF1, 0x0B, 0x70, 0x29, 0xCE, 0xCA, 0x2B, -0x56, 0x96, 0x90, 0x96, 0x59, 0x78, 0xE3, 0xCE, 0x43, 0x0E, -0x03, 0x1D, 0x75, 0x6D, 0x36, 0x36, 0xB6, 0xF8, 0xF9, 0x0B, -0x16, 0xCC, 0x4A, 0x4C, 0x48, 0xF8, 0x80, 0x4B, 0x0F, 0x33, -0x8C, 0xE1, 0xE1, 0xE1, 0xC1, 0xE9, 0xEA, 0xEA, 0xBA, 0xCE, -0xC8, 0xC8, 0x88, 0x7B, 0xC3, 0x86, 0x0D, 0xFB, 0xB0, 0x29, -0xB6, 0xB4, 0xB0, 0xE0, 0x77, 0x76, 0xB0, 0x0D, 0x79, 0xFD, -0xFE, 0xB3, 0xC0, 0xBB, 0x0F, 0x9F, 0x18, 0xA4, 0xA4, 0x24, -0xCC, 0x8D, 0x0C, 0xF4, 0xB3, 0xDC, 0x3D, 0xDC, 0x77, 0x2E, -0x5A, 0xB4, 0xE8, 0x25, 0x36, 0x3D, 0x8C, 0xC8, 0x9C, 0x49, -0x93, 0x26, 0x79, 0xF1, 0xF1, 0xF1, 0xF5, 0x7D, 0xF8, 0xF0, -0xA1, 0x00, 0x08, 0x76, 0x60, 0xD3, 0x50, 0x5C, 0x52, 0xAA, -0xA8, 0xAA, 0xAE, 0x99, 0xA7, 0xAE, 0xAE, 0x11, 0xFE, 0xE1, -0xCB, 0x4F, 0x49, 0x23, 0x3D, 0x0D, 0x06, 0x0E, 0x36, 0x96, -0xD7, 0x97, 0x2E, 0x5E, 0x74, 0x71, 0x75, 0x75, 0xB9, 0x84, -0xD7, 0x02, 0x10, 0xA8, 0xAD, 0xAD, 0x95, 0x02, 0x86, 0xEF, -0xD6, 0xD7, 0xAF, 0x5F, 0x57, 0x64, 0x65, 0x65, 0xED, 0xC4, -0xE5, 0xF5, 0x69, 0xB3, 0xE6, 0x35, 0x70, 0xF0, 0x0A, 0xD7, -0x0B, 0xF2, 0xF3, 0x31, 0x00, 0x2D, 0xF9, 0xCF, 0xC1, 0xC6, -0xFC, 0xE6, 0xDC, 0xB9, 0x73, 0x2E, 0x9E, 0x1E, 0x1E, 0x28, -0x96, 0x60, 0x58, 0x00, 0x02, 0xCD, 0xCD, 0xCD, 0x92, 0x1A, -0x1A, 0x1A, 0xDB, 0x80, 0x96, 0x54, 0x02, 0x2D, 0xC1, 0xEA, -0x93, 0xF6, 0xDE, 0xA9, 0x5B, 0x84, 0xC5, 0x24, 0xBD, 0x18, -0x19, 0x19, 0x19, 0x44, 0x84, 0x04, 0x18, 0xC0, 0x3E, 0x61, -0x65, 0x7E, 0x73, 0xF6, 0xDC, 0x59, 0x17, 0x2F, 0x4F, 0x4F, -0xB8, 0x25, 0x58, 0x2D, 0x80, 0x5A, 0x22, 0xA5, 0xAE, 0xAE, -0xBE, 0xF5, 0xCD, 0x9B, 0x37, 0x18, 0x96, 0x24, 0x67, 0x15, -0x19, 0x19, 0x9B, 0x5A, 0x9C, 0x64, 0x01, 0x02, 0xB0, 0x21, -0x8C, 0x8C, 0xFF, 0x81, 0x96, 0x30, 0x42, 0x82, 0x8B, 0xF9, -0xF5, 0xE5, 0xCB, 0x57, 0xCC, 0x5C, 0x9C, 0x9D, 0x1E, 0x80, -0xE4, 0x70, 0x26, 0x53, 0x60, 0x50, 0x3D, 0xBB, 0x79, 0xF3, -0xA6, 0xB7, 0x88, 0x88, 0x48, 0xFB, 0xB4, 0x69, 0xD3, 0xDC, -0x61, 0xE2, 0x6C, 0x96, 0xB9, 0xAC, 0x6C, 0x4A, 0x66, 0x33, -0xA4, 0x24, 0x44, 0x99, 0x41, 0xAE, 0x63, 0x67, 0x63, 0x65, -0x10, 0x17, 0x15, 0x02, 0xB2, 0xFE, 0x33, 0x9C, 0xBB, 0x74, -0x9D, 0xE1, 0xC7, 0xAF, 0xBF, 0x22, 0x52, 0x52, 0x52, 0x65, -0x04, 0x7D, 0x80, 0x1C, 0x5C, 0x40, 0x9F, 0x6C, 0x83, 0xFB, -0xC4, 0xAD, 0x63, 0x3A, 0x83, 0xB8, 0x7C, 0x7A, 0x63, 0xBC, -0x05, 0x03, 0xCB, 0xC5, 0xED, 0x47, 0x1F, 0x3F, 0xBC, 0xD7, -0xF0, 0xE5, 0xE3, 0xDB, 0x6B, 0x66, 0x26, 0xC6, 0x9E, 0xFA, -0x46, 0xE6, 0x13, 0xDF, 0x7E, 0xFC, 0xCC, 0xCD, 0xC3, 0xC1, -0x7A, 0xD8, 0xCD, 0xC9, 0xD6, 0x9E, 0x90, 0xD9, 0x28, 0xC1, -0xB5, 0x62, 0xE5, 0xAA, 0x73, 0x1E, 0x39, 0xFD, 0x0B, 0x6C, -0xC2, 0xDA, 0xFE, 0x65, 0x38, 0x84, 0xFE, 0x97, 0x2E, 0x59, -0x31, 0xD5, 0x31, 0xAE, 0x88, 0x15, 0x59, 0xDD, 0x8C, 0x59, -0xB3, 0xF3, 0x56, 0x6C, 0xD8, 0xF9, 0xAF, 0xB4, 0xA1, 0x67, -0x11, 0xD1, 0x86, 0xC3, 0x80, 0x6A, 0x58, 0x4B, 0xCD, 0xFC, -0xC5, 0x6B, 0xFE, 0x3D, 0x69, 0xCD, 0xF9, 0xB7, 0x51, 0x55, -0xE4, 0xDF, 0x64, 0x75, 0xE5, 0xEA, 0x64, 0x4E, 0x4E, 0xD6, -0x20, 0x46, 0x44, 0x28, 0x64, 0x64, 0xE5, 0xA8, 0xCC, 0x5F, -0xB1, 0xE9, 0x5F, 0x78, 0x72, 0x91, 0x0F, 0x4C, 0x8C, 0x60, -0x51, 0x01, 0x8C, 0x47, 0x5F, 0x3E, 0x71, 0xF9, 0x8D, 0x92, -0xDF, 0x3E, 0x35, 0x59, 0x1D, 0x59, 0xC1, 0x28, 0xF0, 0xEF, -0x3E, 0x83, 0x4D, 0x59, 0x11, 0xA3, 0x9E, 0x2C, 0xBF, 0x8F, -0x19, 0x3B, 0xD3, 0x4B, 0xCE, 0xFF, 0x0C, 0xF3, 0xC3, 0xA1, -0x25, 0x02, 0x23, 0x23, 0x13, 0xCB, 0xBD, 0xFB, 0x0F, 0x8E, -0x7E, 0x7C, 0xF7, 0x72, 0x2B, 0xB1, 0x16, 0x84, 0xB3, 0xB2, -0xB2, 0xAE, 0x91, 0x16, 0xE2, 0xF2, 0x53, 0x7B, 0xB2, 0x83, -0xE1, 0xC8, 0xE6, 0x3D, 0xFF, 0x3F, 0xFC, 0x94, 0xFD, 0xCF, -0xA5, 0xAE, 0xC2, 0xA0, 0x6D, 0xAD, 0x6F, 0xAE, 0x2C, 0x21, -0x28, 0x68, 0x22, 0xCC, 0x1F, 0xC7, 0xC3, 0xC8, 0x30, 0x37, -0x8C, 0x93, 0x83, 0x59, 0x44, 0x80, 0x4F, 0xF5, 0xC3, 0x9B, -0x97, 0x09, 0x3B, 0xD6, 0x2F, 0xFD, 0x0F, 0x77, 0x20, 0x3E, -0xC3, 0x81, 0x29, 0x68, 0x91, 0xA0, 0xA0, 0x20, 0x2B, 0x30, -0x55, 0x30, 0x5C, 0xFB, 0xFE, 0xFD, 0x1D, 0x1B, 0x03, 0x7B, -0x81, 0xC0, 0xBA, 0xED, 0xEE, 0x16, 0xCF, 0x1F, 0xC4, 0xFC, -0x66, 0x61, 0x67, 0xE0, 0x15, 0xE2, 0x65, 0xD0, 0x60, 0x64, -0x02, 0x42, 0xC6, 0xD8, 0x8B, 0xEF, 0x3F, 0x31, 0x3C, 0x58, -0xB3, 0x3A, 0x6B, 0xF1, 0xCD, 0x9B, 0x5F, 0x09, 0x85, 0x0A, -0x28, 0x5D, 0x87, 0xB3, 0xB3, 0xB3, 0xFF, 0x54, 0x55, 0x55, -0xFD, 0xE7, 0xE8, 0xE8, 0xF8, 0xCF, 0xDC, 0xDC, 0xFC, 0xBD, -0xA4, 0x84, 0x84, 0x15, 0x48, 0xAE, 0x99, 0x93, 0xED, 0xDA, -0x62, 0x11, 0x9E, 0x7F, 0xA7, 0x2C, 0x35, 0xFF, 0x5D, 0xF6, -0xB2, 0xFA, 0x77, 0xC2, 0x52, 0xE3, 0xDF, 0x0E, 0x2D, 0xB9, -0x7F, 0x13, 0x45, 0x04, 0xFE, 0x25, 0x33, 0x32, 0x2C, 0x8C, -0xC0, 0xEF, 0x68, 0x88, 0xCB, 0x85, 0x84, 0x84, 0x40, 0x86, -0xFF, 0x77, 0x72, 0x72, 0xFA, 0x6F, 0x65, 0x65, 0xF5, 0x5E, -0x52, 0x52, 0xD2, 0x0A, 0x2E, 0xC9, 0xC8, 0x18, 0xDF, 0x27, -0x2B, 0xF1, 0x7B, 0x06, 0x1F, 0xC7, 0xBF, 0x93, 0x16, 0x1A, -0xFF, 0x81, 0x96, 0xFC, 0x07, 0x5B, 0xA2, 0x29, 0xF7, 0x7F, -0xA2, 0x08, 0x3F, 0xCC, 0x12, 0x66, 0xAC, 0x26, 0x33, 0x31, -0x31, 0x85, 0x03, 0x0B, 0xBB, 0x9F, 0x6A, 0x6A, 0x6A, 0x20, -0x97, 0xFF, 0xB7, 0xB4, 0xB4, 0x7C, 0x2F, 0x01, 0x75, 0x39, -0x32, 0x48, 0x60, 0x67, 0x8D, 0x9F, 0x20, 0x2F, 0x05, 0xB2, -0xE4, 0x3F, 0xD4, 0x12, 0x90, 0x4F, 0xFE, 0x23, 0x5B, 0x12, -0x89, 0xC5, 0x92, 0x70, 0x0E, 0x0E, 0x8E, 0x9F, 0xC0, 0x32, -0x08, 0x1C, 0x2C, 0x16, 0x16, 0x16, 0x28, 0x2E, 0xC7, 0x63, -0x09, 0xC8, 0x27, 0xF0, 0xE0, 0xDA, 0xA9, 0x2D, 0xFF, 0x6F, -0x32, 0x30, 0xB8, 0xB2, 0x99, 0x18, 0x17, 0xC4, 0x33, 0x33, -0x82, 0x93, 0x30, 0x37, 0x10, 0xA7, 0x8A, 0x8A, 0x8A, 0xFE, -0x54, 0x51, 0x51, 0xF9, 0xEF, 0xEC, 0xEC, 0x8C, 0x11, 0x2C, -0x78, 0x2D, 0x91, 0x93, 0x42, 0x04, 0x97, 0xB7, 0xF5, 0xFF, -0xD3, 0xCE, 0x46, 0xFF, 0xF6, 0x1B, 0xAB, 0xFE, 0x5F, 0x2A, -0x21, 0xF0, 0x2F, 0x9F, 0x93, 0x4D, 0x0D, 0xA4, 0x4E, 0x0E, -0x18, 0xA1, 0x77, 0x41, 0xC1, 0x02, 0x0A, 0x73, 0x90, 0xCB, -0xB1, 0x05, 0x0B, 0x21, 0x9F, 0xCC, 0xE4, 0xE3, 0xFC, 0x7F, -0xCE, 0xD9, 0xF0, 0xFF, 0xDD, 0xE4, 0xA0, 0x7F, 0xAF, 0x1A, -0x73, 0xFE, 0x5F, 0x8B, 0xF0, 0xF8, 0x52, 0x2D, 0x2A, 0x20, -0x00, 0x56, 0x24, 0x20, 0x20, 0xA0, 0x00, 0x34, 0xF8, 0x2E, -0x30, 0xCC, 0x3F, 0x02, 0x93, 0x26, 0xD1, 0x86, 0xC3, 0x80, -0x1F, 0x2B, 0x4B, 0xFC, 0x64, 0x79, 0xC9, 0xDF, 0xCB, 0xA4, -0x04, 0xFF, 0x3D, 0xCC, 0x0A, 0xFB, 0xF7, 0xF3, 0xF4, 0x96, -0x7F, 0x9B, 0x33, 0x63, 0x0B, 0x50, 0x14, 0x01, 0x5D, 0xAD, -0xC0, 0xCB, 0xCB, 0xDB, 0x0C, 0x64, 0xEA, 0x90, 0x8A, 0x81, -0xB1, 0xA9, 0x63, 0xC8, 0xC4, 0xD4, 0x34, 0x91, 0x9F, 0xEB, -0xEB, 0x21, 0x7B, 0xA3, 0x17, 0x1B, 0x22, 0x7C, 0x33, 0x70, -0x39, 0x86, 0x03, 0x88, 0x79, 0xC8, 0xC5, 0x92, 0x8C, 0x0C, -0x82, 0xC1, 0x5C, 0xEC, 0x28, 0xF9, 0x00, 0x00, 0x44, 0x5A, -0xA4, 0x22, 0x92, 0xC8, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x71, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x6D, 0x4C, 0x5B, 0x65, 0x14, -0x7E, 0x6E, 0x3F, 0xE0, 0xDE, 0xB6, 0xD0, 0x96, 0xAF, 0x31, -0x10, 0x18, 0x83, 0x31, 0xC5, 0xCA, 0xA7, 0x63, 0xA0, 0x82, -0x5B, 0x54, 0xE6, 0x0C, 0x0C, 0x31, 0x4E, 0x60, 0x6C, 0x03, -0xB6, 0x80, 0x31, 0x46, 0xA7, 0x2E, 0x3A, 0x25, 0x9B, 0x6E, -0x9A, 0x18, 0xF7, 0xC3, 0x25, 0xB0, 0xA8, 0x13, 0x37, 0xED, -0xA6, 0xC8, 0x40, 0xB3, 0x4F, 0xC4, 0x31, 0x8D, 0x51, 0x97, -0x08, 0x66, 0x06, 0x37, 0xD4, 0xCC, 0xF5, 0x43, 0xA0, 0x95, -0xB5, 0x40, 0x47, 0x81, 0x01, 0xBD, 0xFD, 0xA2, 0x9E, 0xB7, -0x4A, 0xB2, 0x44, 0x13, 0x71, 0x7F, 0xFC, 0xA1, 0xA7, 0x39, -0xCD, 0xBD, 0xEF, 0x39, 0xCF, 0x73, 0xEE, 0x79, 0xDE, 0xF7, -0xBC, 0xC0, 0xFF, 0xF6, 0x6F, 0x1B, 0x37, 0xFF, 0x30, 0xE6, -0x9C, 0xE2, 0x03, 0x81, 0x40, 0xAD, 0xCF, 0xE7, 0x5B, 0x22, -0x93, 0xC9, 0x26, 0x38, 0x8E, 0x6B, 0x8D, 0xD6, 0x86, 0x5B, -0x17, 0x42, 0x42, 0xD8, 0x04, 0xC2, 0x56, 0x13, 0x56, 0x43, -0xD8, 0x41, 0xC2, 0xEA, 0x09, 0x2B, 0xB2, 0x98, 0x6C, 0x3E, -0xC9, 0x25, 0xBA, 0xEB, 0xBD, 0x5E, 0x6F, 0xB3, 0xD7, 0xE7, -0x03, 0x25, 0x31, 0xCF, 0xA3, 0xE5, 0x87, 0x16, 0x52, 0x60, -0xC6, 0x25, 0x36, 0x11, 0x79, 0x39, 0x39, 0xE4, 0x84, 0x95, -0x93, 0xD1, 0xF2, 0x7E, 0x16, 0x93, 0xB0, 0xBF, 0x8B, 0x3F, -0x9B, 0xE5, 0x32, 0xA9, 0xA4, 0x41, 0xA5, 0x10, 0xA0, 0x0E, -0x53, 0x42, 0x08, 0x0D, 0x41, 0x20, 0x30, 0x57, 0x7C, 0xE1, -0x92, 0x29, 0xEA, 0xEF, 0xC8, 0x59, 0x0E, 0xCB, 0x65, 0x18, -0x86, 0x55, 0x29, 0x05, 0x30, 0x2E, 0xC6, 0x19, 0xEC, 0xE0, -0x07, 0xC3, 0x00, 0x17, 0x13, 0xA9, 0x6D, 0xA1, 0x0A, 0xBA, -0x59, 0x97, 0x0B, 0x4E, 0xA7, 0x13, 0x0A, 0xA5, 0x0A, 0x52, -0xA9, 0x54, 0xA9, 0x54, 0xF0, 0x97, 0x2D, 0xB6, 0xD1, 0x29, -0x6A, 0xF9, 0x2F, 0xC9, 0x49, 0x16, 0xB8, 0x3D, 0x9E, 0x70, -0x8A, 0x2A, 0x07, 0x07, 0x07, 0x70, 0xEA, 0x74, 0x2B, 0x36, -0x55, 0x3F, 0x86, 0xB8, 0xB8, 0x38, 0x5D, 0x6C, 0x74, 0x64, -0x0B, 0x71, 0x6F, 0x91, 0xEE, 0xDE, 0xBD, 0xA7, 0x80, 0xF0, -0xCD, 0x2E, 0x97, 0xC8, 0xF5, 0xF7, 0xF7, 0x63, 0xD7, 0xCE, -0x9D, 0x48, 0x4C, 0x5A, 0x02, 0x55, 0x58, 0x18, 0x23, 0x10, -0x42, 0xE4, 0x72, 0x8D, 0x52, 0xE0, 0x35, 0xD4, 0xFA, 0x9F, -0xDC, 0xE3, 0xF5, 0x6A, 0x66, 0x5D, 0xA2, 0x20, 0xBA, 0x45, -0x8C, 0xD8, 0x6D, 0xE8, 0x3C, 0x7D, 0x02, 0x05, 0xF9, 0x85, -0x10, 0x04, 0x05, 0x93, 0x29, 0x53, 0x21, 0xF0, 0x67, 0x39, -0xDA, 0xA0, 0x17, 0x3D, 0x6E, 0xF7, 0x9E, 0x8E, 0x8F, 0x3A, -0x30, 0x34, 0x34, 0x84, 0x65, 0x69, 0x69, 0xB8, 0xD0, 0xD7, -0x07, 0x5D, 0x46, 0x26, 0xEE, 0x2A, 0xBA, 0x1B, 0x02, 0xCF, -0x23, 0xE0, 0xF7, 0xC1, 0x60, 0x34, 0xA1, 0x60, 0x65, 0x1E, -0x38, 0x09, 0x87, 0x9E, 0xDE, 0x6F, 0x71, 0x6B, 0x7A, 0x3A, -0xBC, 0xFE, 0x39, 0x98, 0x8C, 0x06, 0x7C, 0xD1, 0x7E, 0x0A, -0xA5, 0x5B, 0x2A, 0x91, 0x98, 0x98, 0x84, 0x5F, 0x4C, 0x46, -0x7C, 0xF2, 0xE1, 0x11, 0x6C, 0x7D, 0xE6, 0x39, 0xC4, 0xC5, -0xDF, 0xF4, 0x12, 0x67, 0x77, 0x38, 0x5F, 0xF6, 0xFB, 0xFD, -0xBB, 0x3A, 0x3A, 0x3A, 0x60, 0x36, 0x9B, 0xA1, 0xD6, 0xA8, -0x61, 0xB5, 0x58, 0x91, 0x93, 0x7B, 0x3B, 0xEE, 0x2C, 0x2C, -0x22, 0xA9, 0x24, 0xB8, 0x36, 0x35, 0x89, 0xF3, 0xE7, 0xBF, -0x43, 0xD9, 0xBA, 0x75, 0xC1, 0x02, 0xC7, 0x8E, 0x9D, 0x40, -0x5E, 0xDE, 0x0A, 0x84, 0xAB, 0xD5, 0x18, 0xB6, 0x5A, 0x71, -0xF2, 0xFD, 0x36, 0x54, 0x34, 0xD4, 0x31, 0x69, 0xF0, 0xAB, -0xC5, 0x82, 0xE3, 0x1F, 0xE8, 0xF1, 0xF8, 0xB3, 0x2F, 0x20, -0x3A, 0x26, 0xE6, 0x15, 0xE9, 0xA6, 0xBA, 0xFA, 0xE5, 0x72, -0xB9, 0xAC, 0x64, 0x69, 0x4A, 0x0A, 0x78, 0x41, 0x40, 0x7B, -0x5B, 0x1B, 0xD6, 0x57, 0x56, 0xE1, 0xB6, 0xCC, 0x2C, 0x04, -0xE8, 0x27, 0x97, 0x4A, 0xA1, 0xD5, 0x46, 0x04, 0x65, 0x23, -0x49, 0xE0, 0xF1, 0x78, 0x91, 0x9A, 0x9A, 0x4A, 0x6B, 0x1A, -0xF8, 0xE8, 0x3D, 0x94, 0x30, 0x99, 0xF9, 0x2B, 0x31, 0x62, -0xBB, 0x82, 0x83, 0x6F, 0xEB, 0x91, 0x9D, 0x9B, 0x85, 0xFB, -0xCB, 0xCA, 0x21, 0x28, 0x14, 0x18, 0x77, 0x4E, 0x1E, 0x95, -0x96, 0x57, 0x6C, 0xC8, 0x50, 0x2A, 0x84, 0x32, 0x9F, 0xCF, -0x4F, 0xA0, 0x48, 0xAC, 0x59, 0xBB, 0x96, 0xBA, 0xD0, 0xC2, -0xE1, 0x9C, 0x84, 0xBE, 0xB3, 0x07, 0x6D, 0x9F, 0x7E, 0x83, -0x61, 0xFB, 0x08, 0xEE, 0xC8, 0xBA, 0x19, 0x5D, 0x67, 0xCE, -0xC2, 0x60, 0x30, 0x22, 0x43, 0x97, 0x8E, 0x37, 0x8F, 0x76, -0xE1, 0xD0, 0xC9, 0x73, 0x30, 0x58, 0xC7, 0x90, 0xBC, 0x58, -0x0B, 0xCC, 0xCD, 0xC1, 0x48, 0xB1, 0xEC, 0xDC, 0x1C, 0xDA, -0x03, 0x81, 0x5E, 0x03, 0x84, 0x1B, 0x3D, 0xCE, 0x75, 0x7F, -0xDD, 0x5B, 0x93, 0x9A, 0x9C, 0xA8, 0x97, 0x4A, 0x24, 0x70, -0x8C, 0x4F, 0x80, 0xCD, 0x01, 0xCD, 0x03, 0x3E, 0xFE, 0xAC, -0x17, 0x17, 0xCD, 0xA3, 0x10, 0x45, 0x17, 0x1C, 0x8E, 0x31, -0xBC, 0xBA, 0xAD, 0x1A, 0x2A, 0x81, 0x0F, 0x9E, 0x9E, 0x69, -0x97, 0x88, 0xC6, 0xA6, 0x56, 0x44, 0x45, 0x45, 0x83, 0xE7, -0xA9, 0x83, 0x94, 0x18, 0x3C, 0x5C, 0x9C, 0x4F, 0x33, 0x20, -0x0F, 0xCE, 0x41, 0x54, 0x84, 0x06, 0x7E, 0x2A, 0x68, 0x1A, -0xB0, 0xD4, 0x72, 0xDD, 0x5F, 0xF5, 0x6E, 0x4E, 0x49, 0x4E, -0x3C, 0x4C, 0xC7, 0x0A, 0xFD, 0x97, 0x4C, 0x18, 0x19, 0x73, -0x20, 0x31, 0x3E, 0x16, 0x2D, 0xED, 0x5D, 0x38, 0xF7, 0xBD, -0x91, 0x0A, 0x7A, 0x83, 0x7B, 0xB0, 0x77, 0x7B, 0xAD, 0xA8, -0x0E, 0x53, 0x35, 0xB1, 0x02, 0x93, 0xD7, 0xA6, 0xB7, 0xED, -0x78, 0x5D, 0xCF, 0x87, 0x85, 0xAB, 0x83, 0xA4, 0x85, 0xD9, -0xCB, 0xD0, 0x50, 0xF1, 0x00, 0x2C, 0xC3, 0x76, 0x2C, 0x8A, -0x8E, 0x42, 0xC6, 0x2D, 0xA9, 0xB0, 0x8F, 0x5D, 0x85, 0x79, -0xC0, 0x52, 0xC3, 0x06, 0xCD, 0x37, 0x47, 0xD5, 0x98, 0xB3, -0xAF, 0x67, 0x43, 0x18, 0x19, 0xA1, 0xC5, 0x86, 0xD2, 0x55, -0xFE, 0x70, 0xFA, 0xE0, 0x49, 0xA7, 0x03, 0xAB, 0x57, 0xA4, -0x23, 0x47, 0x97, 0x76, 0xE0, 0xC1, 0xE2, 0xA2, 0xE7, 0x99, -0xB3, 0x67, 0xB6, 0xC6, 0x62, 0x2C, 0x87, 0xE5, 0x32, 0x0C, -0xC3, 0x32, 0x8E, 0x79, 0x3E, 0xC6, 0x2D, 0xDD, 0x58, 0xB7, -0x35, 0x59, 0x1D, 0x1E, 0x56, 0xA5, 0xA0, 0x29, 0xB6, 0x8D, -0x3A, 0xA0, 0x20, 0xFD, 0x22, 0x34, 0x6A, 0x1F, 0x9D, 0xE1, -0xA2, 0xEA, 0xD2, 0x7B, 0x1C, 0x95, 0x25, 0xAB, 0x6D, 0xC5, -0x85, 0x79, 0xFB, 0x69, 0x26, 0x5E, 0x7B, 0xA3, 0xB9, 0x29, -0xC0, 0x50, 0x4F, 0x3E, 0xF5, 0xF4, 0xE7, 0xF7, 0x15, 0xE6, -0x5D, 0xD9, 0x58, 0x76, 0xAF, 0xAB, 0xA6, 0x7C, 0x4D, 0x27, -0x69, 0xBE, 0x83, 0xC8, 0x6B, 0x44, 0xB7, 0x47, 0x42, 0x27, -0x92, 0xBA, 0x88, 0xC0, 0xF4, 0xCC, 0x2C, 0x26, 0xA6, 0xA6, -0x8E, 0x70, 0x67, 0xBE, 0xEC, 0xC9, 0x4E, 0x88, 0x5F, 0xDC, -0xB7, 0x88, 0x24, 0xFA, 0xF1, 0xB2, 0x39, 0xA8, 0x1F, 0xCF, -0xF3, 0xEF, 0xA4, 0x26, 0xC4, 0x36, 0x2C, 0xE4, 0x1E, 0x9A, -0x37, 0x93, 0xD5, 0xDE, 0x22, 0x8A, 0x62, 0x3D, 0xDB, 0x47, -0xDD, 0xF2, 0x14, 0x92, 0xFA, 0x2A, 0xAC, 0xC3, 0xB6, 0x1C, -0xD9, 0xF6, 0x27, 0x1E, 0xFD, 0xE9, 0xC0, 0x21, 0xBD, 0x35, -0x32, 0x42, 0x93, 0x10, 0x12, 0x22, 0xC7, 0xCC, 0xCC, 0xF4, -0xD0, 0xE6, 0xAA, 0xF5, 0x8D, 0xB8, 0xEE, 0xA6, 0x5D, 0x88, -0x3D, 0x52, 0x5E, 0xDA, 0xF8, 0xD6, 0xC1, 0xF7, 0x8A, 0x89, -0x23, 0xC9, 0x47, 0x5D, 0x8C, 0x3B, 0xC7, 0xAD, 0x8C, 0x9B, -0xC5, 0xB8, 0xAC, 0xEC, 0x9C, 0x92, 0x96, 0x77, 0x0F, 0x77, -0xEF, 0xDD, 0xD7, 0xDC, 0x95, 0xBC, 0x34, 0x65, 0x15, 0xAD, -0xA9, 0x6E, 0xC4, 0x19, 0x96, 0x71, 0x30, 0x2E, 0xC6, 0x79, -0xFD, 0x47, 0xB2, 0xF3, 0xA7, 0xF9, 0xC3, 0x43, 0xF1, 0xFB, -0x2D, 0x7B, 0x23, 0x1E, 0x7A, 0x1D, 0x0F, 0xFF, 0x4F, 0x14, -0xF8, 0x0F, 0xDB, 0x6F, 0x02, 0xB1, 0xDD, 0xD5, 0xD4, 0x39, -0x26, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xD9, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x8C, 0x56, 0x4D, 0x88, 0x1C, 0x55, 0x10, -0xFE, 0xDE, 0x7F, 0xFF, 0x4C, 0xCF, 0xEC, 0x8E, 0xEC, 0x92, -0x8D, 0x0A, 0xD1, 0x43, 0x50, 0x82, 0xE4, 0x26, 0x11, 0x0F, -0x6E, 0x16, 0x3C, 0x28, 0x39, 0x05, 0xF7, 0xAA, 0x07, 0x31, -0x37, 0x2F, 0x7A, 0xF1, 0x27, 0x28, 0x11, 0xC5, 0x8B, 0x2B, -0x01, 0x3D, 0x48, 0x8E, 0x7A, 0xF0, 0xEA, 0x25, 0x28, 0xE8, -0x1E, 0x22, 0x04, 0x72, 0x59, 0x16, 0x3C, 0x24, 0x41, 0x61, -0xC3, 0x22, 0xBB, 0x1B, 0xF6, 0x6F, 0x66, 0x77, 0x66, 0xBA, -0xA7, 0x5F, 0xBF, 0xF7, 0xCA, 0x83, 0xD3, 0x4D, 0xB2, 0xAE, -0xD1, 0x82, 0xC7, 0x34, 0xDD, 0xD3, 0x55, 0x5F, 0xD5, 0x57, -0x5F, 0x55, 0xB3, 0xDB, 0xB7, 0x6F, 0xA3, 0x36, 0x22, 0x82, -0x94, 0x12, 0x5A, 0x6B, 0x30, 0xC6, 0x90, 0xE7, 0x39, 0xCA, -0xB2, 0x44, 0x9A, 0xA6, 0x4F, 0x5A, 0x6B, 0x1F, 0xB7, 0xD6, -0x9E, 0x24, 0x22, 0x8A, 0xA2, 0x68, 0x63, 0x6A, 0x6A, 0x6A, -0x43, 0x08, 0xB1, 0x21, 0x84, 0x80, 0x94, 0x12, 0x21, 0x84, -0xC6, 0x0F, 0x63, 0xAC, 0xB9, 0x96, 0x78, 0x84, 0x31, 0xC6, -0xC0, 0x18, 0x7B, 0x8E, 0x73, 0x7E, 0x3E, 0x8E, 0xE3, 0xA7, -0xB4, 0xD6, 0xB3, 0x44, 0x04, 0xA5, 0xD4, 0x7D, 0xC6, 0xD8, -0x1A, 0x80, 0x9F, 0x01, 0xFC, 0xFE, 0x28, 0x1F, 0xC7, 0x06, -0x20, 0x22, 0x10, 0xD1, 0xB9, 0x34, 0x4D, 0x3F, 0xCC, 0xB2, -0xEC, 0x45, 0xAD, 0xF5, 0xB4, 0x31, 0x06, 0x44, 0x04, 0x00, -0xE0, 0x9C, 0xD7, 0x7F, 0xDD, 0x26, 0xA2, 0x1B, 0xDE, 0xFB, -0x4F, 0x89, 0xE8, 0xB7, 0x07, 0x91, 0xD7, 0xC6, 0x8F, 0xDE, -0xF0, 0xDE, 0x43, 0x4A, 0x79, 0xA5, 0xDD, 0x6E, 0xFF, 0x9A, -0xA6, 0xE9, 0x05, 0xA5, 0xD4, 0x34, 0x11, 0xC1, 0x39, 0x87, -0xA2, 0x28, 0x50, 0x14, 0x05, 0xBC, 0xF7, 0xE0, 0x9C, 0x43, -0x29, 0x35, 0xAB, 0xB5, 0x5E, 0x34, 0xC6, 0xDC, 0x14, 0x42, -0xBC, 0x53, 0x03, 0x78, 0x28, 0x00, 0xE7, 0x1C, 0xF5, 0x09, -0x21, 0x40, 0x29, 0x75, 0xAD, 0xD5, 0x6A, 0x7D, 0xC4, 0x39, -0x57, 0xDE, 0x7B, 0x84, 0x10, 0xE0, 0xBD, 0x87, 0xF7, 0x1E, -0xD6, 0x5A, 0x58, 0x6B, 0xC1, 0x18, 0x83, 0x10, 0x02, 0x44, -0x84, 0x10, 0x02, 0x84, 0x10, 0x2D, 0x63, 0xCC, 0x12, 0xE7, -0xFC, 0xF3, 0xA3, 0x41, 0xE4, 0x11, 0x82, 0x2F, 0xA7, 0x69, -0xFA, 0x96, 0x73, 0xAE, 0x2E, 0x13, 0xF2, 0x3C, 0x47, 0xBF, -0xDF, 0x47, 0xAB, 0xD5, 0x6A, 0x40, 0x00, 0x80, 0x52, 0x0A, -0x71, 0x1C, 0x43, 0x29, 0x05, 0xEF, 0x3D, 0x18, 0x63, 0x30, -0xC6, 0xBC, 0x57, 0x96, 0xE5, 0x3A, 0x11, 0x7D, 0x53, 0x97, -0x8B, 0x0B, 0x21, 0x30, 0x39, 0xCF, 0x67, 0x59, 0xF6, 0x09, -0x11, 0xA1, 0x2C, 0x4B, 0x78, 0xEF, 0x61, 0x8C, 0xC1, 0xD2, -0xD2, 0x12, 0x16, 0x17, 0x17, 0x71, 0xF5, 0xEA, 0x55, 0x68, -0xAD, 0xB1, 0xB5, 0xB5, 0x85, 0x4B, 0x97, 0x2E, 0xE1, 0xE2, -0xC5, 0x8B, 0xB8, 0x7E, 0xFD, 0x3A, 0xE2, 0x38, 0x6E, 0xB2, -0x04, 0x00, 0xAD, 0xF5, 0x17, 0x9C, 0xF3, 0xD3, 0x93, 0x06, -0x01, 0x8F, 0xA2, 0x08, 0xC6, 0x18, 0xB4, 0x5A, 0xAD, 0x8F, -0x8D, 0x31, 0x8C, 0x31, 0x06, 0xEF, 0x3D, 0xAA, 0xAA, 0x02, -0x11, 0x61, 0x65, 0x65, 0x05, 0x6B, 0x6B, 0x6B, 0x58, 0x5D, -0x5D, 0x85, 0xF7, 0x1E, 0x83, 0xC1, 0x00, 0xCB, 0xCB, 0xCB, -0xB8, 0x75, 0xEB, 0x16, 0xD6, 0xD6, 0xD6, 0x9A, 0xAC, 0xEA, -0xC3, 0x18, 0x4B, 0x95, 0x52, 0x97, 0x6B, 0xE0, 0x9C, 0x88, -0x18, 0x63, 0xEC, 0x59, 0xA5, 0xD4, 0x79, 0x21, 0x04, 0x94, -0x52, 0x30, 0xC6, 0x80, 0x73, 0x0E, 0x6B, 0x2D, 0xA2, 0x28, -0x02, 0x00, 0x08, 0x21, 0x30, 0x1A, 0x8D, 0x10, 0x42, 0x40, -0xA7, 0xD3, 0x69, 0xCA, 0x54, 0x97, 0xB3, 0x46, 0x3C, 0xB1, -0x57, 0x19, 0x63, 0x4F, 0x30, 0xC6, 0xC0, 0xCB, 0xB2, 0x3C, -0xE1, 0xBD, 0x7F, 0x19, 0x40, 0x5C, 0xD7, 0xB2, 0xAE, 0x6F, -0x1C, 0xC7, 0x10, 0x42, 0x34, 0x01, 0xC6, 0xE3, 0x71, 0x4D, -0xEA, 0x43, 0x5A, 0x11, 0x42, 0x80, 0x31, 0xD6, 0x90, 0x4E, -0x44, 0x8F, 0x39, 0xE7, 0x5E, 0xAA, 0xAA, 0x6A, 0x5A, 0x56, -0x55, 0xF5, 0x74, 0x08, 0xE1, 0x34, 0x63, 0x0C, 0x9C, 0xF3, -0xBF, 0xD3, 0x9A, 0xFC, 0x46, 0x51, 0x04, 0xAD, 0x35, 0x00, -0x20, 0x4D, 0xD3, 0xC6, 0xB9, 0x52, 0xAA, 0xC9, 0x80, 0x73, -0x8E, 0xBA, 0xDB, 0x26, 0xCE, 0x01, 0x00, 0xD6, 0xDA, 0x67, -0xBC, 0xF7, 0xAB, 0x72, 0x38, 0x1C, 0x9E, 0xE0, 0x9C, 0x77, -0x47, 0xA3, 0xD1, 0x43, 0xA8, 0xA4, 0x94, 0x0D, 0xD9, 0x00, -0x10, 0xC7, 0x31, 0xDA, 0xED, 0x36, 0x7A, 0xBD, 0x5E, 0x23, -0xB4, 0xF1, 0x78, 0x8C, 0x9D, 0x9D, 0x1D, 0x0C, 0x06, 0x83, -0xA3, 0xBD, 0x0F, 0x00, 0xD3, 0x00, 0xBA, 0x32, 0xCF, 0xF3, -0x40, 0x44, 0x54, 0xA3, 0xE0, 0x9C, 0x37, 0x69, 0x3B, 0xE7, -0xE0, 0x9C, 0x03, 0x00, 0x1C, 0x1E, 0x1E, 0x62, 0x7F, 0x7F, -0x1F, 0x5B, 0x5B, 0x5B, 0x70, 0xCE, 0x41, 0x08, 0x81, 0xA2, -0x28, 0xB0, 0xB7, 0xB7, 0x87, 0xA2, 0x28, 0x1A, 0x2D, 0xD5, -0x01, 0x38, 0xE7, 0x04, 0x80, 0xA4, 0x73, 0x6E, 0x13, 0xC0, -0x6E, 0xED, 0xA8, 0x26, 0x2B, 0x84, 0x80, 0xE1, 0x70, 0xD8, -0x04, 0x28, 0xCB, 0x12, 0x52, 0x4A, 0xC4, 0x71, 0xDC, 0x0C, -0x45, 0x6B, 0x6D, 0xC3, 0x4B, 0xAD, 0xA5, 0x07, 0xB4, 0xB2, -0x07, 0x60, 0x4F, 0x0A, 0x21, 0xEE, 0x01, 0xB8, 0xEB, 0xBD, -0x6F, 0x10, 0x3B, 0xE7, 0x30, 0x1C, 0x0E, 0x91, 0xE7, 0x39, -0xEA, 0xD2, 0x49, 0x29, 0xD1, 0xED, 0x76, 0xD1, 0xEF, 0xF7, -0x51, 0x4F, 0xD0, 0x5E, 0xAF, 0x87, 0xF5, 0xF5, 0x75, 0xB4, -0x5A, 0x2D, 0x24, 0x49, 0x02, 0xAD, 0x75, 0x13, 0x9C, 0x88, -0xEE, 0x00, 0xD8, 0x92, 0xD6, 0xDA, 0x6D, 0x22, 0xFA, 0xC5, -0x5A, 0x3B, 0x1A, 0x8D, 0x46, 0x69, 0x51, 0x14, 0x38, 0x38, -0x38, 0x40, 0xAF, 0xD7, 0x6B, 0xDA, 0xB5, 0xE6, 0x20, 0x4D, -0x53, 0x24, 0x49, 0x02, 0x29, 0x65, 0x43, 0xF0, 0xEE, 0xEE, -0x2E, 0xFA, 0xFD, 0x3E, 0xA6, 0xA6, 0xA6, 0x90, 0x65, 0x59, -0xAD, 0xEE, 0x6D, 0xCE, 0xF9, 0x0D, 0x22, 0x3A, 0x90, 0x55, -0x55, 0x01, 0xC0, 0x1F, 0x79, 0x9E, 0xFF, 0xB8, 0xB9, 0xB9, -0xF9, 0x5A, 0xBF, 0xDF, 0xC7, 0x68, 0x34, 0x02, 0xE7, 0x1C, -0x33, 0x33, 0x33, 0x4D, 0xC7, 0x48, 0x29, 0x61, 0x8C, 0x69, -0x66, 0x90, 0x73, 0x0E, 0x71, 0x1C, 0x23, 0x49, 0x12, 0xF4, -0x7A, 0x3D, 0x94, 0x65, 0x89, 0x3C, 0xCF, 0x91, 0x65, 0x19, -0xB2, 0x2C, 0xFB, 0x21, 0x4D, 0xD3, 0xFB, 0x00, 0x20, 0x37, -0x36, 0x36, 0xEA, 0x29, 0x7A, 0x65, 0x30, 0x18, 0x5C, 0xD8, -0xDE, 0xDE, 0x8E, 0x92, 0x24, 0x41, 0xBB, 0xDD, 0x6E, 0x50, -0xC7, 0x71, 0x8C, 0x4E, 0xA7, 0x03, 0xCE, 0x79, 0x53, 0x2A, -0xEF, 0x3D, 0xB4, 0xD6, 0x30, 0xC6, 0x20, 0x49, 0x12, 0x8C, -0xC7, 0x63, 0x1C, 0x1C, 0x1C, 0xC0, 0x39, 0xD7, 0x73, 0xCE, -0x7D, 0x56, 0x77, 0x96, 0x98, 0x9F, 0x9F, 0x87, 0xB5, 0x16, -0xDE, 0xFB, 0xED, 0x10, 0xC2, 0x21, 0x63, 0xEC, 0x15, 0xAD, -0x35, 0xB2, 0x2C, 0x83, 0x73, 0x0E, 0xA7, 0x4E, 0x9D, 0xC2, -0xC2, 0xC2, 0x02, 0xE6, 0xE7, 0xE7, 0xD1, 0xED, 0x76, 0x11, -0xC7, 0x31, 0xCE, 0x9C, 0x39, 0x83, 0xB3, 0x67, 0xCF, 0x62, -0x76, 0x76, 0xB6, 0x69, 0x69, 0x00, 0xF5, 0xA8, 0x78, 0x53, -0x4A, 0x79, 0xB3, 0xAA, 0x2A, 0x54, 0x55, 0x05, 0x59, 0x3F, -0x9C, 0xC8, 0xFD, 0xAB, 0xB9, 0xB9, 0xB9, 0xB9, 0x10, 0xC2, -0xFB, 0x55, 0x55, 0xA1, 0x2C, 0x4B, 0x10, 0x11, 0x3A, 0x9D, -0x0E, 0xA6, 0xA7, 0xA7, 0x1B, 0x71, 0xCD, 0xCC, 0xCC, 0xA0, -0xDF, 0xEF, 0xA3, 0x28, 0x0A, 0x54, 0x55, 0xD5, 0x8C, 0x17, -0x29, 0xE5, 0xBB, 0x21, 0x84, 0xEF, 0x6B, 0xD1, 0xFE, 0x63, -0xE1, 0x10, 0x11, 0x84, 0x10, 0x1F, 0x74, 0xBB, 0xDD, 0xB7, -0xD3, 0x34, 0xED, 0xD7, 0x9D, 0x55, 0xAB, 0xFB, 0x01, 0x20, -0x60, 0x8C, 0xA1, 0xAA, 0x2A, 0x58, 0x6B, 0x41, 0x44, 0xF7, -0x95, 0x52, 0x6F, 0x70, 0xCE, 0xBF, 0x3C, 0xBA, 0x0F, 0xF8, -0x71, 0xEB, 0x32, 0x84, 0xF0, 0xB5, 0x31, 0xE6, 0x85, 0x76, -0xBB, 0xFD, 0x5D, 0xBB, 0xDD, 0xFE, 0xB3, 0xD5, 0x6A, 0xC1, -0x18, 0xD3, 0xCC, 0x1B, 0xAD, 0x35, 0xE2, 0x38, 0x86, 0x94, -0xF2, 0x1E, 0x11, 0x5D, 0x03, 0x70, 0x0E, 0xC0, 0xB7, 0xC7, -0x6D, 0xB4, 0x7F, 0xDD, 0xC9, 0x21, 0x84, 0xBB, 0x42, 0x88, -0xD7, 0x93, 0x24, 0x39, 0xD9, 0xE9, 0x74, 0x16, 0xA4, 0x94, -0xA7, 0x89, 0x68, 0x8A, 0x31, 0x46, 0x52, 0xCA, 0x5E, 0x14, -0x45, 0x77, 0xA2, 0x28, 0x5A, 0xAE, 0xAA, 0x6A, 0xF7, 0x38, -0xC7, 0xFF, 0xEB, 0xAB, 0x62, 0xF2, 0xE2, 0x26, 0x63, 0xEC, -0x27, 0x00, 0x2B, 0x44, 0xD4, 0x05, 0x40, 0x13, 0x95, 0xEE, -0x00, 0xD8, 0xC7, 0x7F, 0xD8, 0x5F, 0x03, 0x00, 0xF2, 0xB8, -0xA7, 0xA8, 0x90, 0xD3, 0xAF, 0x66, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xF0, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x4F, 0x88, 0x15, 0xD9, 0x15, -0xC6, 0x7F, 0xF7, 0x6F, 0xDD, 0x57, 0xEF, 0x5F, 0xBF, 0x8E, -0xAD, 0x89, 0xE0, 0x22, 0x93, 0x81, 0x0E, 0x34, 0x59, 0x64, -0xA3, 0xA3, 0x9D, 0x5D, 0x76, 0x81, 0xEC, 0xEC, 0x75, 0xB2, -0x1C, 0x8C, 0x20, 0x01, 0x37, 0x32, 0xAD, 0xAB, 0x21, 0x0C, -0x12, 0x48, 0x56, 0x19, 0xB2, 0x0D, 0xB3, 0x75, 0x9D, 0x6D, -0xFE, 0x4C, 0x8B, 0x2B, 0xC1, 0x21, 0x4A, 0xCC, 0xD8, 0xA4, -0x83, 0xA3, 0x12, 0xEC, 0xF6, 0xBD, 0xD7, 0xBE, 0xAA, 0x57, -0x55, 0xB7, 0x6E, 0xDD, 0x2C, 0xE6, 0x55, 0x45, 0x8D, 0x38, -0xE4, 0x42, 0xC1, 0x85, 0xBA, 0xF7, 0x3B, 0xF7, 0x7C, 0xE7, -0xFB, 0xCE, 0x11, 0x0F, 0x1E, 0x3C, 0xA0, 0x5D, 0x31, 0x46, -0xB4, 0xD6, 0x58, 0x6B, 0x01, 0x28, 0x8A, 0x02, 0xEF, 0xBD, -0xE9, 0xF5, 0x7A, 0x1B, 0x65, 0x59, 0x9E, 0xAE, 0xAA, 0xEA, -0x3B, 0x31, 0xC6, 0xE8, 0x9C, 0x7B, 0x32, 0x99, 0x4C, 0x9E, -0x49, 0x29, 0x9F, 0x6B, 0xAD, 0x83, 0x94, 0xB2, 0xBB, 0x0F, -0x20, 0x84, 0xE8, 0x30, 0x35, 0xDF, 0xBC, 0x7E, 0x20, 0xA5, -0xDC, 0xEE, 0xF5, 0x7A, 0xEF, 0x59, 0x6B, 0xD7, 0x63, 0x8C, -0x18, 0x63, 0x9E, 0x0B, 0x21, 0xF6, 0x81, 0xBF, 0x02, 0x7F, -0x7B, 0xD7, 0xE5, 0xB7, 0x06, 0x58, 0xBD, 0xE4, 0x5C, 0xBF, -0xDF, 0xFF, 0x48, 0x4A, 0x79, 0xD6, 0x5A, 0x7B, 0xCA, 0x5A, -0x4B, 0x08, 0x01, 0x21, 0x04, 0x52, 0x4A, 0xA4, 0x94, 0x08, -0x21, 0x9E, 0x36, 0x4D, 0xB3, 0x57, 0xD7, 0xF5, 0xC7, 0x42, -0x88, 0x2F, 0xDE, 0x86, 0x25, 0xDF, 0x02, 0x9E, 0x28, 0xA5, -0xAE, 0x0F, 0x87, 0xC3, 0x3F, 0xA7, 0x69, 0xFA, 0x53, 0xAD, -0xF5, 0xA9, 0xA6, 0x69, 0xA8, 0xEB, 0x1A, 0xEF, 0x3D, 0x55, -0x55, 0xD1, 0x34, 0x0D, 0x42, 0x08, 0x94, 0x52, 0xA7, 0xAD, -0xB5, 0x3B, 0xBD, 0x5E, 0xEF, 0x73, 0x21, 0xC4, 0x95, 0x18, -0xA3, 0xFA, 0x9F, 0x0C, 0x5A, 0xFE, 0x00, 0xEA, 0xBA, 0x76, -0x5A, 0xEB, 0xDF, 0xF4, 0xFB, 0xFD, 0x0F, 0x85, 0x10, 0x84, -0x10, 0xA8, 0xEB, 0x9A, 0xBA, 0xAE, 0xB1, 0xD6, 0x52, 0xD7, -0x35, 0x00, 0x4A, 0x29, 0x94, 0x52, 0xDD, 0x5E, 0x08, 0x31, -0x74, 0xCE, 0xFD, 0xB6, 0x28, 0x8A, 0x53, 0x21, 0x84, 0x1B, -0x42, 0x88, 0xBA, 0x0B, 0xD0, 0x16, 0x64, 0x55, 0xE0, 0xAB, -0x69, 0x9A, 0x7E, 0x18, 0x42, 0x00, 0xA0, 0x69, 0x1A, 0x9A, -0xA6, 0xA1, 0x2C, 0x4B, 0x9A, 0xA6, 0x01, 0x20, 0x84, 0x80, -0xD6, 0xBA, 0x0B, 0x20, 0x84, 0xE8, 0x3E, 0x6B, 0xED, 0xB5, -0xB2, 0x2C, 0x1F, 0xC7, 0x18, 0x3F, 0x6D, 0x71, 0x65, 0xCB, -0xA7, 0x52, 0xEA, 0x83, 0xC1, 0x60, 0x70, 0x3D, 0xC6, 0x48, -0x55, 0x55, 0x78, 0xEF, 0x3B, 0x50, 0x80, 0x5B, 0xB7, 0x6E, -0x71, 0xFB, 0xF6, 0x6D, 0x84, 0x10, 0xC4, 0x18, 0xBB, 0x7F, -0xED, 0x3E, 0x84, 0xC0, 0x4A, 0x00, 0x9F, 0x48, 0x29, 0xBF, -0xDF, 0x06, 0x95, 0x49, 0x92, 0x90, 0x24, 0x09, 0x69, 0x9A, -0x7E, 0x64, 0xAD, 0xB5, 0x42, 0x08, 0x5E, 0xE5, 0x1C, 0x20, -0x49, 0x12, 0xF6, 0xF6, 0xF6, 0xD8, 0xDD, 0xDD, 0xE5, 0xFE, -0xFD, 0xFB, 0xB4, 0xB4, 0xB6, 0xC0, 0x21, 0x04, 0x9A, 0xA6, -0x21, 0xC6, 0x88, 0x94, 0x72, 0xA4, 0xB5, 0xBE, 0xD6, 0xD2, -0x28, 0xA5, 0x94, 0x89, 0x94, 0xF2, 0x87, 0xC6, 0x98, 0x0B, -0x52, 0x4A, 0x8C, 0x31, 0x58, 0x6B, 0x11, 0x42, 0x74, 0x41, -0xA4, 0x94, 0x0C, 0x06, 0x03, 0x0E, 0x0E, 0x0E, 0xB8, 0x71, -0xE3, 0x06, 0xFB, 0xFB, 0xFB, 0x24, 0x49, 0xD2, 0x05, 0x78, -0x95, 0xAA, 0x18, 0x23, 0x42, 0x88, 0x1F, 0x03, 0xEF, 0x09, -0x21, 0xA4, 0xCC, 0xF3, 0x7C, 0xDD, 0x7B, 0xFF, 0xA3, 0x18, -0xE3, 0x7A, 0x6B, 0x14, 0xAD, 0x35, 0xCE, 0x39, 0x9C, 0x73, -0x1D, 0x0D, 0xC6, 0x18, 0x00, 0xEE, 0xDD, 0xBB, 0xC7, 0xD5, -0xAB, 0x57, 0x79, 0xF8, 0xF0, 0x21, 0xD6, 0xDA, 0x56, 0xAE, -0xAF, 0xD1, 0x15, 0x63, 0x3C, 0x1D, 0x42, 0xD8, 0xF6, 0xDE, -0x4F, 0xA4, 0xF7, 0xFE, 0x4C, 0x55, 0x55, 0xEF, 0x2F, 0x97, -0x4B, 0x96, 0xCB, 0xE5, 0x6B, 0xFC, 0x1B, 0x63, 0x48, 0xD3, -0x14, 0xE7, 0x5C, 0x57, 0xD4, 0x7E, 0xBF, 0xCF, 0x9D, 0x3B, -0x77, 0xB8, 0x72, 0xE5, 0x0A, 0x8F, 0x1E, 0x3D, 0x42, 0x29, -0x45, 0x08, 0x01, 0xEF, 0x3D, 0x65, 0x59, 0x52, 0x14, 0x05, -0x45, 0x51, 0x88, 0x3C, 0xCF, 0xBF, 0x97, 0x65, 0xD9, 0xBA, -0xCE, 0xB2, 0xEC, 0xDB, 0x52, 0xCA, 0x49, 0x96, 0x65, 0xAF, -0xD9, 0x5C, 0x29, 0x85, 0xD6, 0x1A, 0x63, 0x0C, 0xE3, 0xF1, -0xB8, 0xCB, 0x40, 0x29, 0xC5, 0x68, 0x34, 0x62, 0x6F, 0x6F, -0x8F, 0x4B, 0x97, 0x2E, 0x71, 0xF3, 0xE6, 0x4D, 0xCE, 0x9C, -0x39, 0xD3, 0x49, 0xB8, 0xA5, 0x0A, 0x98, 0x00, 0xEB, 0x3A, -0xCB, 0xB2, 0xD8, 0x6A, 0xBE, 0x69, 0x9A, 0x2E, 0xE5, 0x95, -0x91, 0x50, 0x4A, 0x31, 0x9D, 0x4E, 0x99, 0xCF, 0xE7, 0xAD, -0xDA, 0x00, 0x70, 0xCE, 0xE1, 0xBD, 0x67, 0x3A, 0x9D, 0x32, -0x1E, 0x8F, 0x09, 0x21, 0x74, 0xC5, 0x5F, 0x9D, 0x8B, 0x31, -0xC6, 0xA8, 0x43, 0x08, 0x4F, 0x80, 0xC3, 0xB6, 0x58, 0x2B, -0x25, 0x10, 0x63, 0xA4, 0x28, 0x0A, 0x16, 0x8B, 0x05, 0x79, -0x9E, 0x33, 0x9B, 0xCD, 0x30, 0xC6, 0xA0, 0xB5, 0xA6, 0x2C, -0x4B, 0xB6, 0xB6, 0xB6, 0xB8, 0x7C, 0xF9, 0x32, 0x1B, 0x1B, -0x1B, 0x14, 0x45, 0xD1, 0xDD, 0x91, 0x52, 0xB6, 0x4E, 0x9F, -0xC6, 0x18, 0x8F, 0xB4, 0x10, 0xE2, 0x89, 0x10, 0xE2, 0xCB, -0xBA, 0xAE, 0xBB, 0x2C, 0xBC, 0xF7, 0x64, 0x59, 0xC6, 0x74, -0x3A, 0xE5, 0xE5, 0xCB, 0x97, 0x9C, 0x38, 0x71, 0x82, 0x24, -0x49, 0x90, 0x52, 0x52, 0x55, 0x15, 0x5B, 0x5B, 0x5B, 0xEC, -0xEC, 0xEC, 0x10, 0x63, 0xE4, 0xF1, 0xE3, 0xC7, 0xAC, 0xAD, -0xAD, 0xD1, 0xEB, 0xF5, 0xB0, 0xD6, 0xB6, 0x26, 0x6C, 0x9A, -0xA6, 0xF9, 0x07, 0xF0, 0x42, 0x7B, 0xEF, 0x5F, 0x08, 0x21, -0xFE, 0x52, 0x96, 0xE5, 0xF3, 0x2C, 0xCB, 0x36, 0x96, 0xCB, -0x25, 0xC7, 0xC7, 0xC7, 0xCC, 0xE7, 0x73, 0xEA, 0xBA, 0x66, -0x3C, 0x1E, 0x93, 0xA6, 0x29, 0x00, 0x65, 0x59, 0x72, 0xEE, -0xDC, 0x39, 0x2E, 0x5E, 0xBC, 0xC8, 0xC6, 0xC6, 0x06, 0x59, -0x96, 0x71, 0x74, 0x74, 0x44, 0x9E, 0xE7, 0x8C, 0xC7, 0x63, -0x06, 0x83, 0x01, 0xCE, 0x39, 0x92, 0x24, 0xF9, 0x4A, 0x08, -0x71, 0x1B, 0x98, 0xE9, 0xAA, 0xAA, 0x3C, 0x70, 0x7F, 0xB9, -0x5C, 0xFE, 0xE9, 0xD9, 0xB3, 0x67, 0x3B, 0xC7, 0xC7, 0xC7, -0xE4, 0x79, 0x8E, 0x94, 0xB2, 0x7B, 0x59, 0x08, 0x81, 0xB2, -0x2C, 0xB9, 0x70, 0xE1, 0x02, 0xBB, 0xBB, 0xBB, 0xCC, 0x66, -0x33, 0x16, 0x8B, 0x05, 0x49, 0x92, 0x10, 0x63, 0xEC, 0xD4, -0x57, 0x14, 0x05, 0xFD, 0x7E, 0x9F, 0xC1, 0x60, 0xF0, 0xC7, -0x34, 0x4D, 0xFF, 0x05, 0xA0, 0x9F, 0x3E, 0x7D, 0xDA, 0xF6, -0x98, 0x8F, 0x17, 0x8B, 0xC5, 0x4F, 0x0E, 0x0F, 0x0F, 0xFB, -0x49, 0x92, 0x30, 0x1C, 0x0E, 0x71, 0xCE, 0x11, 0x42, 0x20, -0xCB, 0x32, 0xCE, 0x9E, 0x3D, 0xCB, 0xF6, 0xF6, 0x36, 0x9B, -0x9B, 0x9B, 0xDC, 0xBD, 0x7B, 0x17, 0xEF, 0x3D, 0x4A, 0x29, -0x9C, 0x73, 0x08, 0x21, 0x28, 0xCB, 0x92, 0xF9, 0x7C, 0x8E, -0xF7, 0xFE, 0xB0, 0xAE, 0xEB, 0x4F, 0x16, 0x8B, 0xC5, 0xD7, -0x05, 0xCF, 0xF3, 0x9C, 0x3C, 0xCF, 0xA9, 0xAA, 0xEA, 0x0B, -0xA5, 0xD4, 0xB5, 0xD1, 0x68, 0xD4, 0x69, 0x3F, 0xC6, 0x48, -0x59, 0x96, 0x78, 0xEF, 0x39, 0x7F, 0xFE, 0x3C, 0x9B, 0x9B, -0x9B, 0xD4, 0x75, 0x4D, 0xAF, 0xD7, 0x03, 0xA0, 0xAA, 0xAA, -0xCE, 0x84, 0x2B, 0xF7, 0xD7, 0xDE, 0xFB, 0x5F, 0xD6, 0x75, -0x7D, 0xB0, 0xF2, 0xC3, 0x7F, 0x9B, 0xDD, 0x4A, 0x5E, 0x9F, -0x9E, 0x3C, 0x79, 0xF2, 0x57, 0x93, 0xC9, 0x84, 0x18, 0x23, -0xDE, 0xFB, 0xAE, 0x55, 0x3B, 0xE7, 0xBA, 0x06, 0xE7, 0x9C, -0xC3, 0x18, 0xD3, 0xB5, 0xF2, 0x55, 0x27, 0x0D, 0xCE, 0xB9, -0x6B, 0x52, 0xCA, 0xCF, 0x5E, 0xF5, 0x83, 0x7C, 0x63, 0xD8, -0xD4, 0x5A, 0xEB, 0xEB, 0x6B, 0x6B, 0x6B, 0xBF, 0xE8, 0xF7, -0xFB, 0xB3, 0x16, 0x30, 0x49, 0x12, 0x8C, 0x31, 0xDD, 0x34, -0x33, 0xC6, 0x60, 0x8C, 0x21, 0x84, 0xD0, 0x0E, 0xA0, 0x7F, -0x1B, 0x63, 0x7E, 0x2E, 0xA5, 0xFC, 0x75, 0xDB, 0x6E, 0xDE, -0x35, 0xD1, 0x9A, 0x18, 0xE3, 0xEF, 0xAC, 0xB5, 0xE7, 0x47, -0xA3, 0xD1, 0x1F, 0x86, 0xC3, 0xE1, 0xC1, 0x60, 0x30, 0x20, -0x49, 0x92, 0xEE, 0x8C, 0x31, 0x06, 0xE7, 0x5C, 0x54, 0x4A, -0xED, 0x03, 0xBF, 0x07, 0x3E, 0x00, 0x3E, 0x7B, 0x13, 0xFC, -0x9D, 0x43, 0x3F, 0xC6, 0xF8, 0x77, 0x21, 0xC4, 0xCF, 0xD2, -0x34, 0xFD, 0xEE, 0x70, 0x38, 0xDC, 0xD6, 0x5A, 0xBF, 0x0F, -0xAC, 0x01, 0x51, 0x6B, 0xFD, 0x22, 0x49, 0x92, 0x2F, 0x9D, -0x73, 0x9F, 0x7B, 0xEF, 0xBF, 0xFA, 0xBF, 0x87, 0xFE, 0x1B, -0xEB, 0x9F, 0xC0, 0x4B, 0x60, 0x2D, 0xC6, 0xF8, 0x2D, 0xA0, -0x01, 0x8E, 0x80, 0x19, 0xF0, 0xE2, 0x9B, 0x2E, 0xFF, 0x67, -0x00, 0xD2, 0x61, 0xAF, 0x5D, 0xF2, 0x84, 0xFD, 0x03, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, -0x82 -}; - -static const unsigned char Toolbar_Refresh1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x82, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x79, 0x4C, 0xD4, 0x47, 0x14, -0x9E, 0xD9, 0xF3, 0x77, 0xEC, 0x2E, 0xEB, 0x72, 0xB3, 0x2C, -0x28, 0x82, 0x28, 0x8A, 0x02, 0x22, 0xE1, 0x14, 0x11, 0x4B, -0x41, 0xA1, 0xA5, 0xB2, 0xB6, 0x14, 0xDB, 0x82, 0x46, 0xA1, -0x1E, 0x50, 0x2F, 0xD4, 0x9A, 0xD0, 0xB4, 0x8D, 0x69, 0xDA, -0x44, 0x63, 0x68, 0x43, 0x6A, 0x5B, 0x89, 0xB6, 0xC4, 0x3F, -0x80, 0xDA, 0xD6, 0x5A, 0x54, 0x4E, 0xB5, 0xF1, 0x68, 0x05, -0x39, 0x9A, 0x20, 0x64, 0xC5, 0x03, 0x2F, 0x0A, 0x42, 0x51, -0x77, 0xD9, 0x65, 0xAF, 0x99, 0xBE, 0x55, 0xB4, 0x42, 0x97, -0x46, 0x93, 0xBE, 0xE4, 0xCB, 0x7B, 0x73, 0xBD, 0x6F, 0xE6, -0xBD, 0x37, 0x33, 0x08, 0x39, 0x11, 0x6D, 0x85, 0x1F, 0xB7, -0xE6, 0xAC, 0x22, 0xD8, 0xD9, 0xD8, 0x8B, 0x8A, 0xC0, 0x59, -0x67, 0xEA, 0x4C, 0xED, 0x0E, 0x37, 0x37, 0xAE, 0xFD, 0xA3, -0xBB, 0x0A, 0xEF, 0xFF, 0x9D, 0x60, 0xE7, 0x4F, 0x29, 0xA2, -0x48, 0xBF, 0xF4, 0x55, 0xFE, 0x8A, 0x18, 0xE6, 0xCF, 0x3E, -0x5A, 0x98, 0x5C, 0xE5, 0xA5, 0x8E, 0xA9, 0x54, 0x16, 0xC6, -0xD7, 0xB0, 0xD5, 0x89, 0xF5, 0x4C, 0xC7, 0xA2, 0x46, 0x56, -0x97, 0x7C, 0x96, 0x6F, 0x5B, 0x72, 0xCE, 0xAD, 0x6A, 0x79, -0x6B, 0xC8, 0xBA, 0x82, 0xAB, 0x8B, 0x5D, 0x5F, 0x88, 0xC0, -0xC7, 0xDF, 0x37, 0x8D, 0xE7, 0x55, 0xBE, 0xEE, 0x34, 0x81, -0x8E, 0x1A, 0xA7, 0x6D, 0x0E, 0xF2, 0x8A, 0xB8, 0x21, 0x73, -0x61, 0x4A, 0xA5, 0x2E, 0x28, 0x8B, 0x73, 0x47, 0xA1, 0x9E, -0x1A, 0x12, 0xA8, 0x51, 0xDB, 0xE6, 0xB9, 0xB9, 0xEB, 0xB5, -0xF7, 0x2D, 0x57, 0xCB, 0x7A, 0x7A, 0xBB, 0xAE, 0xAC, 0xE9, -0x8A, 0xDF, 0xB6, 0xE9, 0x5A, 0x8A, 0xE8, 0xB9, 0x08, 0xDC, -0x78, 0xBF, 0xD5, 0x77, 0xCD, 0x3D, 0x88, 0x60, 0x21, 0xF6, -0x53, 0x86, 0x33, 0x97, 0x0D, 0x17, 0x84, 0x7A, 0xAB, 0x1E, -0x13, 0x8A, 0x31, 0xC2, 0x18, 0x53, 0x8A, 0x10, 0x25, 0x08, -0x0B, 0x30, 0x2C, 0x96, 0x20, 0xFC, 0xC0, 0x32, 0x38, 0xE5, -0x62, 0x4B, 0xCB, 0xA7, 0x7A, 0x7D, 0x5F, 0x45, 0xD1, 0x95, -0x04, 0x76, 0xA2, 0xBF, 0x71, 0xAC, 0xC5, 0xF5, 0xE1, 0xDE, -0x22, 0x86, 0x4B, 0xBD, 0x69, 0xE9, 0x44, 0xD7, 0xCC, 0x7F, -0xA0, 0x66, 0x63, 0x03, 0xC2, 0x12, 0x3B, 0x12, 0x5A, 0xC0, -0x9B, 0x9D, 0x22, 0x3A, 0x4A, 0x91, 0xDE, 0x82, 0x90, 0x01, -0x53, 0x68, 0x52, 0x64, 0x31, 0x83, 0x03, 0x60, 0x22, 0x2C, -0x15, 0xB4, 0xB4, 0xEB, 0x56, 0xCC, 0x09, 0xF4, 0x1D, 0x06, -0x37, 0xEB, 0x27, 0x8D, 0xD7, 0x07, 0x17, 0x92, 0x8A, 0xF7, -0xDF, 0xDC, 0x44, 0x3E, 0xB9, 0xB5, 0x8C, 0xE4, 0xF6, 0x28, -0x49, 0x66, 0xBB, 0x8C, 0x24, 0x9F, 0x91, 0x93, 0xB8, 0xE3, -0x3C, 0x49, 0x38, 0xC1, 0x92, 0x45, 0x75, 0x0C, 0x49, 0x6D, -0x50, 0xDA, 0x93, 0x6A, 0x59, 0x5B, 0x62, 0xBD, 0xC4, 0x9E, -0x50, 0x2B, 0x26, 0xD1, 0xC7, 0xC4, 0x24, 0xA2, 0x52, 0x42, -0x42, 0x0E, 0x48, 0xC8, 0x82, 0x0A, 0xA9, 0x31, 0xE7, 0x94, -0x3A, 0xDA, 0xA9, 0xF3, 0xB7, 0xCA, 0x3D, 0x70, 0x49, 0x6B, -0x72, 0xE7, 0xFB, 0xBA, 0x45, 0x64, 0xB5, 0x4E, 0x45, 0xB2, -0xBB, 0x78, 0xBA, 0xAC, 0x99, 0xA7, 0x0B, 0xEB, 0x78, 0x12, -0x75, 0x84, 0x23, 0xAB, 0x4E, 0x47, 0x1F, 0xDF, 0xDB, 0xBD, -0x26, 0xB1, 0xF4, 0x62, 0xA1, 0xF2, 0x1B, 0xDD, 0xD6, 0xA0, -0x92, 0xB6, 0xCC, 0x2D, 0xD9, 0x4D, 0xC1, 0xBD, 0x0B, 0xAA, -0xC4, 0x24, 0xF4, 0xA0, 0x88, 0x04, 0x97, 0x89, 0x69, 0xF2, -0x11, 0xFE, 0xDC, 0xCB, 0x87, 0x19, 0xA7, 0xB9, 0x40, 0x79, -0x3F, 0x7B, 0x47, 0x6D, 0xE8, 0x08, 0xB7, 0xE6, 0x76, 0x78, -0xDA, 0xB3, 0x3B, 0x38, 0xA2, 0x6D, 0x63, 0x69, 0xFA, 0xEF, -0x1C, 0x4D, 0x3E, 0xCD, 0x93, 0xEC, 0xBA, 0xE9, 0xA4, 0xE8, -0x92, 0x7F, 0xE4, 0xC4, 0x35, 0xE5, 0x97, 0x77, 0xCA, 0x8A, -0x7F, 0xCB, 0x28, 0x9D, 0x7F, 0x88, 0xB7, 0x27, 0x56, 0xB3, -0xF7, 0x32, 0x6B, 0x79, 0xFF, 0x49, 0xC3, 0x93, 0x53, 0x13, -0xE9, 0xFE, 0xFA, 0xC9, 0xF9, 0xBB, 0xB2, 0x1A, 0x03, 0xCF, -0x6A, 0xCF, 0x7B, 0x8E, 0x64, 0x5D, 0x54, 0xD8, 0x32, 0xCE, -0xCB, 0xEC, 0x8B, 0x1B, 0x38, 0xB2, 0xB6, 0x79, 0x1A, 0x59, -0xDF, 0xCA, 0x1F, 0x9A, 0x6C, 0x6D, 0xD1, 0x99, 0x94, 0xA5, -0xCB, 0x7E, 0x94, 0x47, 0x4D, 0xEA, 0x7C, 0xA2, 0x68, 0x8F, -0x46, 0x7A, 0x67, 0xD5, 0xCE, 0xCE, 0x4D, 0xAF, 0xD7, 0x54, -0x2E, 0xA9, 0x75, 0x1D, 0xCC, 0x68, 0xD4, 0xD8, 0x36, 0x36, -0xBB, 0x0E, 0x69, 0xBF, 0x67, 0xC5, 0x8E, 0x71, 0xF5, 0x2A, -0x11, 0xCE, 0xAA, 0x0C, 0xAD, 0xF8, 0xBC, 0xE3, 0xC3, 0xEF, -0x4A, 0x2E, 0x14, 0xAC, 0xCD, 0x6F, 0x5C, 0x1A, 0x92, 0x57, -0x97, 0x28, 0x7C, 0x6E, 0x82, 0x67, 0x25, 0xBD, 0x72, 0xB6, -0x34, 0xAD, 0x66, 0xFA, 0x92, 0x1D, 0xAD, 0xF1, 0x69, 0x4F, -0xFA, 0xA6, 0x6E, 0x10, 0x32, 0x6F, 0x37, 0xF1, 0x7D, 0x5F, -0x74, 0x6F, 0x22, 0xE7, 0xFA, 0xEB, 0xC8, 0xB1, 0x3B, 0xDF, -0xDA, 0x4B, 0xBB, 0x77, 0xF4, 0x15, 0x37, 0xAF, 0xF8, 0x61, -0x65, 0x43, 0xEC, 0x96, 0x9C, 0x13, 0x71, 0x31, 0xD9, 0xC7, -0xA2, 0xA5, 0x8E, 0xB9, 0x78, 0x32, 0xC7, 0x19, 0x47, 0xE5, -0x01, 0x33, 0xDC, 0x62, 0x35, 0x7B, 0xE3, 0x6A, 0xCF, 0x38, -0x1B, 0x2F, 0x68, 0x96, 0x6D, 0x65, 0x84, 0xDE, 0x7B, 0x66, -0x71, 0x79, 0x48, 0xC6, 0x42, 0x9D, 0x4A, 0xAC, 0x48, 0x04, -0x40, 0xD8, 0x48, 0x6F, 0x3E, 0xEC, 0xB5, 0x75, 0xEA, 0xDA, -0x5F, 0x3D, 0x98, 0xD2, 0x79, 0xD2, 0x69, 0xC6, 0xDF, 0x6C, -0x92, 0x4B, 0x47, 0x4C, 0xD2, 0xA3, 0x9A, 0x29, 0x61, 0x21, -0xFB, 0xAE, 0x4C, 0x3F, 0xE4, 0xCA, 0xAA, 0x76, 0xBD, 0xE3, -0xBB, 0xBB, 0xFF, 0xD9, 0x39, 0x4A, 0x14, 0x55, 0x7D, 0x65, -0xF0, 0xF6, 0x67, 0xF7, 0xC5, 0x4D, 0x42, 0x8E, 0x93, 0x20, -0x95, 0x42, 0x8E, 0x65, 0xBC, 0x10, 0x31, 0x8C, 0x15, 0x09, -0xC4, 0x23, 0x56, 0x56, 0x38, 0xDA, 0xEC, 0x98, 0xE7, 0x34, -0x6E, 0xA1, 0xF9, 0x1E, 0xBB, 0x35, 0x6C, 0xFC, 0x6B, 0xEE, -0x2A, 0x37, 0x01, 0x27, 0xC7, 0x61, 0x7D, 0xA6, 0xDB, 0x05, -0x71, 0xEF, 0xCE, 0x08, 0x88, 0x5B, 0x17, 0xC4, 0xC6, 0x14, -0x04, 0xA9, 0xC3, 0x56, 0xFB, 0xBE, 0xD1, 0x35, 0x78, 0xFD, -0x2B, 0xDD, 0xBD, 0x1B, 0x2E, 0x77, 0x0C, 0x37, 0x50, 0xBF, -0xED, 0x3A, 0xEA, 0xB7, 0xEB, 0xB0, 0x01, 0x0F, 0x20, 0x8B, -0xC0, 0x80, 0x86, 0x87, 0x07, 0x1A, 0xCA, 0x62, 0xAE, 0x1E, -0xF8, 0x57, 0x88, 0xBC, 0xB7, 0x21, 0xA1, 0x87, 0x5A, 0xE9, -0x11, 0x18, 0xA1, 0xE9, 0xD6, 0x48, 0x66, 0xCA, 0x11, 0x63, -0x41, 0x8C, 0xC2, 0x84, 0x6C, 0xCC, 0x75, 0x74, 0xCF, 0x7A, -0x0B, 0xDD, 0x37, 0x12, 0x6A, 0x1C, 0x85, 0x9B, 0x6B, 0xA5, -0xD8, 0x62, 0x82, 0x1B, 0xAD, 0x87, 0xDB, 0x6C, 0xA5, 0x48, -0x08, 0xA9, 0x67, 0xA5, 0x02, 0xC4, 0xCB, 0x30, 0x72, 0x91, -0x49, 0xA8, 0x68, 0x48, 0x92, 0x5F, 0x9D, 0x34, 0x54, 0x3E, -0x8E, 0xC0, 0xE1, 0x1C, 0x5E, 0x1B, 0x0F, 0x30, 0xDD, 0x67, -0x85, 0x31, 0xF9, 0x52, 0x17, 0xCF, 0x7C, 0x21, 0x2B, 0x14, -0x1B, 0xC4, 0x7D, 0x54, 0xEE, 0x62, 0xC3, 0x4A, 0x05, 0x7E, -0x34, 0xDB, 0x60, 0x41, 0x74, 0xC4, 0x84, 0xB0, 0x79, 0x04, -0xF4, 0x30, 0xC5, 0x23, 0x0F, 0x28, 0xB2, 0xD9, 0x28, 0x95, -0x48, 0x31, 0xE6, 0x1C, 0x04, 0x72, 0xA9, 0x59, 0xFC, 0x97, -0xC0, 0xEF, 0x78, 0xE6, 0xC3, 0x81, 0xA7, 0x04, 0x5E, 0x1B, -0xE1, 0x19, 0x63, 0x90, 0x2B, 0x10, 0x04, 0x42, 0x73, 0x0A, -0x68, 0xC1, 0xCC, 0x79, 0xD2, 0xDC, 0x11, 0xA9, 0x30, 0xD3, -0x26, 0x35, 0x8B, 0x58, 0x05, 0xC6, 0x32, 0x58, 0xCC, 0x32, -0xB0, 0x7B, 0x78, 0xEE, 0x8C, 0x16, 0xE4, 0x38, 0x01, 0xB5, -0x19, 0x21, 0xA5, 0x7A, 0x84, 0x4C, 0x66, 0x42, 0x59, 0x06, -0x18, 0x44, 0x56, 0xCA, 0x0B, 0x98, 0x53, 0xBF, 0xA6, 0xE9, -0x93, 0x9F, 0x6C, 0xFC, 0x11, 0x81, 0xF7, 0x66, 0x24, 0x86, -0x6C, 0xF8, 0x82, 0xA9, 0x06, 0x30, 0x00, 0x11, 0x90, 0x88, -0xFD, 0x03, 0xB9, 0x68, 0xD6, 0x87, 0x5B, 0x69, 0x91, 0x1A, -0xFC, 0x24, 0xAC, 0xFD, 0x69, 0xC6, 0xE0, 0x35, 0x45, 0x14, -0x0A, 0xC6, 0x6A, 0xC6, 0xE8, 0xE1, 0x00, 0xED, 0xB1, 0x0E, -0xD1, 0xCB, 0xA9, 0x8B, 0xFD, 0x5F, 0x69, 0xE8, 0xBE, 0x4D, -0xC5, 0x26, 0x61, 0x51, 0x5B, 0x9E, 0xB1, 0x6C, 0x5C, 0x52, -0x3D, 0x37, 0x20, 0x0C, 0x21, 0xE2, 0x7C, 0x8A, 0x91, 0x0A, -0xE0, 0x05, 0x76, 0x00, 0xE8, 0x30, 0x40, 0x94, 0x7A, 0x3B, -0x8A, 0x9E, 0xB3, 0x57, 0x9E, 0x13, 0x71, 0x50, 0xF9, 0x71, -0x54, 0x95, 0xA2, 0x3C, 0xBC, 0x82, 0xA9, 0x0C, 0xFD, 0x5A, -0x7C, 0x38, 0x78, 0x9F, 0xA8, 0xCC, 0xAF, 0x44, 0xB0, 0x0E, -0xE6, 0xA4, 0xFB, 0x6C, 0x47, 0x2F, 0x6D, 0xEC, 0x90, 0xF7, -0x66, 0xFD, 0x12, 0x60, 0xF0, 0xDF, 0x25, 0x88, 0x85, 0x3E, -0x99, 0xB3, 0xE2, 0x79, 0x24, 0x30, 0x28, 0x1E, 0x23, 0x48, -0x02, 0xA4, 0x80, 0x9D, 0xE8, 0x20, 0x02, 0xCC, 0x01, 0xCC, -0x80, 0xF6, 0x2C, 0xD0, 0x0B, 0x41, 0xE7, 0x82, 0x2E, 0x04, -0x14, 0x81, 0x5D, 0x14, 0xB6, 0x4F, 0xB8, 0x3F, 0xE1, 0x4B, -0x45, 0x0D, 0xD8, 0xCB, 0x1D, 0x9B, 0x1C, 0x17, 0xA2, 0x71, -0x95, 0xB4, 0x15, 0xFE, 0x88, 0xC7, 0xC9, 0xF6, 0x01, 0xA8, -0x00, 0x3C, 0x40, 0x82, 0x1E, 0x7F, 0x4E, 0x78, 0xAC, 0xB4, -0x45, 0xE8, 0x9F, 0xBF, 0xC4, 0x36, 0xD6, 0xA7, 0x00, 0x40, -0xF0, 0xD0, 0x25, 0x40, 0x4B, 0xDF, 0x1E, 0x64, 0x9A, 0xF4, -0x14, 0x1E, 0xF9, 0x08, 0xC3, 0x2E, 0x24, 0x00, 0x05, 0xEC, -0xC8, 0x0B, 0xF4, 0x54, 0x40, 0xB0, 0xE3, 0x14, 0xD0, 0x9E, -0x0B, 0x7A, 0x2E, 0xE8, 0xD9, 0xA0, 0x83, 0x00, 0x7E, 0x60, -0x3B, 0xC6, 0x63, 0xC7, 0x4E, 0xE6, 0x31, 0xA9, 0xE3, 0xFF, -0x12, 0x95, 0x16, 0xE1, 0x89, 0x98, 0x10, 0x5A, 0x11, 0x40, -0xEA, 0xF5, 0xDE, 0xF8, 0xFE, 0xBF, 0x01, 0xF7, 0x76, 0x0D, -0xC5, 0xC1, 0x73, 0x36, 0xCA, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0x89, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x7C, 0x55, 0x4D, 0x88, 0x1C, 0x45, 0x14, -0xFE, 0xAA, 0xEA, 0x55, 0x55, 0x77, 0xCF, 0xF4, 0xEC, 0x6E, -0xC2, 0x46, 0xE2, 0xC5, 0x8B, 0xB7, 0x5C, 0x02, 0x62, 0x7E, -0xBC, 0x45, 0x16, 0x4C, 0x50, 0x44, 0x05, 0x2F, 0x26, 0x7A, -0xF1, 0xE0, 0xC1, 0x9F, 0x8B, 0x47, 0xAF, 0xC1, 0x83, 0x10, -0xC8, 0x41, 0x04, 0xC1, 0x1F, 0x44, 0xF0, 0xA0, 0xE4, 0x22, -0xB8, 0x88, 0x90, 0x10, 0x10, 0x44, 0x11, 0x44, 0x88, 0x04, -0xBC, 0x04, 0x12, 0x02, 0xEB, 0x1E, 0x66, 0x66, 0x67, 0x76, -0x67, 0xA6, 0xBB, 0xAA, 0x5E, 0x95, 0x07, 0xA7, 0xCB, 0xDD, -0xB0, 0xC9, 0x83, 0xA2, 0xBB, 0x69, 0xEA, 0xFD, 0x7C, 0xEF, -0x7D, 0xDF, 0x13, 0xB7, 0x6F, 0xDF, 0xC6, 0x7E, 0xB3, 0xD6, -0x42, 0x08, 0x01, 0x29, 0x25, 0x26, 0x93, 0x89, 0x94, 0x52, -0x9E, 0x2C, 0x8A, 0x42, 0x3B, 0xE7, 0xCE, 0x7B, 0xEF, 0xCF, -0xA6, 0x94, 0xA2, 0x31, 0xE6, 0xE6, 0x60, 0x30, 0xB8, 0xA1, -0xB5, 0x0E, 0x42, 0x88, 0x3F, 0x8D, 0x31, 0x88, 0x31, 0x1E, -0xF0, 0x23, 0x84, 0x00, 0x00, 0x10, 0x0E, 0xB1, 0x94, 0x12, -0x98, 0xF9, 0xE5, 0xAA, 0xAA, 0xDE, 0x50, 0x4A, 0xBD, 0x54, -0x96, 0x25, 0xAC, 0xB5, 0xF9, 0x9F, 0x10, 0xE2, 0xC2, 0xBE, -0xF7, 0xAF, 0x63, 0x8C, 0xDF, 0xA4, 0x94, 0x7E, 0xEC, 0x9C, -0x1E, 0x08, 0xF4, 0x60, 0x05, 0x5A, 0xEB, 0xBE, 0x31, 0xE6, -0x0B, 0x6B, 0xED, 0xAB, 0x44, 0x84, 0x94, 0x12, 0xA4, 0x94, -0x10, 0x42, 0xC0, 0x7B, 0x9F, 0xAB, 0xD4, 0x5A, 0x43, 0x29, -0x85, 0x94, 0x12, 0x42, 0x08, 0x08, 0x21, 0x7C, 0xCE, 0xCC, -0xEF, 0x08, 0x21, 0x9A, 0x87, 0x56, 0x10, 0x63, 0x7C, 0x9C, -0x88, 0x7E, 0xA8, 0xEB, 0xFA, 0x64, 0xE7, 0xB0, 0x6D, 0x5B, -0x00, 0x80, 0x31, 0x26, 0x07, 0x50, 0x4A, 0x41, 0x08, 0x81, -0x94, 0x12, 0x94, 0x52, 0xD0, 0x5A, 0x83, 0x88, 0xDE, 0x6C, -0x9A, 0xE6, 0x04, 0x33, 0x9F, 0x17, 0x42, 0x4C, 0x3A, 0x9F, -0x52, 0x29, 0x05, 0x22, 0x42, 0x8C, 0x71, 0x8D, 0x88, 0xBE, -0xAF, 0xAA, 0xEA, 0x64, 0x97, 0x55, 0x8C, 0x11, 0x31, 0x46, -0xB4, 0x6D, 0x8B, 0xB6, 0x6D, 0xE1, 0xBD, 0x87, 0x73, 0x0E, -0xCE, 0x39, 0x78, 0xEF, 0xC1, 0xCC, 0x60, 0xE6, 0x8C, 0xBF, -0x31, 0xE6, 0x8C, 0x94, 0x72, 0x33, 0xA5, 0xB4, 0x92, 0x03, -0xA4, 0x94, 0x10, 0x63, 0x24, 0x22, 0xFA, 0xAA, 0xD7, 0xEB, -0x3D, 0x15, 0x63, 0x84, 0x73, 0x2E, 0x5F, 0xEC, 0xBE, 0x9B, -0xA6, 0xC9, 0xC7, 0x7B, 0x8F, 0x10, 0x02, 0x98, 0x19, 0xCB, -0xFB, 0x60, 0x66, 0x08, 0x21, 0x60, 0xAD, 0x7D, 0x46, 0x4A, -0xF9, 0x51, 0x4A, 0xE9, 0x3F, 0x78, 0x8D, 0x31, 0xD0, 0x5A, -0x3F, 0x5B, 0xD7, 0xF5, 0x0B, 0x5A, 0xEB, 0x9C, 0xA5, 0xF7, -0x1E, 0x29, 0x25, 0x10, 0xFD, 0x87, 0x62, 0x08, 0x21, 0xFF, -0xB3, 0xD6, 0xA2, 0x2C, 0x4B, 0x10, 0xD1, 0x81, 0x4A, 0x99, -0xB9, 0xEB, 0xE3, 0x6B, 0x4A, 0xA9, 0xD3, 0x4A, 0x29, 0x90, -0x31, 0xA6, 0x94, 0x52, 0xBE, 0x6F, 0x8C, 0x11, 0x31, 0x46, -0x28, 0xA5, 0xB2, 0x33, 0x21, 0x04, 0x84, 0x10, 0x60, 0x66, -0xCC, 0x66, 0xB3, 0xEC, 0x60, 0x3E, 0x9F, 0x43, 0x29, 0x05, -0xA5, 0x54, 0x86, 0x47, 0x4A, 0x99, 0xA7, 0x4C, 0x29, 0xD5, -0x17, 0x42, 0xBC, 0x95, 0x52, 0xFA, 0x5D, 0xDC, 0xBB, 0x77, -0xEF, 0x84, 0xB5, 0xF6, 0x2F, 0xAD, 0x35, 0x62, 0x8C, 0xD8, -0x8F, 0xFF, 0xDD, 0xBB, 0x77, 0x71, 0xE5, 0xCA, 0x95, 0x0C, -0x8B, 0xF7, 0x1E, 0x4A, 0x29, 0x94, 0x65, 0x09, 0x00, 0xD8, -0xD8, 0xD8, 0xC0, 0xC5, 0x8B, 0x17, 0xA1, 0xB5, 0xCE, 0x41, -0x3A, 0x0E, 0x31, 0x73, 0x12, 0x42, 0x9C, 0xA0, 0xA6, 0x69, -0x6A, 0xAD, 0x35, 0x42, 0x08, 0x39, 0x63, 0xAD, 0x35, 0x3A, -0xB8, 0xAE, 0x5D, 0xBB, 0x86, 0x87, 0x59, 0x55, 0x55, 0xB8, -0x74, 0xE9, 0x12, 0x88, 0x28, 0xF7, 0xA3, 0xEB, 0x49, 0x4A, -0x49, 0x78, 0xEF, 0x0D, 0x85, 0x10, 0x2E, 0x2C, 0x16, 0x0B, -0x48, 0x29, 0xA1, 0x94, 0xCA, 0x59, 0x10, 0x51, 0xC6, 0x7A, -0xB1, 0x58, 0x1C, 0x1A, 0xA0, 0x63, 0x3D, 0x33, 0xC3, 0x39, -0x87, 0x94, 0x52, 0x86, 0x29, 0xA5, 0x84, 0xB6, 0x6D, 0x9F, -0xA0, 0xBD, 0xBD, 0xBD, 0x33, 0x8B, 0xC5, 0x22, 0x13, 0xAA, -0x7B, 0x56, 0x55, 0x85, 0xF1, 0x78, 0x9C, 0x2F, 0x1D, 0x66, -0xCE, 0x39, 0x8C, 0x46, 0xA3, 0x0E, 0x92, 0x03, 0x32, 0xB1, -0xEC, 0xC9, 0xD3, 0x34, 0x9F, 0xCF, 0xE3, 0xFE, 0x31, 0xEB, -0x4E, 0xD3, 0x34, 0x98, 0x4C, 0x26, 0x78, 0x94, 0xB5, 0x6D, -0x8B, 0xF1, 0x78, 0x0C, 0xAD, 0x75, 0x27, 0x1B, 0xFF, 0x33, -0x98, 0x08, 0x42, 0x88, 0x20, 0x43, 0x08, 0x37, 0x97, 0x54, -0xCF, 0x4D, 0xEE, 0xC6, 0xB2, 0xAB, 0xEC, 0x51, 0x01, 0x9A, -0xA6, 0x39, 0x40, 0xB8, 0xCE, 0xC7, 0xF2, 0xFB, 0x37, 0x92, -0x52, 0x5E, 0x07, 0x90, 0x65, 0xA0, 0x23, 0x51, 0xD3, 0x34, -0xB8, 0x73, 0xE7, 0x4E, 0x96, 0x8A, 0xC3, 0x6C, 0x3C, 0x1E, -0xE3, 0xFE, 0xFD, 0xFB, 0x58, 0x5F, 0x5F, 0x47, 0x51, 0x14, -0x30, 0xC6, 0xE4, 0x5E, 0x2E, 0xA5, 0xE7, 0x1F, 0x62, 0xE6, -0x39, 0x33, 0xA3, 0x69, 0x1A, 0x38, 0xE7, 0xB0, 0x58, 0x2C, -0x30, 0x9D, 0x4E, 0xB1, 0xBB, 0xBB, 0x8B, 0xE1, 0x70, 0x88, -0xBA, 0xAE, 0x33, 0x27, 0xBA, 0x8B, 0x21, 0x84, 0xDC, 0xA7, -0xE1, 0x70, 0x88, 0xB6, 0x6D, 0x31, 0x18, 0x0C, 0x50, 0xD7, -0x75, 0x0E, 0xA4, 0xB5, 0x6E, 0x53, 0x4A, 0x8D, 0xD8, 0xDC, -0xDC, 0x94, 0xCC, 0xFC, 0xDD, 0xF6, 0xF6, 0xF6, 0x2B, 0x3B, -0x3B, 0x3B, 0xD8, 0xDB, 0xDB, 0xC3, 0x6C, 0x36, 0x83, 0x94, -0x12, 0xAB, 0xAB, 0xAB, 0xB0, 0xD6, 0xC2, 0x39, 0x87, 0x23, -0x47, 0x8E, 0xE0, 0xD4, 0xA9, 0x53, 0x68, 0x9A, 0x06, 0xB7, -0x6E, 0xDD, 0x82, 0xF7, 0x1E, 0x55, 0x55, 0x65, 0x76, 0x13, -0x11, 0xEA, 0xBA, 0x46, 0xBF, 0xDF, 0x47, 0x55, 0x55, 0xE8, -0xF5, 0x7A, 0x1F, 0x13, 0xD1, 0x7B, 0x34, 0x1A, 0x8D, 0x22, -0x33, 0x5F, 0x9D, 0x4E, 0xA7, 0xCF, 0x6F, 0x6D, 0x6D, 0xD9, -0xB6, 0x6D, 0x61, 0xAD, 0xC5, 0x60, 0x30, 0x40, 0xBF, 0xDF, -0xCF, 0x25, 0x1F, 0x3F, 0x7E, 0x1C, 0xC7, 0x8E, 0x1D, 0x83, -0xF7, 0x1E, 0xC3, 0xE1, 0x10, 0xDB, 0xDB, 0xDB, 0x9D, 0x8A, -0x42, 0x4A, 0x89, 0xB6, 0x6D, 0xB1, 0xB3, 0xB3, 0xD3, 0xE9, -0xD6, 0x38, 0x84, 0xF0, 0x25, 0x11, 0x25, 0xDA, 0xDA, 0xDA, -0x82, 0x52, 0xEA, 0x67, 0x66, 0xFE, 0x56, 0x08, 0xF1, 0xBA, -0x94, 0x32, 0x67, 0xC1, 0xCC, 0x08, 0x21, 0x64, 0x4E, 0x84, -0x10, 0x90, 0x52, 0x82, 0xB5, 0x16, 0x29, 0x25, 0x38, 0xE7, -0xA0, 0xB5, 0x46, 0x51, 0x14, 0x10, 0x42, 0xA0, 0x6D, 0x5B, -0xCC, 0xE7, 0x73, 0x10, 0xD1, 0xA7, 0xD3, 0xE9, 0xF4, 0x0F, -0x66, 0x06, 0x69, 0xAD, 0x21, 0xA5, 0x84, 0x73, 0xEE, 0xDD, -0xA3, 0x47, 0x8F, 0x3E, 0x19, 0x63, 0x3C, 0xDB, 0x69, 0xBD, -0x73, 0x0E, 0x31, 0x46, 0x94, 0x65, 0x89, 0xB2, 0x2C, 0xF3, -0x7C, 0x17, 0x45, 0x01, 0x22, 0x42, 0xD3, 0x34, 0x07, 0x98, -0xBF, 0x6C, 0xEC, 0x8D, 0x94, 0xD2, 0xE5, 0x6E, 0x67, 0xC8, -0x7D, 0x43, 0x31, 0x51, 0x4A, 0x5D, 0x58, 0x5F, 0x5F, 0xFF, -0x65, 0x30, 0x18, 0x80, 0x99, 0xF3, 0x0E, 0x30, 0xC6, 0xC0, -0x18, 0x93, 0x49, 0xD4, 0x41, 0xD3, 0x89, 0x62, 0xD7, 0xF4, -0xA2, 0x28, 0x7E, 0x92, 0x52, 0xBE, 0x08, 0x60, 0x96, 0xF7, -0xC1, 0x03, 0x1B, 0x6D, 0x02, 0xE0, 0x5C, 0x55, 0x55, 0x9F, -0xF4, 0x7A, 0x3D, 0x10, 0x51, 0x76, 0xDE, 0xC9, 0xF6, 0x52, -0x8E, 0xF3, 0x8E, 0xF6, 0xDE, 0x23, 0xC6, 0xE8, 0xA4, 0x94, -0x1F, 0x0A, 0x21, 0x9E, 0x4B, 0x29, 0xCD, 0xF6, 0xFB, 0x94, -0x87, 0x2C, 0x7C, 0xC7, 0xCC, 0x6F, 0x6B, 0xAD, 0x37, 0x56, -0x56, 0x56, 0xAE, 0xAE, 0xAD, 0xAD, 0x61, 0x75, 0x75, 0x15, -0xC6, 0x98, 0x03, 0x2C, 0x5D, 0xC2, 0xE6, 0xA4, 0x94, 0x97, -0x01, 0x9C, 0x03, 0xF0, 0xC1, 0x61, 0x5C, 0xA1, 0x87, 0x91, -0x28, 0xC6, 0x78, 0x3D, 0xA5, 0x74, 0xDD, 0x5A, 0xFB, 0x59, -0x51, 0x14, 0xA5, 0x10, 0xE2, 0xB1, 0x18, 0xE3, 0x69, 0x00, -0x41, 0x4A, 0xF9, 0xAB, 0x52, 0x6A, 0x44, 0x44, 0xBB, 0xCC, -0xFC, 0xF7, 0xA3, 0xE4, 0xE4, 0xDF, 0x01, 0x00, 0xA3, 0xE7, -0xE8, 0xEB, 0x29, 0x7A, 0xCB, 0x6D, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x0D, 0x06, -0x68, 0x67, 0x6A, 0x57, 0x5F, 0x63, 0x5F, 0x61, 0x05, 0x04, -0x05, 0xE5, 0xD9, 0xD9, 0xD9, 0xEA, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, -0x03, 0x69, 0x69, 0x6C, 0x57, 0xCD, 0xCE, 0xD0, 0xD9, 0xD4, -0xE8, 0xC6, 0xFE, 0xCE, 0xDA, 0xC2, 0xFE, 0x77, 0x76, 0x84, -0xFB, 0x9B, 0x9B, 0x9F, 0xA0, 0x2F, 0x2F, 0x30, 0x1A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, -0x02, 0x00, 0x4C, 0x4C, 0x4F, 0x3F, 0x8B, 0x8A, 0x8E, 0xA7, -0x03, 0x02, 0x0A, 0x6F, 0x1B, 0x1E, 0x10, 0x13, 0xE1, 0xDD, -0xEC, 0x00, 0x81, 0x76, 0x97, 0x00, 0xDA, 0xDA, 0xDE, 0x02, -0xD1, 0xD1, 0xD9, 0x2F, 0x5E, 0x5E, 0x5E, 0x5F, 0x0A, 0x0B, -0x07, 0xCC, 0xD7, 0xD7, 0xD6, 0xE0, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2F, 0x21, 0x70, 0x6F, 0x74, -0x89, 0x30, 0x31, 0x31, 0x53, 0xA2, 0xA1, 0xA9, 0x01, 0x11, -0x12, 0x0F, 0x00, 0xFA, 0xF9, 0xFB, 0x00, 0x0F, 0x0F, 0x0D, -0x00, 0xDD, 0xDD, 0xE0, 0x00, 0xD1, 0xD0, 0xD5, 0x00, 0x02, -0x03, 0x03, 0x00, 0x11, 0x11, 0x0F, 0x00, 0x59, 0x59, 0x51, -0xE9, 0x6B, 0x6B, 0x67, 0x46, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, 0x0B, 0x77, 0x76, -0x7C, 0x7A, 0x6F, 0x6F, 0x73, 0xA3, 0xEE, 0xEE, 0xF1, 0x30, -0xA4, 0xA4, 0xAB, 0x01, 0x58, 0x58, 0x4F, 0x00, 0xD8, 0xD8, -0xDC, 0x00, 0xC7, 0xC6, 0xCB, 0x00, 0x20, 0x21, 0x1D, 0x00, -0x6D, 0x6E, 0x64, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x04, 0x04, -0x03, 0x01, 0x43, 0x43, 0x3E, 0x00, 0x9F, 0x9E, 0xA9, 0x0C, -0x0C, 0x0C, 0x11, 0x30, 0x01, 0x04, 0x04, 0x06, 0x05, 0x30, -0x2F, 0x37, 0x5B, 0xCD, 0xCE, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, -0x57, 0x59, 0x40, 0x62, 0x61, 0x66, 0x9B, 0x13, 0x13, 0x14, -0x23, 0xB9, 0xB9, 0xBE, 0x00, 0xEB, 0xEB, 0xED, 0x00, 0x1C, -0x1C, 0x19, 0x00, 0xBD, 0xBD, 0xC3, 0x00, 0x1A, 0x1A, 0x18, -0x00, 0x49, 0x49, 0x42, 0x00, 0x1F, 0x20, 0x1C, 0x00, 0x87, -0x86, 0x92, 0x00, 0x15, 0x15, 0x14, 0x00, 0x1D, 0x1D, 0x1A, -0x00, 0xB1, 0xB1, 0xB9, 0x00, 0x06, 0x05, 0x06, 0x00, 0x04, -0x05, 0x03, 0xFB, 0x03, 0xFF, 0xFF, 0xFF, 0xFE, 0x17, 0x16, -0x1E, 0x4F, 0x33, 0x33, 0x3A, 0x59, 0xEC, 0xED, 0xE8, 0xC8, -0x07, 0x07, 0x06, 0xFB, 0x82, 0x81, 0x86, 0x87, 0x56, 0x56, -0x5B, 0x98, 0xF2, 0xF1, 0xF4, 0x13, 0xB4, 0xB4, 0xBA, 0x00, -0x53, 0x54, 0x4B, 0x00, 0xD3, 0xD3, 0xD7, 0x00, 0xBA, 0xBA, -0xC0, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFA, 0xFB, 0xFB, 0x00, -0xD4, 0xD4, 0xD8, 0x00, 0x08, 0x07, 0x07, 0x00, 0x0E, 0x0E, -0x0D, 0x00, 0xF1, 0xF1, 0xF4, 0x00, 0xC3, 0xC2, 0xC8, 0x00, -0x09, 0x09, 0x09, 0x00, 0x07, 0x07, 0x07, 0x00, 0xF7, 0xF6, -0xF3, 0xA7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x22, 0x22, 0x29, 0x33, 0x50, 0x4F, 0x57, 0x8C, 0x3E, -0x3F, 0x36, 0x01, 0x17, 0x16, 0x18, 0x3E, 0xC5, 0xC5, 0xCA, -0x00, 0xD0, 0xD0, 0xD3, 0x00, 0x46, 0x47, 0x40, 0x00, 0xAC, -0xAA, 0xB3, 0x00, 0xED, 0xEE, 0xEF, 0x00, 0x02, 0x02, 0x02, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0x0C, -0x0D, 0x0B, 0x00, 0x3B, 0x3B, 0x35, 0x00, 0xEB, 0xEA, 0xEE, -0x00, 0xD3, 0xD3, 0xD8, 0x00, 0x0A, 0x0A, 0x08, 0x00, 0x05, -0x06, 0x05, 0x00, 0xFB, 0xFA, 0xFA, 0xCA, 0xC3, 0xC4, 0xB3, -0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x17, 0x17, 0x12, 0xF0, 0x48, 0x49, 0x41, 0x1A, 0xFE, 0xFE, -0x00, 0x25, 0xBD, 0xBD, 0xC3, 0x00, 0x2F, 0x2F, 0x2A, 0x00, -0x05, 0x05, 0x04, 0x00, 0x9C, 0x9A, 0xA5, 0x00, 0x01, 0x01, -0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x03, 0x02, 0x03, 0x00, -0x05, 0x07, 0x05, 0x00, 0x02, 0x02, 0x03, 0x00, 0x3B, 0x3B, -0x35, 0x00, 0xEE, 0xED, 0xF0, 0x00, 0xD7, 0xD7, 0xDC, 0x00, -0x0E, 0x0F, 0x0D, 0x00, 0x07, 0x06, 0x06, 0x00, 0xFB, 0xFB, -0xF9, 0xD1, 0xCA, 0xCC, 0xBD, 0x4C, 0xF9, 0xFA, 0xF8, 0xF3, -0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x3A, 0x24, 0x88, -0x87, 0x8D, 0xBD, 0xDB, 0xDB, 0xDF, 0x1D, 0xB9, 0xB9, 0xBE, -0x00, 0x4F, 0x4F, 0x48, 0x00, 0xC9, 0xC9, 0xCD, 0x00, 0xD0, -0xD0, 0xD5, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x01, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0x54, 0x55, 0x4D, 0x00, 0xE7, 0xE6, 0xEA, -0x00, 0xD9, 0xD9, 0xDD, 0x00, 0x0B, 0x0B, 0x0A, 0x00, 0x07, -0x08, 0x07, 0x00, 0xFB, 0xFB, 0xF9, 0xD7, 0xBF, 0xC0, 0xB2, -0x43, 0xF1, 0xF1, 0xEE, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x01, -0x1F, 0x1F, 0x20, 0x13, 0x93, 0x92, 0x99, 0xC7, 0x18, 0x18, -0x18, 0x24, 0xD0, 0xD1, 0xD4, 0x00, 0x0E, 0x0D, 0x0C, 0x00, -0xA7, 0xA7, 0xAF, 0x00, 0xF0, 0xF0, 0xF1, 0x00, 0xFC, 0xFB, -0xFC, 0x00, 0x03, 0x04, 0x03, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x15, 0x15, 0x13, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0x43, 0x44, -0x3D, 0x00, 0xCF, 0xCF, 0xD5, 0x00, 0xEC, 0xEB, 0xED, 0x00, -0x0C, 0x0C, 0x0C, 0x00, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xBA, 0xBC, 0xAD, 0x3B, 0xEA, 0xEA, 0xE6, 0xE1, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7E, -0x7D, 0x83, 0x9C, 0xD2, 0xD2, 0xD7, 0x24, 0xFF, 0xFF, 0x00, -0x00, 0xFA, 0xF9, 0xF9, 0x00, 0x98, 0xA4, 0xAC, 0x00, 0xFA, -0xFB, 0xFB, 0x00, 0x04, 0x03, 0x04, 0x00, 0xFE, 0xFF, 0xFF, -0x01, 0x06, 0x02, 0x02, 0xFF, 0x20, 0x21, 0x1E, 0x00, 0xF8, -0xF8, 0xF9, 0x00, 0x3B, 0x3B, 0x37, 0x00, 0xC1, 0xC0, 0xC6, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0x12, 0x13, 0x12, 0x00, 0x09, -0x09, 0x08, 0x00, 0x01, 0x01, 0x01, 0xF3, 0xBB, 0xBB, 0xAF, -0x4F, 0xEA, 0xEA, 0xE6, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x34, 0x34, -0x34, 0x3D, 0x12, 0x12, 0x0F, 0x00, 0x9E, 0x9E, 0xA7, 0x00, -0xC3, 0xC3, 0xC8, 0x00, 0xF2, 0xF2, 0xF4, 0x00, 0x07, 0x08, -0x06, 0x00, 0x01, 0x02, 0x01, 0x00, 0xFE, 0xFE, 0xFE, 0xFF, -0x01, 0x02, 0x02, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0x2F, 0x2E, -0x2A, 0x00, 0xB9, 0xB8, 0xBF, 0x00, 0x09, 0x0A, 0x0A, 0x00, -0x13, 0x12, 0x0E, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xFE, 0xFE, -0xFE, 0xFB, 0xC1, 0xC1, 0xB8, 0x57, 0xE1, 0xE2, 0xDC, 0xCD, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x2B, 0x2A, 0x2D, -0x20, 0x36, 0x37, 0x34, 0x34, 0x20, 0x21, 0x1C, 0x00, 0xC1, -0xC0, 0xC7, 0x00, 0x08, 0x08, 0x07, 0x00, 0xFC, 0xFB, 0xFC, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x0D, 0x0C, 0x0B, 0x00, 0x2E, -0x2F, 0x2A, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xC7, 0xC6, 0xCD, -0x00, 0x0E, 0x0E, 0x0E, 0x00, 0x11, 0x12, 0x11, 0x00, 0x11, -0x11, 0x10, 0x00, 0xFF, 0xFE, 0xFE, 0xFE, 0xCE, 0xCF, 0xC8, -0x6A, 0xD6, 0xD7, 0xCD, 0xB0, 0x8D, 0x8D, 0x8D, 0x99, 0x63, -0x63, 0x63, 0x6B, 0x3A, 0x3A, 0x3A, 0x3A, 0x03, 0x03, 0x03, -0xFC, 0xDB, 0xDB, 0xDB, 0xDD, 0x01, 0x23, 0x23, 0x24, 0x18, -0xB0, 0xAF, 0xB5, 0xD1, 0x22, 0x23, 0x1D, 0x15, 0xCE, 0xCE, -0xD3, 0x00, 0x7C, 0x7B, 0x88, 0x00, 0x05, 0x04, 0x04, 0x00, -0x0B, 0x0C, 0x0A, 0x00, 0x3E, 0x3E, 0x39, 0x00, 0xC9, 0xC8, -0xCF, 0x00, 0xEE, 0xEE, 0xF0, 0x00, 0x0E, 0x0F, 0x0D, 0x00, -0x0E, 0x0E, 0x0E, 0x00, 0x0D, 0x0D, 0x0C, 0x00, 0xFB, 0xFB, -0xFB, 0xFD, 0xCF, 0xCF, 0xC9, 0x72, 0xCA, 0xCA, 0xBF, 0x93, -0x57, 0x58, 0x57, 0x5C, 0x91, 0x91, 0x91, 0xA2, 0xD5, 0xD5, -0xD5, 0x00, 0xED, 0xED, 0xED, 0x00, 0x2B, 0x2B, 0x2B, 0xF8, -0x43, 0x43, 0x43, 0x24, 0x03, 0xEF, 0xEF, 0xEE, 0xF4, 0xEE, -0xEE, 0xEF, 0xD5, 0x33, 0x33, 0x37, 0x56, 0x1D, 0x1D, 0x19, -0x03, 0x2F, 0x30, 0x2B, 0x00, 0x05, 0x05, 0x05, 0x00, 0x14, -0x14, 0x13, 0x00, 0xB7, 0xB6, 0xBE, 0x01, 0xFA, 0xFA, 0xFB, -0x00, 0x0B, 0x0C, 0x0A, 0x00, 0x09, 0x09, 0x09, 0x00, 0x06, -0x06, 0x06, 0x00, 0xF6, 0xF5, 0xF5, 0xF1, 0xC8, 0xC9, 0xC0, -0x5E, 0xD0, 0xD0, 0xC7, 0xA0, 0x00, 0x00, 0xFF, 0x00, 0x54, -0x54, 0x54, 0x60, 0x33, 0x33, 0x33, 0x39, 0xF6, 0xEE, 0xEE, -0x00, 0x01, 0xFB, 0xFB, 0x00, 0x16, 0x1B, 0x1B, 0x04, 0xC0, -0xC0, 0xC0, 0xB7, 0x03, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xD5, -0xD3, 0xDC, 0xFD, 0xFD, 0xFE, 0xE0, 0x2D, 0x2C, 0x30, 0x4B, -0xE5, 0xE4, 0xE7, 0x03, 0xB0, 0xAF, 0xB7, 0x00, 0xD2, 0xD1, -0xD6, 0x00, 0x06, 0x07, 0x06, 0x00, 0x08, 0x07, 0x07, 0x00, -0x06, 0x06, 0x06, 0x00, 0x02, 0x02, 0x01, 0x00, 0xEB, 0xEB, -0xE7, 0xB7, 0xC1, 0xC3, 0xB7, 0x4F, 0xE2, 0xE2, 0xDB, 0xC6, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, -0x20, 0x2B, 0x1F, 0x1F, 0x1F, 0x47, 0xEF, 0xEF, 0xEF, 0x00, -0x17, 0x19, 0x19, 0x00, 0x05, 0x08, 0x08, 0x01, 0xCB, 0xCB, -0xCB, 0xB6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x97, 0x97, 0x93, 0xA4, 0xD9, 0xD8, 0xD8, 0xDD, 0xEB, -0xEA, 0xF9, 0x85, 0x0A, 0x0A, 0x0C, 0x3C, 0x06, 0x06, 0x06, -0x04, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFC, 0xF0, -0xEF, 0xEC, 0xC3, 0xE0, 0xE2, 0xDA, 0x86, 0xE1, 0xE1, 0xDA, -0xBD, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xE7, 0xE7, -0xDD, 0x08, 0x08, 0x08, 0xFF, 0xEF, 0x01, 0x01, 0x01, 0x02, -0x07, 0x07, 0x00, 0x01, 0x01, 0x01, 0x00, 0x19, 0x19, 0x19, -0x1D, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xBE, 0xBF, 0xBB, 0xC7, 0x00, 0x00, -0x01, 0x42, 0x0A, 0x0A, 0x0D, 0x16, 0x0D, 0x0C, 0x10, 0x25, -0xFF, 0xFF, 0xFE, 0xFC, 0xF6, 0xF7, 0xF3, 0xDC, 0xF4, 0xF4, -0xF2, 0xED, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x06, -0x0B, 0x0B, 0x0B, 0x00, 0x1A, 0x1A, 0x1A, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x1D, 0x1D, 0x1D, 0x2F, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0x00, 0xF6, 0xF6, 0xF2, 0xEA, 0xF6, 0xF6, 0xF2, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC9, 0xC9, 0xC9, 0xF0, -0xF0, 0xF0, 0xF3, 0x0F, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, -0x00, 0xF9, 0xF9, 0xF9, 0xFE, 0xC8, 0xC8, 0xC8, 0xC9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x31, -0x31, 0x4D, 0xA0, 0xA0, 0xA0, 0xCF, 0xAC, 0xAC, 0xAC, 0xD0, -0x51, 0x51, 0x51, 0x6F, 0x01, 0x01, 0x01, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x46, 0x33, -0xDB, 0xDA, 0xDB, 0xE3, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/X-Plastik.h b/Source/Core/DolphinWX/resources/X-Plastik.h deleted file mode 100644 index 904ee376de..0000000000 --- a/Source/Core/DolphinWX/resources/X-Plastik.h +++ /dev/null @@ -1,3040 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_2_H_ -#define _WXINCLUDE_MYHEADER_2_H_ - -static const unsigned char Toolbar_Browse2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x4B, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x95, 0x7F, 0x4C, 0x94, 0x75, 0x1C, -0xC7, 0xDF, 0xCF, 0x3D, 0x77, 0xCF, 0x73, 0xC7, 0xDD, 0x89, -0xDE, 0x1D, 0x1C, 0xC7, 0x1D, 0xBF, 0x39, 0x48, 0x4F, 0x1B, -0x01, 0x51, 0x21, 0xBA, 0x35, 0x32, 0x37, 0x18, 0x21, 0x67, -0x6A, 0x9A, 0x9B, 0x99, 0x26, 0xC1, 0x04, 0x6D, 0x18, 0x5B, -0x6C, 0x2E, 0xCB, 0x74, 0x1A, 0x96, 0x03, 0x5B, 0x83, 0xDC, -0x50, 0xFF, 0xA8, 0xB4, 0x31, 0x53, 0x1A, 0xE5, 0x1A, 0x5B, -0x7F, 0xE4, 0xA4, 0x16, 0x16, 0xFD, 0x93, 0xB5, 0x74, 0xB4, -0x45, 0x81, 0xFC, 0x88, 0xDF, 0xCA, 0xDD, 0x71, 0xF7, 0xF4, -0x3E, 0x4E, 0x1D, 0x22, 0x2A, 0x2C, 0xFA, 0xEE, 0x3E, 0xCF, -0xF7, 0xFB, 0x7C, 0x9F, 0xCF, 0xF7, 0xFD, 0xFA, 0x7C, 0x3F, -0xDF, 0x1F, 0x07, 0xCC, 0xA1, 0x94, 0x6F, 0x45, 0xD5, 0x5C, -0xFC, 0x83, 0x45, 0x35, 0x5B, 0xC7, 0xD7, 0x9E, 0xD3, 0xE5, -0xD5, 0x34, 0x28, 0x07, 0xF6, 0x14, 0x44, 0x16, 0xFD, 0x2F, -0x80, 0x57, 0xF7, 0x1E, 0x6B, 0x0E, 0xD6, 0x3B, 0x0F, 0x7E, -0x70, 0x76, 0xDE, 0x01, 0xEF, 0x95, 0x3A, 0xDE, 0x4D, 0xC9, -0xDC, 0xC6, 0x56, 0x3F, 0xE2, 0x96, 0xAE, 0x43, 0x5D, 0x65, -0x6C, 0xED, 0x7C, 0x02, 0x54, 0x3B, 0xAB, 0x2F, 0xBE, 0x3E, -0xD9, 0xF2, 0x76, 0xF1, 0xA1, 0x60, 0xFB, 0x3B, 0x97, 0xCB, -0xD6, 0xC4, 0x43, 0x3F, 0x2F, 0x80, 0xD3, 0x47, 0x5F, 0x3A, -0x27, 0x85, 0xC5, 0x51, 0xF7, 0x0A, 0xCD, 0x4F, 0x48, 0x2B, -0x44, 0x8D, 0x05, 0x9B, 0x2B, 0x2B, 0xCE, 0xFD, 0x27, 0x40, -0x59, 0x2E, 0xF4, 0x8D, 0x87, 0xB5, 0xFB, 0x37, 0xEC, 0xAE, -0x2F, 0x00, 0x3A, 0x01, 0x4F, 0x0F, 0x7B, 0x87, 0x08, 0x18, -0x64, 0xDD, 0x82, 0xB5, 0x25, 0xBB, 0x9F, 0x39, 0x5F, 0xE7, -0x38, 0x50, 0xE9, 0xC6, 0x82, 0x07, 0x01, 0xC4, 0x8A, 0xE2, -0x94, 0x9C, 0x32, 0xB7, 0xC5, 0x55, 0x55, 0x95, 0x57, 0xB4, -0x2E, 0x3F, 0xBF, 0x6A, 0x57, 0x71, 0x7E, 0xFD, 0xA1, 0xEA, -0x43, 0x07, 0xDD, 0xA5, 0xEF, 0x57, 0x2D, 0x59, 0xFE, 0xD6, -0x4A, 0xE0, 0x37, 0x60, 0xEC, 0x57, 0xBA, 0x06, 0xF8, 0xEB, -0x07, 0x84, 0x61, 0xBE, 0xFF, 0x05, 0xA8, 0x7F, 0x41, 0x6A, -0xD6, 0xCB, 0x2B, 0x56, 0x15, 0x3D, 0xFB, 0x46, 0xC9, 0xF6, -0x9C, 0x7D, 0x1B, 0xD7, 0x24, 0x56, 0xB8, 0x57, 0x25, 0xE6, -0xBC, 0xB2, 0x25, 0x35, 0xA6, 0xF0, 0x69, 0xBF, 0xC1, 0x1E, -0x31, 0xF2, 0x48, 0x6B, 0xBB, 0xFF, 0x77, 0xF5, 0x60, 0xE7, -0xD0, 0xFA, 0x8D, 0x75, 0xDD, 0x65, 0x77, 0x73, 0xAF, 0xD1, -0xAE, 0x02, 0xBE, 0xEB, 0x8C, 0x9C, 0x82, 0x8A, 0x97, 0x36, -0x14, 0x4A, 0x91, 0x42, 0x90, 0x4A, 0x01, 0x46, 0x27, 0x08, -0xF9, 0x19, 0x90, 0x87, 0x61, 0xB5, 0xFE, 0x0D, 0xAB, 0x7D, -0xC0, 0x08, 0xBF, 0x2F, 0x0F, 0xE8, 0xCB, 0x43, 0x97, 0x84, -0x96, 0x6F, 0x85, 0x9F, 0x28, 0xD2, 0x2C, 0x04, 0xE5, 0x8E, -0x6C, 0xCD, 0x3C, 0x53, 0xD1, 0xF0, 0xC3, 0x7A, 0xA0, 0x1D, -0x18, 0x64, 0xC4, 0x6A, 0x2D, 0x7B, 0xC7, 0x19, 0xF1, 0x4D, -0xDA, 0x00, 0xDB, 0x3E, 0x8A, 0x1A, 0x19, 0x3D, 0x85, 0x7D, -0x7D, 0x84, 0x72, 0x3D, 0x3C, 0x9C, 0x95, 0xA7, 0x7D, 0xD2, -0x0D, 0xEA, 0xD0, 0x04, 0xE1, 0xA0, 0xD1, 0xFD, 0xEC, 0x97, -0x68, 0x5A, 0x5B, 0x86, 0xC2, 0x3B, 0x6B, 0xB0, 0xE7, 0x44, -0xDB, 0x86, 0xA3, 0xC5, 0xF6, 0x6A, 0x20, 0x0D, 0x58, 0x28, -0x71, 0x10, 0x53, 0xE0, 0x67, 0xF4, 0x01, 0xE6, 0x5E, 0x63, -0x60, 0x22, 0x69, 0x63, 0x97, 0x80, 0xEE, 0xC3, 0x40, 0xEF, -0x9B, 0xDC, 0xAD, 0xA7, 0x81, 0x1B, 0xED, 0xA1, 0xD1, 0x86, -0x5B, 0x00, 0xEE, 0x03, 0x70, 0x79, 0x8E, 0x35, 0xE0, 0xC8, -0x6D, 0xF1, 0x60, 0x11, 0xA6, 0x26, 0xA6, 0x7E, 0x6F, 0x72, -0xCD, 0x8E, 0xB7, 0x9B, 0xCA, 0xA1, 0x34, 0xD1, 0x99, 0x9F, -0xD4, 0x5C, 0xBF, 0xC1, 0xAF, 0x99, 0x8E, 0xF3, 0x04, 0x06, -0x42, 0x42, 0x41, 0x51, 0xF1, 0xD6, 0x00, 0x45, 0x15, 0x0A, -0xDD, 0x1C, 0x5A, 0xFF, 0xE3, 0xA7, 0xD0, 0xB0, 0x63, 0x1F, -0xB6, 0xDD, 0x77, 0x17, 0x15, 0xEF, 0xBF, 0xBA, 0xEB, 0xB3, -0x9A, 0xD5, 0xB5, 0x10, 0x92, 0x89, 0xE6, 0x1A, 0x74, 0x94, -0x00, 0x23, 0x9F, 0xD3, 0x8B, 0x22, 0x06, 0x02, 0x65, 0x2A, -0x8B, 0x9A, 0x50, 0x5C, 0xC1, 0x94, 0x04, 0xF8, 0x08, 0x13, -0x30, 0xC1, 0xAC, 0x9D, 0xF8, 0x04, 0xB5, 0xD3, 0xC5, 0x31, -0x25, 0x96, 0x3B, 0xA5, 0xF1, 0xC2, 0xF0, 0x85, 0xDC, 0xC4, -0xE6, 0x82, 0x38, 0xFB, 0x77, 0xD1, 0x93, 0x5F, 0x25, 0x9E, -0x27, 0xD1, 0xC4, 0xC6, 0x22, 0x82, 0x82, 0x3B, 0x32, 0x8C, -0xFA, 0x86, 0x10, 0x48, 0x24, 0x40, 0x9A, 0xC0, 0xC5, 0x4B, -0x68, 0x2B, 0x2A, 0x85, 0x7B, 0xA6, 0x6D, 0x3A, 0xE3, 0x39, -0x18, 0xBA, 0x31, 0xE6, 0x85, 0x4E, 0xE6, 0x60, 0x26, 0x56, -0x8C, 0x65, 0x6A, 0x62, 0x18, 0x3D, 0xDB, 0x6A, 0x27, 0xEB, -0x25, 0xB4, 0x24, 0xF6, 0x27, 0xF2, 0x3D, 0x81, 0x6D, 0x33, -0xBC, 0x5E, 0x39, 0x30, 0x93, 0xCE, 0x7D, 0x01, 0x76, 0x7B, -0xB8, 0x0D, 0x5A, 0x0A, 0x0A, 0x36, 0x8A, 0x50, 0x2C, 0x2C, -0x03, 0xD0, 0xAE, 0x00, 0xF4, 0x39, 0xAC, 0x97, 0x53, 0xF4, -0x29, 0xD6, 0x8F, 0xF2, 0x5B, 0x0A, 0x83, 0x70, 0x22, 0x3A, -0xCA, 0x6A, 0x9F, 0x0B, 0x40, 0x5E, 0x64, 0x8A, 0xB2, 0x41, -0xC5, 0xA8, 0xC5, 0xA5, 0x14, 0x78, 0x92, 0x3D, 0x14, 0xD5, -0x67, 0x13, 0x94, 0x0B, 0xE8, 0x08, 0xD1, 0xF3, 0xFC, 0xE9, -0x68, 0xDA, 0x27, 0xE8, 0xB3, 0x0C, 0xA6, 0x08, 0xA7, 0xFD, -0xCC, 0x87, 0xE9, 0x0B, 0x67, 0x05, 0xF8, 0xE2, 0x54, 0x46, -0xB6, 0xD1, 0xE8, 0x90, 0xA1, 0xE2, 0x42, 0x1B, 0x5C, 0x80, -0x31, 0x9D, 0x90, 0x34, 0x78, 0x95, 0xC7, 0x30, 0x32, 0x9E, -0xF8, 0x91, 0x5F, 0xE4, 0xBB, 0x8A, 0xD1, 0x6B, 0xB9, 0xA5, -0xA5, 0x4C, 0x02, 0x32, 0xA1, 0x37, 0xBB, 0x90, 0xE0, 0x5C, -0x96, 0x31, 0x2B, 0x80, 0xA4, 0x8B, 0x57, 0x9B, 0x63, 0x79, -0x62, 0xE4, 0x64, 0xDE, 0x9B, 0x8B, 0x31, 0x3E, 0xEE, 0xC4, -0x88, 0xC7, 0x71, 0x5C, 0xD6, 0x39, 0x84, 0x05, 0xE1, 0x8E, -0x62, 0xB5, 0x6C, 0x12, 0x3C, 0x8A, 0xB5, 0xCE, 0x37, 0xC1, -0x14, 0x6A, 0x16, 0x33, 0x4D, 0x2E, 0x18, 0x4D, 0x2E, 0x98, -0xAD, 0x39, 0xD2, 0x4C, 0x00, 0xF5, 0xF4, 0x8E, 0x08, 0xA3, -0x77, 0xA5, 0xC7, 0x93, 0x8A, 0xC1, 0x6B, 0x29, 0xFF, 0x0C, -0x79, 0x4C, 0xE5, 0xA9, 0x2E, 0xE7, 0xC7, 0xD3, 0x7D, 0xB4, -0x5A, 0x99, 0xFB, 0x17, 0x25, 0x3D, 0xDD, 0x7F, 0x3E, 0x6F, -0x34, 0x26, 0xD5, 0xCA, 0x62, 0x98, 0x4D, 0x51, 0xBE, 0x5F, -0xCD, 0xBE, 0xAF, 0x1E, 0x3A, 0x83, 0x1F, 0xBB, 0xB3, 0xCC, -0xDD, 0xD7, 0x23, 0x37, 0x45, 0x25, 0x17, 0x9A, 0x53, 0x5D, -0x59, 0xF7, 0x88, 0x4F, 0x2D, 0x91, 0x51, 0x31, 0x8D, 0x3A, -0xBD, 0x2D, 0xDA, 0x8B, 0xF8, 0x17, 0xA1, 0x49, 0xB0, 0xCC, -0xE4, 0x23, 0x4C, 0xEF, 0x38, 0xD9, 0xB0, 0xF9, 0xF1, 0x2D, -0x2F, 0xD8, 0x3E, 0x85, 0x98, 0xD6, 0x3E, 0x3A, 0x9A, 0xDE, -0xAB, 0x92, 0x6C, 0x57, 0x24, 0x6D, 0x78, 0x8F, 0x37, 0x80, -0x3F, 0x78, 0xD5, 0x75, 0x88, 0x0A, 0x62, 0xB4, 0x32, 0x62, -0x79, 0xEF, 0x45, 0x4E, 0xF8, 0x91, 0x24, 0x4B, 0x5D, 0x26, -0xFE, 0x47, 0x24, 0xF7, 0xF7, 0x65, 0x56, 0x58, 0xEC, 0x71, -0x6D, 0x0F, 0x05, 0x04, 0x4B, 0xCB, 0x49, 0x6C, 0xCA, 0x75, -0x47, 0x59, 0xE0, 0x49, 0xE0, 0x95, 0x19, 0xA7, 0x83, 0x18, -0xA3, 0x81, 0xCA, 0xE2, 0x51, 0x54, 0xD2, 0x4D, 0x01, 0x82, -0x1A, 0xFE, 0x31, 0x05, 0x81, 0x5E, 0x1F, 0x94, 0xCE, 0x61, -0x48, 0x1D, 0xDE, 0xD6, 0x96, 0xCB, 0x03, 0xD9, 0x6E, 0x7C, -0xF3, 0xA0, 0xD9, 0xDE, 0x86, 0xDD, 0x73, 0xB2, 0xE7, 0x58, -0x82, 0x1A, 0x77, 0xA5, 0xFD, 0x5F, 0xE9, 0xBE, 0x48, 0xE3, -0x83, 0x00, 0x9D, 0x5B, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0xD5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x95, 0x56, 0x69, 0x50, 0x53, 0x57, 0x14, -0xFE, 0x80, 0x84, 0x24, 0x8F, 0x97, 0x7D, 0x23, 0xDB, 0x4B, -0x62, 0x12, 0xB6, 0x40, 0x12, 0x90, 0x35, 0x89, 0x22, 0x8B, -0x02, 0x5A, 0x5A, 0x15, 0xC5, 0x5A, 0x15, 0x97, 0x71, 0xCA, -0xE8, 0x0F, 0xDB, 0x4E, 0x99, 0xDA, 0xAA, 0xD3, 0xDA, 0xE9, -0x54, 0xDB, 0x99, 0x5A, 0xAD, 0x9D, 0xB1, 0xFE, 0xE9, 0xA8, -0x6D, 0xA7, 0x56, 0xEB, 0xC2, 0xD4, 0xD6, 0xA2, 0x08, 0xDA, -0x8A, 0x88, 0x80, 0x46, 0xAD, 0x20, 0x08, 0x56, 0x65, 0x51, -0x20, 0xB2, 0xEF, 0x88, 0xA4, 0x0F, 0x97, 0x0E, 0xA0, 0x54, -0x7B, 0x66, 0xEE, 0xDC, 0x39, 0xE7, 0x9D, 0xF3, 0x7D, 0xE7, -0x9E, 0x73, 0xCF, 0x9B, 0x0B, 0x3C, 0x5F, 0x7C, 0x6D, 0x96, -0x88, 0x75, 0x06, 0x3D, 0xF5, 0xB5, 0xD3, 0x11, 0x7B, 0xD3, -0x66, 0xB3, 0xED, 0x52, 0x69, 0xF4, 0x19, 0xB1, 0x91, 0xD1, -0xA2, 0x49, 0xFC, 0x27, 0x15, 0x9F, 0x89, 0x86, 0x94, 0xA4, -0xE4, 0x28, 0x2E, 0x9F, 0x5D, 0x37, 0x32, 0xDC, 0x97, 0x26, -0x14, 0x2B, 0xA3, 0x79, 0x5C, 0x99, 0x50, 0x4A, 0x70, 0xA3, -0x94, 0x0A, 0xFF, 0xCC, 0xD6, 0xEE, 0xFB, 0xEB, 0x45, 0x5C, -0x62, 0x95, 0xBB, 0xB5, 0x63, 0xC7, 0xCB, 0x12, 0x78, 0x8F, -0x55, 0x9C, 0x0E, 0xBB, 0x9A, 0xDE, 0x4A, 0x9B, 0x9A, 0x5A, -0xE1, 0x70, 0x64, 0xC0, 0x1C, 0xE2, 0x40, 0x75, 0xF5, 0x0D, -0x94, 0x5C, 0xAB, 0x40, 0x65, 0xCD, 0x1D, 0x88, 0x45, 0x46, -0x38, 0xE3, 0x17, 0x52, 0x76, 0xBB, 0xCD, 0xA3, 0x90, 0x8B, -0xDB, 0xFF, 0xF7, 0x09, 0x84, 0x3C, 0x72, 0xA7, 0x97, 0xF7, -0xA0, 0x4D, 0x2C, 0x09, 0x06, 0x57, 0xC0, 0xC2, 0x89, 0xBC, -0xC3, 0x08, 0x31, 0x87, 0x41, 0x24, 0x91, 0x43, 0x28, 0x12, -0xA1, 0xA1, 0xBE, 0x16, 0x25, 0xA5, 0x7F, 0xC2, 0x19, 0xBB, -0x10, 0x5A, 0x9D, 0x81, 0x5D, 0x5F, 0x73, 0x71, 0xB3, 0x75, -0x6A, 0xAC, 0xAB, 0xB1, 0xB1, 0xA1, 0x7A, 0x32, 0x02, 0xAF, -0xB1, 0xCA, 0x9B, 0xAB, 0x56, 0xE4, 0xFD, 0x7C, 0xE4, 0x68, -0x4A, 0x5C, 0xDC, 0x6C, 0x30, 0x18, 0x0F, 0x21, 0xE0, 0x8A, -0x50, 0x54, 0x5A, 0x88, 0xCE, 0x8E, 0x26, 0xB0, 0x18, 0x1C, -0x50, 0x53, 0xC2, 0xA0, 0x55, 0xEB, 0x71, 0xB1, 0xFC, 0x0C, -0xE2, 0xA7, 0x27, 0x83, 0x14, 0x68, 0xF0, 0xE3, 0x9E, 0x4F, -0x30, 0xC2, 0x22, 0x8E, 0xB4, 0xB6, 0xB4, 0x66, 0xBC, 0x90, -0x60, 0xCD, 0xCA, 0x65, 0x15, 0x65, 0x2E, 0x57, 0x08, 0xC1, -0x37, 0xE2, 0xE1, 0x48, 0x07, 0xF8, 0x3C, 0x01, 0x04, 0x02, -0x19, 0x8A, 0xCF, 0xE7, 0xC3, 0xF3, 0x60, 0x04, 0x62, 0xA9, -0x0C, 0x2A, 0x8D, 0x01, 0x72, 0xA5, 0x0E, 0x8D, 0x75, 0x55, -0x90, 0x08, 0x04, 0x30, 0x1A, 0xED, 0x38, 0xF6, 0xCB, 0x1E, -0xDC, 0x6A, 0xAC, 0x3D, 0xDD, 0xDA, 0xE2, 0x4E, 0x9C, 0x48, -0x30, 0xAE, 0x07, 0x57, 0x5C, 0xAE, 0xBD, 0x94, 0x52, 0x8E, -0xDE, 0xDE, 0x1E, 0x74, 0xB5, 0x77, 0xA2, 0xA2, 0xAA, 0x02, -0x67, 0x0A, 0x4F, 0x42, 0x26, 0xD2, 0xC1, 0x60, 0x0C, 0x41, -0x7B, 0x5B, 0x37, 0x86, 0xFA, 0xFB, 0x20, 0x93, 0x8B, 0x61, -0x32, 0x98, 0xE1, 0xF1, 0x26, 0x70, 0xB5, 0xA2, 0x10, 0x49, -0xC9, 0x0B, 0x60, 0xA0, 0x14, 0x09, 0xFA, 0x29, 0x92, 0xD8, -0xFF, 0x24, 0x28, 0xAB, 0x6A, 0x38, 0x1D, 0xAA, 0x53, 0xA1, -0xBD, 0xA7, 0xF9, 0x51, 0xA6, 0xF0, 0xD0, 0x65, 0xCB, 0x5E, -0x83, 0xD4, 0xD4, 0x19, 0x48, 0x4E, 0x4C, 0xC0, 0xA6, 0x0D, -0xEF, 0x41, 0x28, 0xE0, 0xE0, 0xE4, 0xAF, 0xB9, 0xF0, 0x21, -0x78, 0x10, 0x4A, 0xC4, 0x20, 0x49, 0x09, 0x8A, 0x4B, 0x7E, -0x83, 0xD9, 0x92, 0x0E, 0xBE, 0x9F, 0xF4, 0xBC, 0xC9, 0x18, -0x34, 0x73, 0xD2, 0x12, 0x8D, 0x4A, 0x72, 0xA0, 0xA6, 0x50, -0x19, 0x6C, 0x4A, 0xA8, 0x68, 0x15, 0x81, 0x39, 0xDC, 0x8C, -0xDA, 0x9B, 0x55, 0xF0, 0x57, 0x1A, 0xD1, 0xDB, 0xD1, 0x09, -0x95, 0x5A, 0x89, 0x69, 0xD3, 0xE2, 0x21, 0x24, 0xBD, 0x90, -0x7B, 0x3C, 0x0F, 0x61, 0xE1, 0xF1, 0xE8, 0xEF, 0xEE, 0x40, -0x9B, 0xBB, 0x05, 0xD7, 0xAB, 0xAE, 0xC1, 0xE9, 0x4C, 0xC5, -0xBE, 0xEF, 0xB6, 0x8F, 0xC3, 0xF5, 0x9E, 0x48, 0x70, 0xAA, -0xBA, 0x3E, 0x51, 0xCA, 0x60, 0x82, 0x18, 0xBA, 0x01, 0x83, -0xCE, 0x0A, 0xB9, 0x44, 0x09, 0x83, 0x5E, 0x8F, 0x28, 0xA7, -0x03, 0x0C, 0x26, 0x1B, 0x47, 0x8E, 0xE6, 0xE2, 0x4A, 0x55, -0x3D, 0xB2, 0x96, 0x66, 0xA1, 0xE0, 0x78, 0x2E, 0x2A, 0x2B, -0x2F, 0xA3, 0xA5, 0xAD, 0x05, 0xFE, 0xFE, 0x0A, 0x5C, 0xBD, -0x76, 0x09, 0x71, 0x31, 0x89, 0xB0, 0x85, 0x06, 0x5C, 0x79, -0x8A, 0xF7, 0xCC, 0xA0, 0x2D, 0xCF, 0xCE, 0xCE, 0xAB, 0xBE, -0x79, 0xD7, 0x28, 0x97, 0xF2, 0x50, 0x7C, 0xBD, 0x0A, 0xF1, -0x31, 0x33, 0xA1, 0x37, 0x51, 0x60, 0xFA, 0x72, 0x40, 0xF2, -0x48, 0x88, 0x25, 0x42, 0x94, 0x95, 0x94, 0x82, 0xCB, 0x25, -0xA1, 0x33, 0x19, 0x70, 0xF1, 0x42, 0x39, 0xFE, 0xBE, 0x53, -0x43, 0x13, 0x68, 0xD0, 0xD3, 0xE9, 0x86, 0xBF, 0x4A, 0x8F, -0x16, 0xF7, 0x6D, 0x79, 0x42, 0x5C, 0x62, 0x41, 0x65, 0x4D, -0x55, 0xDD, 0xB8, 0x13, 0x84, 0x06, 0x47, 0x1C, 0x74, 0x9D, -0x2B, 0x4B, 0xE9, 0xF2, 0x66, 0x43, 0x29, 0xD5, 0x61, 0xA5, -0xD9, 0x17, 0xFB, 0xF2, 0x7E, 0x42, 0xFB, 0xFD, 0x21, 0x58, -0x2D, 0x16, 0xB0, 0x98, 0x1C, 0xFA, 0x56, 0x89, 0x10, 0x19, -0x13, 0x8E, 0x6B, 0x7F, 0xB9, 0xC0, 0xE7, 0x10, 0xE0, 0x09, -0x84, 0xF4, 0x25, 0x90, 0xA0, 0xEE, 0x4E, 0x2D, 0x7C, 0xD8, -0x1C, 0x74, 0x75, 0x75, 0x82, 0xD2, 0x9B, 0xF0, 0xC7, 0xB9, -0x82, 0x69, 0xCF, 0x94, 0x88, 0xD2, 0xFA, 0x2F, 0x54, 0xA9, -0x55, 0x28, 0x2F, 0xCA, 0xC7, 0xD9, 0x5B, 0x8D, 0xE8, 0xE6, -0x59, 0xF1, 0xF9, 0x0C, 0x1D, 0xBE, 0xF9, 0x76, 0x2B, 0x8A, -0x8A, 0x2E, 0xC0, 0x66, 0x0D, 0xC5, 0xC3, 0xA1, 0x61, 0x9A, -0x88, 0x05, 0x1E, 0x5F, 0x88, 0x86, 0x7B, 0xCD, 0xE8, 0x6A, -0xEB, 0x44, 0xB4, 0xC3, 0x09, 0x4A, 0xA3, 0xA5, 0xCB, 0xE1, -0x83, 0xE1, 0xFE, 0x6E, 0xF8, 0x7A, 0xB8, 0x90, 0xC8, 0x24, -0x82, 0x67, 0x9A, 0xAC, 0xD7, 0x1B, 0x1A, 0x94, 0x4A, 0xB5, -0x6A, 0x64, 0x78, 0x18, 0x65, 0xA5, 0xE7, 0x20, 0x31, 0x04, -0x61, 0xC9, 0xCC, 0x64, 0x98, 0x89, 0x0E, 0xAC, 0xDA, 0xF6, -0x03, 0xA2, 0x9D, 0x73, 0x61, 0x52, 0x49, 0xE8, 0x69, 0xFE, -0x1D, 0x84, 0x1F, 0x07, 0x0F, 0x1E, 0x12, 0x08, 0x0C, 0x08, -0x04, 0x93, 0xEE, 0x59, 0xEF, 0x40, 0x1F, 0xAE, 0x5C, 0xBA, -0x04, 0x47, 0x4C, 0x12, 0x5C, 0xD7, 0xCB, 0xA1, 0x53, 0xCB, -0x70, 0xAA, 0xA0, 0xC0, 0x6B, 0x1C, 0x81, 0x4A, 0xA3, 0xFE, -0x80, 0x24, 0xC8, 0x2D, 0x1C, 0x1E, 0x0F, 0xEC, 0x61, 0x06, -0x6E, 0xD5, 0xDF, 0x82, 0xBB, 0x7F, 0x10, 0x49, 0xF6, 0x28, -0x6C, 0x4C, 0xB5, 0xE1, 0xD3, 0x43, 0x87, 0x51, 0x7D, 0x9F, -0x87, 0x80, 0xE0, 0x70, 0x0C, 0xBA, 0x6F, 0xD3, 0x73, 0xD1, -0x8A, 0x06, 0x77, 0x03, 0x64, 0x32, 0x09, 0x34, 0x0A, 0x13, -0x08, 0x82, 0x0D, 0x8A, 0x32, 0xE3, 0xE0, 0x81, 0x1D, 0xD0, -0x53, 0xFA, 0xCB, 0xA5, 0x97, 0x5D, 0xE1, 0xE3, 0x4A, 0xD4, -0x58, 0xDF, 0xB0, 0x95, 0x01, 0xDF, 0x91, 0xFE, 0x9E, 0x3E, -0x0C, 0x78, 0x0F, 0x20, 0xCE, 0x1E, 0x8D, 0x20, 0xA5, 0x3F, -0xF2, 0xF3, 0x4F, 0x60, 0xFE, 0xEE, 0x42, 0x4C, 0x35, 0x39, -0xF1, 0x51, 0x9A, 0x16, 0x7E, 0x1D, 0x65, 0xF0, 0xE6, 0x0A, -0xD0, 0x49, 0x0F, 0x9A, 0xC5, 0x32, 0x0D, 0x21, 0xC6, 0x58, -0x90, 0x7E, 0x3C, 0xF4, 0xF6, 0x78, 0x63, 0xDF, 0xFE, 0xED, -0xB0, 0xC6, 0x38, 0x40, 0x83, 0xBF, 0xF1, 0xDC, 0x39, 0xA0, -0xB4, 0x94, 0xE6, 0xC1, 0xA0, 0x57, 0x9D, 0xDC, 0x5F, 0x84, -0x81, 0xFE, 0x21, 0xF8, 0x92, 0x7E, 0x38, 0xB6, 0xE7, 0x0B, -0x84, 0x59, 0xA6, 0x83, 0x4D, 0x67, 0x2A, 0x93, 0xEB, 0x10, -0xA8, 0x11, 0xDF, 0x63, 0x0E, 0xBA, 0x15, 0x96, 0x90, 0x50, -0x1C, 0xBD, 0x50, 0x8D, 0x26, 0xBA, 0x0F, 0xCD, 0x74, 0x3F, -0x7C, 0x98, 0x0F, 0x30, 0x27, 0xC2, 0x0A, 0x30, 0x38, 0x8E, -0x43, 0x27, 0x4F, 0x15, 0x4F, 0xC4, 0xFE, 0x57, 0x48, 0x16, -0x5F, 0xE8, 0x70, 0x38, 0x3C, 0x72, 0xB5, 0xD6, 0x33, 0x27, -0x75, 0x96, 0x67, 0xF3, 0xFB, 0x6B, 0x3C, 0x07, 0xF6, 0x7F, -0xEF, 0xD9, 0xB2, 0x6D, 0xBB, 0x27, 0x28, 0x28, 0xE4, 0xD0, -0x53, 0xBF, 0xA5, 0x69, 0x09, 0x9B, 0xDF, 0xCD, 0x4C, 0xEF, -0xCB, 0x4E, 0x8D, 0xE9, 0xD9, 0xBE, 0xE1, 0x1D, 0xCF, 0xC7, -0x6F, 0xAD, 0x3D, 0x4B, 0x9B, 0x99, 0x93, 0x02, 0x4F, 0x14, -0xAB, 0x39, 0x34, 0x54, 0xA3, 0x52, 0xE7, 0x31, 0x19, 0x64, -0xBD, 0x5A, 0xAB, 0x6D, 0x8A, 0x32, 0x50, 0xAB, 0x5F, 0x3A, -0xF8, 0x45, 0xC2, 0xE5, 0x4A, 0x43, 0xA4, 0x12, 0xC5, 0xDA, -0xD8, 0x08, 0xEB, 0x26, 0x2E, 0x97, 0xF7, 0xE1, 0x9C, 0xD7, -0x57, 0x7C, 0xB9, 0x2C, 0x73, 0xD1, 0xD6, 0x9C, 0x15, 0x99, -0xD2, 0xB1, 0x7E, 0xEB, 0xB3, 0xE6, 0x53, 0x9F, 0xAD, 0xCE, -0xD4, 0xED, 0xDA, 0x98, 0x13, 0x70, 0x7C, 0xEF, 0x6E, 0xBF, -0x97, 0x02, 0x17, 0x8B, 0x94, 0x59, 0xB6, 0x88, 0x88, 0x2D, -0x94, 0xCE, 0xB4, 0x24, 0x29, 0x65, 0xCE, 0xF4, 0xBB, 0x37, -0x4A, 0x1C, 0xEB, 0x32, 0x53, 0x22, 0xE7, 0x2D, 0x98, 0xBB, -0x98, 0xFE, 0x9C, 0x63, 0xB5, 0xCF, 0x0C, 0x4D, 0x8C, 0x34, -0x67, 0x7C, 0xF5, 0xF6, 0xF2, 0x35, 0xCB, 0x5F, 0x49, 0xCA, -0x99, 0x1E, 0x6D, 0xC9, 0xB1, 0xC7, 0x85, 0xAF, 0x4F, 0x8A, -0x8B, 0xDC, 0x94, 0xBD, 0x60, 0xF6, 0x52, 0xDA, 0x87, 0x31, -0x29, 0xB8, 0xD1, 0x60, 0x8A, 0xB6, 0xD8, 0xC2, 0xD5, 0x4F, -0x54, 0xA6, 0x54, 0x2A, 0x25, 0xC0, 0xF6, 0x23, 0x19, 0x84, -0x90, 0x78, 0x12, 0xC8, 0x5C, 0x9D, 0x6E, 0x0F, 0x48, 0x49, -0x4B, 0x1F, 0x7D, 0x00, 0xB0, 0xF0, 0xF8, 0xA2, 0x3C, 0xB2, -0xD3, 0xCB, 0x57, 0xA1, 0x56, 0xC9, 0xF9, 0x22, 0xF1, 0x54, -0x3C, 0xAF, 0x17, 0xE6, 0x30, 0xB3, 0x5C, 0xA1, 0xA0, 0xF8, -0xA3, 0x41, 0x81, 0x46, 0x33, 0x49, 0xEF, 0x1C, 0xF0, 0x95, -0xA3, 0xC0, 0xAC, 0x9D, 0xEB, 0x16, 0x13, 0x49, 0x11, 0x81, -0xC4, 0x23, 0xDB, 0xE3, 0x3F, 0x00, 0x5B, 0xA7, 0x0F, 0xF6, -0xB3, 0xD9, 0x22, 0xB8, 0xF6, 0x68, 0x3B, 0x99, 0x31, 0x2F, -0x8B, 0x9C, 0xF7, 0xDA, 0x22, 0xDE, 0x28, 0xC9, 0xA8, 0xFF, -0xAB, 0x69, 0xB3, 0x9E, 0xFB, 0x02, 0x61, 0x3D, 0x09, 0xF6, -0x79, 0x92, 0x15, 0x63, 0x8C, 0xEE, 0x35, 0x26, 0xDB, 0xB1, -0xCB, 0x67, 0x8C, 0xDF, 0xD8, 0xFD, 0xD1, 0x09, 0xFE, 0x01, -0x77, 0x7C, 0xD0, 0x0A, 0x90, 0xC2, 0xD1, 0xF9, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Fullscreen2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x43, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x6B, 0x4C, 0x9B, 0x65, 0x18, -0x3D, 0xBD, 0xAD, 0x95, 0xD2, 0x0B, 0x97, 0x16, 0x3A, 0x0A, -0xB4, 0xFD, 0xBE, 0x52, 0x06, 0x28, 0x88, 0x98, 0x28, 0xDD, -0xAA, 0x0C, 0x5C, 0xB6, 0x61, 0x18, 0xDB, 0x0F, 0x0D, 0xB7, -0x0D, 0x30, 0x12, 0x13, 0xA7, 0xC6, 0xC5, 0xC5, 0x6C, 0x8E, -0x28, 0x82, 0x66, 0x19, 0x46, 0x1D, 0x9B, 0x8A, 0xE2, 0x8C, -0x19, 0x6E, 0x51, 0x13, 0x67, 0x1A, 0x49, 0xB6, 0x78, 0x09, -0x31, 0x23, 0x73, 0x4B, 0x5C, 0x50, 0x33, 0x21, 0x9B, 0xB8, -0x79, 0xCB, 0xC6, 0x60, 0x8C, 0x8B, 0x04, 0x3A, 0x2E, 0xAD, -0xE7, 0x6D, 0x3F, 0x12, 0x7E, 0xF8, 0x43, 0xE2, 0xDF, 0x7D, -0xC9, 0xF9, 0x9E, 0xF7, 0xF6, 0x9C, 0xE7, 0x79, 0xCE, 0x7B, -0x01, 0x6E, 0x7F, 0xB7, 0xBF, 0xFF, 0xFB, 0x69, 0x96, 0x1A, -0xF5, 0xF5, 0x0D, 0xEE, 0xFE, 0xFE, 0xFE, 0xF1, 0xA7, 0x77, -0x3E, 0xB9, 0xA7, 0xAE, 0xBA, 0xBA, 0xD5, 0x68, 0x30, 0xFA, -0xC3, 0x91, 0x79, 0x7B, 0x41, 0x5E, 0xDE, 0x36, 0xD9, 0xEB, -0x29, 0xF5, 0x49, 0x52, 0x59, 0x96, 0x2C, 0x95, 0xF9, 0x14, -0x64, 0x0B, 0xF8, 0xE4, 0x0D, 0xAB, 0xED, 0xB6, 0xDC, 0xCD, -0x1B, 0x37, 0xB4, 0x1C, 0x79, 0xFB, 0xAD, 0xEE, 0xC3, 0x87, -0x0E, 0x36, 0xEF, 0x7A, 0x7E, 0x6F, 0x4B, 0x69, 0x59, 0xE9, -0x7B, 0xDD, 0x47, 0x8F, 0x4E, 0x0B, 0x5E, 0x95, 0xC2, 0xAF, -0xAA, 0xA8, 0x2C, 0x6F, 0x08, 0x9E, 0x08, 0x1E, 0x69, 0x6D, -0x7E, 0x11, 0x15, 0x75, 0x55, 0xC8, 0xF7, 0xE5, 0xAE, 0x28, -0xD3, 0x6F, 0x7E, 0xBC, 0x80, 0xD3, 0x1F, 0x75, 0xE1, 0xA5, -0x7D, 0x7B, 0x50, 0x59, 0xDB, 0x58, 0x17, 0xEC, 0x39, 0x79, -0x8C, 0xC3, 0x11, 0xB5, 0x12, 0x44, 0x13, 0x28, 0x2C, 0x78, -0xFC, 0xDD, 0xCE, 0x0F, 0xF0, 0x58, 0xF3, 0x5E, 0xB8, 0x48, -0x7E, 0x7E, 0x18, 0x38, 0x77, 0x1D, 0x38, 0x43, 0x7B, 0xFA, -0x2A, 0xD0, 0xFB, 0x3B, 0xF0, 0xE5, 0x9F, 0xC0, 0xC9, 0x3F, -0x80, 0x2F, 0x7E, 0x05, 0x4E, 0x5C, 0x04, 0x3E, 0xB9, 0x04, -0x1C, 0x1F, 0x00, 0x3E, 0xBE, 0x00, 0xC4, 0xE7, 0xE4, 0xE1, -0xAE, 0xDD, 0x07, 0xF0, 0xE1, 0x99, 0x41, 0x4C, 0x8C, 0xDE, -0x2C, 0x51, 0xD4, 0x51, 0x69, 0xF9, 0x13, 0x41, 0xB4, 0xA7, -0xBE, 0x1F, 0x5F, 0xF8, 0x2A, 0xD8, 0x86, 0xDE, 0x09, 0x60, -0x9A, 0x44, 0x1A, 0xCE, 0x2C, 0x44, 0x88, 0x30, 0x10, 0x5A, -0x88, 0x61, 0x6E, 0x11, 0x08, 0x8B, 0xC5, 0xF4, 0xD0, 0xAD, -0x8A, 0x39, 0xEA, 0xEE, 0x10, 0x79, 0x02, 0x83, 0x43, 0x80, -0xD1, 0xA4, 0x47, 0x60, 0x53, 0x09, 0xBA, 0xBB, 0x12, 0xC6, -0xC4, 0x32, 0x31, 0xA3, 0x55, 0x22, 0xE9, 0xAB, 0x5F, 0xD9, -0xBF, 0xB6, 0x8F, 0xDE, 0x67, 0x99, 0x91, 0xD9, 0x04, 0xDC, -0x62, 0x3B, 0x22, 0x08, 0x59, 0x9F, 0x5E, 0xC7, 0x45, 0xB4, -0x1A, 0xAE, 0x9C, 0x67, 0xA0, 0x6B, 0x53, 0xC0, 0xF5, 0x99, -0x58, 0xC0, 0x29, 0xDA, 0x49, 0x22, 0x34, 0x0F, 0xCC, 0xFE, -0x0D, 0xA4, 0x50, 0xD9, 0xE1, 0x7B, 0x9A, 0x77, 0xE3, 0xF3, -0x53, 0x6D, 0xE4, 0x0D, 0x2B, 0x01, 0xB4, 0x77, 0x9A, 0xB3, -0x4C, 0xF8, 0xF6, 0x67, 0xD6, 0x64, 0x00, 0xC6, 0x43, 0xC0, -0xCC, 0x1C, 0x30, 0x41, 0x8C, 0x4C, 0x02, 0x97, 0x47, 0x81, -0xBF, 0xB8, 0x65, 0xA3, 0x24, 0x00, 0xE7, 0xB0, 0xA8, 0x08, -0xAF, 0x56, 0xD2, 0x5B, 0x82, 0x10, 0xFB, 0x07, 0x91, 0x7B, -0xB1, 0x98, 0x15, 0xB5, 0xCD, 0x47, 0x97, 0x48, 0xF7, 0x3E, -0xB0, 0x69, 0x8C, 0x19, 0xFF, 0x44, 0x69, 0x7A, 0x58, 0x41, -0xC7, 0x39, 0x60, 0x7F, 0x2F, 0xF0, 0xCE, 0xD7, 0xC0, 0x67, -0xE7, 0x81, 0x7E, 0x06, 0x18, 0xA5, 0x0C, 0x9A, 0x64, 0xC0, -0xE0, 0xA2, 0x14, 0x59, 0x80, 0xC9, 0x47, 0xCB, 0xB6, 0xC6, -0x09, 0xAC, 0x72, 0x10, 0x36, 0x56, 0xCA, 0x79, 0x9D, 0x85, -0x36, 0x9D, 0xB1, 0xDC, 0x81, 0x2A, 0x91, 0x42, 0x34, 0xC0, -0x94, 0xE7, 0x7E, 0x7F, 0x4B, 0x10, 0xF8, 0x94, 0xD1, 0xBF, -0xFB, 0x8D, 0x64, 0xB3, 0x1C, 0xA4, 0x83, 0x43, 0x02, 0x7C, -0x39, 0xC0, 0xDD, 0x32, 0x50, 0x48, 0xA2, 0x82, 0x04, 0x20, -0x87, 0x04, 0xDE, 0x38, 0x20, 0x53, 0x0F, 0x64, 0xB0, 0xDA, -0x4C, 0xEE, 0x85, 0x8D, 0xD6, 0xCA, 0x0A, 0x8C, 0x64, 0x33, -0x33, 0x11, 0xB3, 0x99, 0xF2, 0x3A, 0xB2, 0x8A, 0x04, 0x77, -0x34, 0x40, 0xA8, 0xE2, 0xE5, 0xFB, 0xAE, 0x8E, 0x00, 0xAB, -0x99, 0x89, 0x87, 0x59, 0xE5, 0x91, 0xAC, 0x88, 0xD9, 0x64, -0x73, 0xA1, 0xCB, 0x48, 0x22, 0x12, 0x4A, 0xB4, 0x6B, 0x38, -0x96, 0xC3, 0x20, 0xD9, 0x89, 0x6C, 0x5B, 0x01, 0xD9, 0xCE, -0xF1, 0x44, 0x65, 0x0D, 0xF7, 0xCD, 0x41, 0x6B, 0x65, 0xC0, -0x78, 0xB2, 0x5A, 0xD6, 0x37, 0x96, 0x0B, 0x6E, 0xCD, 0x1B, -0x35, 0xFE, 0x16, 0x9D, 0xE5, 0xC1, 0xC0, 0x90, 0x27, 0x11, -0xB9, 0xD4, 0x36, 0x9E, 0x99, 0x39, 0x49, 0x98, 0x4A, 0x05, -0x53, 0x69, 0xDD, 0x0C, 0x92, 0x21, 0xC0, 0xCC, 0xD3, 0xD8, -0x77, 0x10, 0x76, 0xC2, 0xC6, 0xF9, 0x24, 0x6E, 0xBE, 0x85, -0xD9, 0x9B, 0x04, 0x29, 0x6D, 0x1C, 0x77, 0x34, 0x81, 0x63, -0xBF, 0x50, 0xEE, 0x1D, 0xCE, 0x64, 0x43, 0xFA, 0xE5, 0x63, -0xC3, 0x6A, 0x5B, 0x79, 0xD3, 0x43, 0xFB, 0xC2, 0xAD, 0xB0, -0x5D, 0x1C, 0x80, 0xBD, 0x80, 0xD9, 0x89, 0xF2, 0xE3, 0x01, -0xEE, 0x79, 0x34, 0x4B, 0x89, 0x36, 0xCB, 0x1C, 0xAB, 0x40, -0xA6, 0xF5, 0x28, 0x7D, 0x99, 0xD6, 0x43, 0xEB, 0xE5, 0x5A, -0x2F, 0xDB, 0x2E, 0x06, 0xF4, 0x99, 0x62, 0xFB, 0x52, 0x74, -0x6D, 0x00, 0x07, 0x3D, 0x3D, 0xB0, 0xE4, 0x97, 0x6D, 0xD6, -0x34, 0x3E, 0xB1, 0xAB, 0x73, 0xE8, 0xC6, 0x2C, 0xD6, 0x0D, -0x75, 0xE1, 0xAC, 0x69, 0x3D, 0x36, 0x96, 0x9A, 0xE0, 0xA6, -0x93, 0x9C, 0xC1, 0x60, 0x84, 0x97, 0xB2, 0xC9, 0x94, 0x46, -0x22, 0x32, 0x29, 0x47, 0x66, 0x12, 0x90, 0x4E, 0x38, 0xC5, -0x1E, 0xA5, 0xF0, 0x58, 0x52, 0x26, 0x2B, 0xFB, 0xC9, 0x94, -0x4E, 0x9F, 0xC6, 0x53, 0x77, 0x69, 0x06, 0x4D, 0x57, 0x5E, -0x45, 0xDF, 0x88, 0x16, 0xA9, 0xAE, 0x1C, 0xB7, 0x56, 0xBB, -0x30, 0x8D, 0x39, 0x4B, 0x3A, 0xA4, 0xE2, 0x2D, 0x78, 0x64, -0xB0, 0x13, 0x49, 0x45, 0xCF, 0xA0, 0xC4, 0x69, 0xC5, 0xE2, -0xDC, 0x1C, 0xF4, 0x94, 0xCC, 0x10, 0x89, 0x40, 0x1D, 0xA6, -0xA8, 0xEA, 0x08, 0xEF, 0x93, 0x2A, 0x7A, 0x32, 0x45, 0x57, -0xDC, 0xC0, 0x64, 0xB5, 0x0A, 0x21, 0xCA, 0xE1, 0xE4, 0xB8, -0x8A, 0xD9, 0xF7, 0x5D, 0x59, 0xC4, 0xA3, 0x37, 0x8E, 0x63, -0xCC, 0x92, 0x09, 0x7D, 0x8A, 0x8C, 0x42, 0x77, 0x9A, 0x1A, -0x1D, 0x1D, 0x87, 0xDB, 0x6B, 0x6A, 0x6A, 0xDA, 0xAA, 0xB6, -0xD7, 0xBF, 0xF9, 0xC2, 0xB3, 0x4F, 0x75, 0x19, 0x0D, 0xBA, -0x9D, 0x74, 0xAF, 0xE5, 0x91, 0x6E, 0x10, 0x40, 0x0C, 0xF5, -0xFF, 0x82, 0xE8, 0xF8, 0xB2, 0x75, 0xB5, 0x69, 0xF6, 0x84, -0xE7, 0x9A, 0x76, 0x6C, 0x7F, 0xFF, 0xE1, 0x2D, 0x95, 0xAF, -0x6F, 0xDB, 0xBA, 0xB5, 0xF5, 0x40, 0x7B, 0xFB, 0x6B, 0xE2, -0x6A, 0x50, 0x79, 0xB0, 0x78, 0x98, 0xC4, 0x8D, 0x5E, 0xF6, -0x00, 0x46, 0x56, 0xF0, 0xD6, 0xA9, 0x96, 0xB5, 0xC5, 0x6B, -0x72, 0x8B, 0x10, 0xD7, 0xF2, 0xA6, 0x98, 0xC8, 0x27, 0x78, -0x46, 0x10, 0xA7, 0xBC, 0x1F, 0x4B, 0xDF, 0x4A, 0x02, 0x2C, -0x05, 0x51, 0x29, 0x7E, 0x7C, 0x38, 0xC0, 0x07, 0x04, 0x93, -0x62, 0x62, 0x0D, 0x21, 0x2E, 0x85, 0x9F, 0x08, 0x10, 0x6B, -0x95, 0x76, 0xF1, 0x0A, 0x21, 0x7C, 0xD6, 0x29, 0x1C, 0x7E, -0x85, 0x33, 0x5B, 0x04, 0xE0, 0xC5, 0x86, 0xAC, 0x74, 0x04, -0xF8, 0x10, 0xC0, 0xAB, 0x8C, 0x49, 0xFF, 0x11, 0xB2, 0xE2, -0xE3, 0x5B, 0xC6, 0x23, 0xC6, 0x9D, 0xFF, 0x00, 0xED, 0x92, -0x2E, 0x92, 0xE2, 0xA4, 0xC8, 0x12, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x74, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x0B, 0x50, 0x94, 0xD7, 0x15, -0xFE, 0xFE, 0xC7, 0xFE, 0xFB, 0xDE, 0x65, 0xDF, 0x4B, 0x78, -0xBA, 0xB0, 0x20, 0xEC, 0x2E, 0x0B, 0x12, 0xC4, 0x85, 0x29, -0x68, 0x8C, 0x44, 0xB1, 0x55, 0x62, 0x30, 0xA9, 0x8D, 0x31, -0x46, 0xA5, 0x31, 0x68, 0x71, 0xA2, 0x4D, 0x8D, 0x35, 0x6D, -0x41, 0x4D, 0xAA, 0xCD, 0xA3, 0x35, 0xA3, 0x13, 0xFA, 0x70, -0x9A, 0x4A, 0x02, 0x36, 0x35, 0x48, 0x0A, 0x22, 0x04, 0xAD, -0x94, 0x50, 0xC5, 0xBA, 0xD8, 0x8E, 0x3C, 0x56, 0x1B, 0x11, -0x05, 0x74, 0x01, 0x95, 0x7D, 0xF0, 0xDA, 0xA7, 0xDB, 0x7F, -0xB1, 0x3A, 0xCE, 0x38, 0x93, 0x4E, 0x93, 0x9E, 0x99, 0x7B, -0xFE, 0xF9, 0xE7, 0xDE, 0xF3, 0x7D, 0x73, 0xCF, 0x77, 0xCE, -0xB9, 0x84, 0xD1, 0x68, 0x3A, 0x60, 0x48, 0x8B, 0x7A, 0xAE, -0xE0, 0x09, 0xF3, 0x4B, 0xEB, 0x37, 0xEC, 0x6B, 0xC0, 0xFF, -0xD9, 0x08, 0x8B, 0x45, 0x77, 0x8C, 0x27, 0x2E, 0x28, 0x8A, -0x8D, 0xFE, 0x16, 0xAE, 0xF7, 0x1F, 0x40, 0xA4, 0x56, 0xD3, -0x9E, 0x30, 0x4B, 0xFB, 0xCB, 0x3D, 0x6F, 0x55, 0xD6, 0x7E, -0x55, 0xE0, 0x46, 0xA0, 0xE2, 0x03, 0x48, 0xC7, 0x08, 0xB8, -0xF6, 0x7F, 0x25, 0x41, 0xF6, 0xBC, 0xE8, 0x9F, 0xDC, 0xBA, -0x65, 0xD8, 0xD5, 0x77, 0xA5, 0x09, 0x53, 0x93, 0x7E, 0xD4, -0x1C, 0x69, 0x43, 0x43, 0x53, 0x3D, 0xBA, 0x2E, 0xB6, 0x63, -0x77, 0xC5, 0xF2, 0xA6, 0x55, 0xDF, 0xDD, 0xF8, 0x2A, 0x41, -0xA8, 0x2F, 0x3D, 0x1C, 0xB4, 0x3D, 0x0D, 0xF3, 0x4E, 0x5F, -0x44, 0xCB, 0x5A, 0x2C, 0x3B, 0xFD, 0x8A, 0xAC, 0xAC, 0x1D, -0x79, 0x0B, 0x3B, 0x42, 0xAB, 0x61, 0x25, 0x57, 0x12, 0x53, -0x8F, 0x10, 0xE4, 0xE7, 0x99, 0x9E, 0x1A, 0x1E, 0xE6, 0x37, -0xB5, 0xB5, 0x9D, 0x83, 0x52, 0x03, 0x90, 0xFF, 0xD9, 0x08, -0xB1, 0xEB, 0x67, 0x15, 0x2D, 0xA8, 0xAE, 0xFE, 0x05, 0x5E, -0xDE, 0x90, 0x8B, 0xCC, 0x5C, 0xDD, 0xB6, 0x85, 0xB9, 0x2F, -0xBE, 0x17, 0xDE, 0x7B, 0x66, 0x07, 0x1A, 0x8C, 0x2D, 0xFA, -0xF1, 0x8F, 0xAC, 0x7B, 0x1C, 0xBF, 0xC3, 0xB3, 0x19, 0xF3, -0x19, 0x0C, 0x78, 0x0A, 0x71, 0x86, 0x57, 0x8E, 0xB1, 0x50, -0xEC, 0xD1, 0xBF, 0x91, 0xF2, 0x95, 0x57, 0x1F, 0x10, 0x7C, -0xE7, 0xE9, 0x27, 0x8A, 0xBA, 0x6D, 0x8E, 0x63, 0x87, 0x2A, -0x2F, 0x20, 0x61, 0x16, 0x30, 0x31, 0x1D, 0x04, 0x9F, 0x4B, -0x41, 0x1E, 0x01, 0x48, 0x23, 0xEE, 0x1D, 0xAA, 0x6B, 0xEC, -0x41, 0xF3, 0x9F, 0xDB, 0x20, 0x77, 0xE8, 0xA0, 0xDF, 0x59, -0xE3, 0x1C, 0x11, 0xFE, 0xE1, 0x8D, 0x91, 0xD7, 0xB6, 0x25, -0x91, 0x1D, 0x9B, 0xE9, 0x16, 0x7B, 0xBC, 0xCE, 0x0A, 0x78, -0x39, 0x62, 0x98, 0x83, 0x09, 0x17, 0x0F, 0x53, 0xFB, 0x1A, -0x82, 0xC1, 0x8C, 0xDA, 0x06, 0x5A, 0xDD, 0x79, 0x61, 0x86, -0xE0, 0xFB, 0xA5, 0xC5, 0xCF, 0xB4, 0x9D, 0xEA, 0x3E, 0xBA, -0xE3, 0xA7, 0x36, 0xA8, 0x55, 0x00, 0xC3, 0x99, 0x80, 0x54, -0x0A, 0xF0, 0x79, 0x04, 0x28, 0x3A, 0x84, 0x48, 0xB1, 0x08, -0x12, 0xED, 0x3D, 0x22, 0x3B, 0x9A, 0x51, 0x5D, 0x75, 0x14, -0xB6, 0x60, 0xDF, 0xA9, 0x38, 0x72, 0x49, 0xA5, 0xAB, 0xF5, -0xB5, 0x6F, 0xDB, 0x8E, 0x01, 0x5B, 0x9C, 0x50, 0x16, 0x00, -0x72, 0x48, 0x8F, 0x70, 0x82, 0x4B, 0x6B, 0x4E, 0x52, 0xD9, -0xCD, 0x34, 0x5E, 0xF1, 0x3A, 0x09, 0x06, 0x6F, 0x12, 0xAF, -0xEF, 0xDC, 0xBC, 0xB8, 0xA1, 0xF6, 0x93, 0x13, 0xEB, 0x36, -0x0E, 0x61, 0x76, 0x1A, 0x07, 0x23, 0x37, 0x03, 0xF0, 0x85, -0x5C, 0xA0, 0x38, 0x23, 0x88, 0x90, 0x4D, 0x43, 0x12, 0xC5, -0xE0, 0xAE, 0x64, 0x1A, 0x53, 0x8C, 0x03, 0x59, 0x6A, 0x0A, -0x34, 0x04, 0xD8, 0x74, 0xB0, 0xF2, 0x37, 0x86, 0x75, 0x6F, -0x75, 0xDE, 0xDC, 0x1F, 0xCD, 0xCF, 0xF9, 0x14, 0x8F, 0x67, -0xDD, 0x46, 0xE4, 0x3F, 0xAE, 0x8D, 0xD4, 0xAF, 0xC1, 0x87, -0xB9, 0xD0, 0x1E, 0x6D, 0xC5, 0x6C, 0xEB, 0xF6, 0xE0, 0x3C, -0x6C, 0xA1, 0xF7, 0xA2, 0x8E, 0xCA, 0xC8, 0xCC, 0xD2, 0x71, -0x99, 0x0B, 0x2F, 0x74, 0x5A, 0x5F, 0x45, 0xEB, 0x49, 0x0E, -0xE2, 0x13, 0xC6, 0xA1, 0x51, 0xCB, 0x20, 0x92, 0xAA, 0x40, -0x73, 0x14, 0xAC, 0x16, 0x34, 0xA6, 0x3C, 0x34, 0x48, 0xAF, -0x0C, 0xC3, 0x18, 0x87, 0x8A, 0x11, 0xA3, 0x7E, 0x52, 0xDE, -0x25, 0xF6, 0xE4, 0x58, 0x87, 0xAE, 0x23, 0xB7, 0xCC, 0x84, -0x4B, 0xC3, 0x8D, 0xC8, 0x22, 0x88, 0x2B, 0xCE, 0xBE, 0xE0, -0x17, 0x42, 0xFD, 0xC4, 0xC9, 0x7E, 0xDC, 0x08, 0x70, 0xA9, -0xB6, 0xD0, 0xDB, 0xEC, 0xA5, 0x03, 0xE4, 0xB4, 0xCB, 0xE7, -0xE6, 0x89, 0xD8, 0x5C, 0xD1, 0xD3, 0x38, 0x7B, 0x26, 0x84, -0x1F, 0x96, 0xDD, 0xC6, 0x73, 0xCB, 0x6F, 0xE2, 0xC7, 0x2F, -0x3B, 0x71, 0xFC, 0x30, 0x01, 0xF7, 0xB0, 0x0A, 0x31, 0x29, -0x71, 0xF0, 0xA9, 0x64, 0x38, 0x3B, 0x60, 0x86, 0xD3, 0x91, -0x8A, 0xFC, 0x11, 0xE5, 0xB2, 0x2F, 0xC4, 0x10, 0x96, 0x94, -0xE0, 0x16, 0x29, 0x42, 0x34, 0x56, 0xFB, 0x2A, 0x63, 0xE2, -0xC7, 0x4D, 0x43, 0xE2, 0x31, 0xF7, 0x67, 0x20, 0x0A, 0x11, -0xA4, 0x12, 0x59, 0x70, 0xCF, 0x8C, 0x06, 0x07, 0x0E, 0xFE, -0x56, 0x5C, 0x57, 0x57, 0xE2, 0x8E, 0xD4, 0xF4, 0xA2, 0xEA, -0xA3, 0x14, 0x10, 0x11, 0x23, 0x08, 0xF9, 0xFD, 0xC0, 0x64, -0x90, 0xDD, 0x16, 0xCD, 0xE4, 0x5E, 0xFA, 0x58, 0x08, 0x65, -0xEF, 0x2B, 0xA0, 0x5F, 0x41, 0x20, 0x65, 0x0C, 0x78, 0xB7, -0xAE, 0xD6, 0x21, 0x5C, 0x12, 0x5D, 0xBC, 0x7F, 0x7C, 0xAE, -0xA8, 0xD3, 0x85, 0xEC, 0x60, 0xE3, 0x95, 0x74, 0xA2, 0xBB, -0x71, 0x50, 0x74, 0xE1, 0x54, 0x7A, 0xD7, 0x9D, 0x8E, 0x41, -0xB3, 0x7B, 0xB4, 0x37, 0x93, 0x2D, 0xC2, 0x70, 0x2C, 0xD9, -0xDB, 0xD3, 0xCB, 0x93, 0x08, 0x29, 0x36, 0x15, 0x2C, 0x28, -0x03, 0x08, 0x69, 0x3F, 0x22, 0x04, 0x02, 0xC8, 0x23, 0x19, -0x48, 0xE3, 0xDC, 0xE0, 0xCE, 0x0A, 0xC1, 0xA5, 0x93, 0x62, -0x77, 0xA9, 0x0B, 0x6B, 0x12, 0x46, 0x51, 0xC1, 0x96, 0xCC, -0xF6, 0x64, 0x7D, 0x68, 0xAF, 0x44, 0x73, 0xBD, 0x23, 0x19, -0x77, 0x47, 0xFD, 0x83, 0x63, 0x4C, 0xD4, 0xE8, 0xF1, 0x40, -0x9E, 0xA6, 0xCB, 0x21, 0xB2, 0x75, 0xA4, 0x2B, 0x02, 0x85, -0x03, 0x32, 0x74, 0xDF, 0x2F, 0x53, 0xF2, 0xD6, 0xC8, 0xF0, -0x34, 0x48, 0x39, 0xA6, 0xBD, 0x4E, 0x48, 0x24, 0x80, 0x4C, -0x4A, 0x42, 0xAE, 0x26, 0xA0, 0x54, 0x0A, 0xA0, 0x10, 0x33, -0x50, 0x8B, 0xED, 0x88, 0xF5, 0xDE, 0x40, 0xCC, 0x7C, 0x02, -0xD2, 0x27, 0x65, 0x68, 0xF8, 0x14, 0xC8, 0x2D, 0xF1, 0xCB, -0x39, 0xBE, 0xE0, 0x5C, 0x02, 0x88, 0x8D, 0xD6, 0x90, 0x19, -0x5E, 0x8B, 0xAD, 0x4C, 0x90, 0x79, 0xC2, 0x45, 0x2F, 0xE2, -0xDE, 0xB0, 0x13, 0x1E, 0x97, 0xDA, 0x81, 0x45, 0xF7, 0x09, -0xA8, 0x5E, 0x5B, 0xB7, 0x2F, 0x25, 0x55, 0xBC, 0x93, 0xC0, -0x7C, 0x6A, 0xCA, 0x97, 0x0A, 0x95, 0xC6, 0x0B, 0xB9, 0x9C, -0x82, 0x8C, 0xED, 0x01, 0xB5, 0x8C, 0x86, 0x52, 0x4C, 0x83, -0xD1, 0x8E, 0x81, 0x2F, 0x70, 0x40, 0x1D, 0x08, 0xC1, 0x13, -0xC3, 0xEA, 0xB2, 0x68, 0xD4, 0xB7, 0xE5, 0x7C, 0x0F, 0x9F, -0x6B, 0xA1, 0x8E, 0xDB, 0xE5, 0xAF, 0x6B, 0x85, 0x97, 0x48, -0xAB, 0x5B, 0x37, 0x3A, 0xCC, 0x3D, 0xDF, 0x9D, 0x22, 0x48, -0x73, 0x15, 0x04, 0xE6, 0xE0, 0xC9, 0x0F, 0xCF, 0xDD, 0xD3, -0x60, 0xA6, 0x71, 0xB9, 0xB4, 0x38, 0x20, 0x12, 0x5D, 0xC5, -0x2C, 0x56, 0x9A, 0x84, 0x78, 0x1A, 0x26, 0x3D, 0x81, 0x54, -0x23, 0x07, 0xA9, 0x06, 0x01, 0x92, 0x13, 0x23, 0x60, 0xD6, -0x88, 0x10, 0xA7, 0x76, 0x43, 0x90, 0xD7, 0x83, 0x2C, 0xF1, -0x97, 0x80, 0x4D, 0xC9, 0x3C, 0x3F, 0xB7, 0xB5, 0x3B, 0x09, -0x1F, 0xEF, 0x98, 0x00, 0x33, 0x45, 0xE7, 0xB9, 0x6C, 0xE2, -0xCE, 0x33, 0xA5, 0xCE, 0x55, 0x42, 0x8D, 0xC7, 0x8A, 0x13, -0xF9, 0xFB, 0xE1, 0x7C, 0x90, 0xA2, 0xB0, 0x73, 0xB8, 0x02, -0x7C, 0x12, 0x03, 0x48, 0x37, 0x02, 0x89, 0x3A, 0x1A, 0x51, -0xF1, 0x14, 0x62, 0xA3, 0x42, 0x2C, 0x59, 0x10, 0x86, 0x34, -0x3E, 0x32, 0x62, 0x12, 0x91, 0xCA, 0x95, 0x40, 0x3B, 0x74, -0x1B, 0xAE, 0x95, 0x9F, 0x20, 0x67, 0xF1, 0x39, 0xFC, 0x05, -0xF5, 0xC6, 0x37, 0xF0, 0xF1, 0xDA, 0x02, 0xFC, 0xFD, 0xAF, -0x4E, 0xFC, 0xF1, 0x05, 0x7A, 0xB1, 0x6B, 0x93, 0xBF, 0xF3, -0xDA, 0x0A, 0x65, 0xFD, 0xBE, 0xBA, 0x87, 0x67, 0x11, 0x15, -0x76, 0x0A, 0x25, 0xB7, 0x84, 0x23, 0x7A, 0x4C, 0x52, 0x5C, -0xBC, 0x02, 0x2A, 0x05, 0x83, 0xD9, 0x49, 0x0C, 0x8C, 0x29, -0x0C, 0xF4, 0x7A, 0x86, 0x25, 0x24, 0x91, 0x34, 0x17, 0xC8, -0x48, 0x89, 0x84, 0xAE, 0x4F, 0x07, 0x62, 0x80, 0x0F, 0xBE, -0x86, 0x8F, 0x41, 0x85, 0x30, 0xB9, 0x49, 0x7D, 0xFC, 0xF2, -0xCF, 0xE1, 0x29, 0xB6, 0xC3, 0xD5, 0x4C, 0x52, 0xBE, 0x26, -0x3B, 0x07, 0x9B, 0xD2, 0xC7, 0x7F, 0x10, 0xBD, 0xF7, 0xFD, -0x9A, 0xCC, 0x5D, 0x15, 0x15, 0x67, 0x67, 0xCA, 0x34, 0xEC, -0xB2, 0xB2, 0x53, 0xAD, 0x5A, 0xAD, 0x3E, 0xB3, 0xA2, 0xFC, -0xD7, 0xB8, 0x73, 0xBB, 0x17, 0x0C, 0x8F, 0x06, 0x07, 0x41, -0x04, 0x43, 0x01, 0x04, 0xEE, 0xFA, 0xC3, 0xED, 0xC2, 0xF6, -0x49, 0xB8, 0xCA, 0xB8, 0x08, 0x5C, 0xA6, 0xD0, 0x77, 0xC6, -0x0A, 0x43, 0x94, 0x65, 0x60, 0xD5, 0x82, 0x83, 0x7F, 0x7A, -0xC9, 0x5C, 0x7B, 0x71, 0xBD, 0xC0, 0xFF, 0xA3, 0x41, 0xF7, -0xA2, 0xEF, 0x25, 0x8E, 0x7F, 0x9E, 0x34, 0xE9, 0xB1, 0x27, -0xC7, 0x24, 0xA8, 0x27, 0x19, 0x86, 0xFE, 0x55, 0x18, 0x9B, -0x0E, 0x3B, 0x3E, 0x47, 0x4A, 0x7F, 0xD9, 0x7F, 0x15, 0x55, -0xB5, 0xDB, 0x30, 0xE1, 0x0C, 0xC0, 0x3F, 0x1E, 0x06, 0x0E, -0x81, 0xC7, 0x13, 0xB0, 0x23, 0x83, 0x1D, 0x0F, 0x34, 0x07, -0x1C, 0x0E, 0x8F, 0x9D, 0x55, 0x62, 0xC8, 0xE4, 0x4A, 0xB4, -0x33, 0x5D, 0x78, 0xF7, 0xC8, 0x07, 0xAA, 0xF6, 0x60, 0x33, -0xAF, 0xB5, 0x66, 0x67, 0xCE, 0xE7, 0x29, 0xBA, 0x4B, 0xE7, -0x4F, 0x9F, 0xAC, 0xDB, 0xF6, 0x4E, 0x9F, 0x44, 0xA2, 0x90, -0xEC, 0xBB, 0x0F, 0xFE, 0x40, 0x03, 0x85, 0x46, 0xE5, 0xF6, -0x4E, 0x4D, 0xA3, 0xAE, 0xEA, 0x3C, 0xAA, 0x0E, 0x35, 0xA2, -0xE7, 0x5F, 0x37, 0xA1, 0x4B, 0x36, 0x62, 0xD5, 0x9A, 0xF5, -0x28, 0x59, 0x57, 0x86, 0xA2, 0xA2, 0xE7, 0x91, 0x93, 0xBD, -0xC0, 0xCB, 0xE1, 0x2A, 0x6D, 0xD7, 0xFB, 0xEF, 0x34, 0x8B, -0x7C, 0xFC, 0xC3, 0x86, 0xEC, 0xAC, 0x9A, 0xB8, 0xDD, 0xC9, -0x9B, 0x5F, 0xAC, 0x4C, 0xDB, 0x58, 0xB2, 0x45, 0x54, 0x9C, -0xF3, 0x6C, 0x7F, 0x71, 0x72, 0x62, 0xA2, 0x32, 0x52, 0xAD, -0x7E, 0xFB, 0x91, 0x57, 0xA7, 0x60, 0x49, 0xDE, 0xD6, 0x78, -0x5D, 0x42, 0x68, 0x43, 0x69, 0xE9, 0xE8, 0xA6, 0xAD, 0xDB, -0x9F, 0x2E, 0x5A, 0xBE, 0xB4, 0xB5, 0xB0, 0xF0, 0xA9, 0x90, -0x50, 0x2C, 0x0A, 0x51, 0x14, 0x11, 0x7E, 0x1A, 0x0E, 0x3D, -0x12, 0xF4, 0x4D, 0x2C, 0x3F, 0xD7, 0x12, 0x06, 0xBD, 0xB7, -0xC8, 0x99, 0xEF, 0xD7, 0x36, 0xEA, 0xE1, 0x9F, 0xB4, 0xAC, -0x39, 0x79, 0x12, 0xA1, 0xF0, 0xDA, 0x90, 0x7D, 0x84, 0x4D, -0x1E, 0x01, 0x95, 0x5A, 0x0B, 0x92, 0x2B, 0x40, 0x4E, 0xBE, -0xA5, 0x7C, 0x61, 0xC1, 0x82, 0x72, 0xE3, 0x1C, 0x73, 0xF9, -0x9B, 0xBB, 0xF6, 0xFC, 0xB3, 0xA6, 0xBA, 0xFA, 0xF2, 0xD7, -0x25, 0xD4, 0x98, 0xD3, 0xCC, 0x5B, 0x97, 0x2E, 0x5B, 0xB2, -0xCB, 0xF0, 0xB8, 0xA9, 0x41, 0x2C, 0x12, 0xB6, 0x98, 0x4C, -0xA6, 0x13, 0xA9, 0x06, 0x53, 0x9B, 0x25, 0xC7, 0xF2, 0xD9, -0xDA, 0xF5, 0xAB, 0x7F, 0xAF, 0xD0, 0x68, 0x8A, 0xBF, 0xC9, -0x8D, 0xC8, 0xFF, 0x7E, 0xE4, 0x7F, 0xB3, 0x7F, 0x03, 0x76, -0x32, 0x53, 0x09, 0x06, 0x83, 0x1F, 0x67, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x72, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x8D, 0x55, 0x07, 0x50, 0x93, 0x67, 0x18, -0x7E, 0xFE, 0x90, 0x9D, 0x90, 0xC1, 0x94, 0x00, 0x86, 0x0D, -0x91, 0x21, 0x88, 0x13, 0xB4, 0x87, 0x08, 0xB2, 0x04, 0x57, -0xD1, 0xB6, 0x6A, 0xAB, 0xC5, 0x7A, 0x36, 0xEE, 0xC3, 0xBA, -0x50, 0x1B, 0xAD, 0x4A, 0x4F, 0x3D, 0xAD, 0xD7, 0xF6, 0xB4, -0xA8, 0xD8, 0x82, 0x56, 0xAB, 0x52, 0x3D, 0xED, 0xE9, 0xA9, -0x75, 0x4F, 0xAA, 0xA2, 0xE2, 0x42, 0x2A, 0xE2, 0x88, 0x83, -0x3D, 0x84, 0x90, 0x49, 0xFA, 0x26, 0x51, 0x8F, 0xD3, 0xAB, -0xED, 0x77, 0xF7, 0xDE, 0x37, 0xFE, 0xEF, 0x7D, 0xDE, 0xF7, -0x7B, 0xDE, 0xF1, 0x33, 0x78, 0xCF, 0xB0, 0x5A, 0xAD, 0x62, -0x9A, 0x32, 0x49, 0xA2, 0x48, 0xDC, 0x48, 0x06, 0xD9, 0x8E, -0x49, 0x4E, 0x93, 0x34, 0x90, 0xDC, 0x62, 0x18, 0xE6, 0x77, -0x9A, 0x0D, 0xFF, 0x86, 0xC1, 0xBC, 0x07, 0xFC, 0x12, 0x4D, -0xFD, 0xDE, 0xE7, 0x40, 0x97, 0x71, 0x84, 0x0C, 0xA5, 0xFE, -0x2F, 0x03, 0x04, 0x3C, 0x9A, 0xA6, 0xBD, 0xAF, 0xF7, 0xCF, -0x5F, 0xD4, 0x63, 0x71, 0x9E, 0x06, 0x4A, 0x6F, 0x31, 0xAE, -0xDE, 0x06, 0xD8, 0x3C, 0x0E, 0x62, 0x55, 0x1C, 0x3C, 0x7D, -0x66, 0x82, 0x66, 0x45, 0x2E, 0xDC, 0x5D, 0x65, 0x5D, 0xD5, -0xD3, 0xC9, 0xD0, 0xE1, 0xAE, 0x07, 0x4E, 0x6F, 0x81, 0xE7, -0xD1, 0xB4, 0xC9, 0xB6, 0xAE, 0xA9, 0xA9, 0xC1, 0xA4, 0xCF, -0xBF, 0x44, 0xC1, 0xE6, 0x02, 0x2C, 0x98, 0xAB, 0x46, 0x5C, -0x62, 0x1A, 0xB2, 0x86, 0x0D, 0x46, 0xDA, 0x90, 0xFE, 0x08, -0x8B, 0x8C, 0x40, 0x40, 0xA0, 0x0F, 0x66, 0x4E, 0x5F, 0x88, -0x93, 0x27, 0xCE, 0x20, 0x31, 0x69, 0x20, 0x78, 0x5C, 0x9E, -0x4D, 0x6D, 0x9C, 0x46, 0xA3, 0x79, 0xB6, 0x6C, 0xD9, 0xB2, -0xB2, 0x77, 0x0C, 0x10, 0xF8, 0x0C, 0x9A, 0xD6, 0xD8, 0xD6, -0x5B, 0xB7, 0x15, 0x63, 0xE4, 0xA8, 0x6C, 0x14, 0x6C, 0xDC, -0x80, 0x25, 0x4B, 0xF2, 0xD0, 0x5D, 0xE9, 0x0F, 0x89, 0x54, -0x02, 0x89, 0xB3, 0x00, 0x02, 0xA9, 0x00, 0x42, 0x99, 0x04, -0x81, 0xBE, 0x0A, 0x4C, 0x98, 0x90, 0x0D, 0xD7, 0x6E, 0x1E, -0xC8, 0x1E, 0x9D, 0x03, 0x31, 0xDB, 0x05, 0x51, 0xBD, 0x42, -0x6D, 0xEA, 0x99, 0xB9, 0xB9, 0xB9, 0x15, 0xF9, 0xF9, 0xF9, -0xB7, 0xBB, 0x52, 0xC4, 0x33, 0x18, 0x0C, 0x7A, 0x2E, 0x97, -0x4B, 0xE0, 0x45, 0x98, 0x9C, 0x33, 0x07, 0xD6, 0xCE, 0x06, -0xFB, 0x87, 0x07, 0x8D, 0x80, 0xC5, 0x62, 0x73, 0xC0, 0x21, -0xFA, 0x4E, 0x87, 0x82, 0x81, 0xC2, 0xAA, 0x37, 0x03, 0xD1, -0x41, 0x80, 0x89, 0xF6, 0x51, 0xDC, 0x18, 0xFC, 0x72, 0x60, -0x1D, 0x92, 0x52, 0x07, 0x3B, 0xB8, 0xA7, 0xF1, 0xC6, 0x80, -0x5E, 0xAF, 0xBF, 0xC1, 0xE3, 0xF1, 0x6C, 0x99, 0x02, 0x3E, -0xCB, 0x89, 0x40, 0x2C, 0x68, 0xA6, 0x75, 0xFD, 0x33, 0x0B, -0xF4, 0x56, 0x3D, 0xCC, 0x66, 0x27, 0xE8, 0x4C, 0x9D, 0xB0, -0x80, 0xC4, 0x60, 0x05, 0xE1, 0xC2, 0x48, 0x7B, 0x27, 0x27, -0x16, 0x6A, 0x9B, 0x2D, 0x30, 0x4B, 0x65, 0x88, 0x0C, 0x00, -0xBE, 0xE8, 0x95, 0x8E, 0x6B, 0x95, 0x87, 0xEC, 0x06, 0x2A, -0x2A, 0x2A, 0xCE, 0xAA, 0x54, 0xAA, 0x0F, 0x58, 0xB4, 0xE6, -0x98, 0x4C, 0x06, 0x3B, 0xF8, 0x88, 0xCC, 0x4C, 0x94, 0x1C, -0xBB, 0x68, 0xBF, 0x70, 0xBC, 0xCC, 0x04, 0x4F, 0x61, 0x2B, -0x22, 0xBC, 0x45, 0x88, 0x56, 0xF2, 0x11, 0x17, 0x24, 0xC4, -0xA0, 0x20, 0x31, 0x12, 0xC2, 0x9D, 0x91, 0x44, 0x92, 0x1E, -0x2D, 0x45, 0x4A, 0xA4, 0x33, 0x26, 0x0C, 0x92, 0x20, 0xC9, -0xA5, 0x06, 0xE7, 0xAA, 0x81, 0xB0, 0x79, 0x6B, 0xB0, 0x62, -0xFA, 0x2A, 0xBB, 0xBE, 0x42, 0xA1, 0xB0, 0xA5, 0x34, 0xD8, -0x1D, 0x3A, 0xDD, 0x30, 0x8E, 0x40, 0x60, 0x3F, 0xBC, 0x70, -0xE5, 0x06, 0xF6, 0x0F, 0xE9, 0x8B, 0xE2, 0x53, 0x80, 0xAF, -0x0F, 0x07, 0xBB, 0x6E, 0x72, 0x10, 0xA7, 0xA8, 0x87, 0x8B, -0x33, 0x87, 0x68, 0x60, 0x11, 0x2D, 0x0C, 0x58, 0x5C, 0x06, -0x65, 0x4F, 0xAC, 0xF0, 0x65, 0xB5, 0xA0, 0x7F, 0x2F, 0x6F, -0xD2, 0x62, 0xD1, 0x5D, 0x4F, 0x4C, 0xE2, 0xD5, 0xE1, 0x4E, -0x78, 0x38, 0xD6, 0xAD, 0x2D, 0xC4, 0x62, 0x3A, 0x95, 0x48, -0x24, 0x28, 0x2E, 0xDE, 0x3E, 0x84, 0x69, 0x69, 0x69, 0xD9, -0x48, 0x9B, 0xA9, 0xDF, 0x6B, 0x34, 0xB8, 0x29, 0x8C, 0xC3, -0xD8, 0x89, 0x43, 0xF1, 0xE8, 0xBE, 0x83, 0x3C, 0x2E, 0x87, -0xB8, 0x26, 0xD1, 0xBE, 0x04, 0xEE, 0x69, 0x0D, 0xA8, 0xA6, -0x45, 0x5D, 0x0B, 0x7D, 0x6B, 0x6B, 0xC2, 0x96, 0x51, 0x0C, -0x12, 0x06, 0x05, 0xBD, 0xC9, 0x40, 0xC3, 0xE3, 0x0A, 0xC4, -0xED, 0x0F, 0x86, 0xB6, 0xEC, 0x3A, 0x4E, 0x8D, 0x6D, 0x86, -0x2A, 0x6D, 0x08, 0x0A, 0x0B, 0x0B, 0x35, 0x4C, 0x63, 0x63, -0xE3, 0x25, 0xB9, 0x5C, 0xDE, 0x6F, 0xD9, 0x82, 0x45, 0xE8, -0xE8, 0x97, 0x03, 0x77, 0x97, 0x40, 0xF0, 0xF8, 0x80, 0x52, -0x4E, 0x5A, 0x42, 0x60, 0xF7, 0x59, 0xE0, 0xE6, 0xB1, 0x4A, -0x78, 0x08, 0xF5, 0x18, 0x31, 0x54, 0x88, 0x9C, 0x44, 0x39, -0x78, 0x62, 0xD7, 0x57, 0xB0, 0x9D, 0x76, 0x4F, 0x5E, 0x96, -0x5D, 0x83, 0x4F, 0x76, 0x03, 0x5A, 0x33, 0x92, 0x81, 0xBF, -0xEE, 0x60, 0xFB, 0xE4, 0x87, 0x18, 0x37, 0x39, 0x1D, 0x25, -0x25, 0x25, 0x47, 0x59, 0x26, 0x93, 0xB9, 0x8F, 0xED, 0xAA, -0x88, 0xC3, 0x41, 0x83, 0xD1, 0x09, 0xFE, 0xDD, 0x01, 0x4F, -0xF2, 0xBE, 0xF8, 0x0C, 0x90, 0x35, 0xDC, 0x8C, 0x93, 0x2B, -0x0E, 0xE2, 0xFC, 0x62, 0x36, 0x8E, 0xFE, 0xE0, 0x0F, 0x75, -0x56, 0xD0, 0x2B, 0xF0, 0x1A, 0xE8, 0x9E, 0x57, 0xE3, 0xEF, -0x73, 0xF7, 0xF0, 0xE9, 0xC4, 0x4B, 0x90, 0x7C, 0xC4, 0x47, -0x6B, 0x66, 0x32, 0x38, 0x1E, 0xF4, 0xA9, 0xA9, 0x93, 0x82, -0xEA, 0x48, 0xB5, 0xD0, 0xD0, 0x30, 0x23, 0xCB, 0x68, 0x34, -0xDA, 0xA3, 0xAA, 0xB3, 0x72, 0x21, 0x15, 0x59, 0xB1, 0x8F, -0x3A, 0xCB, 0x98, 0x7C, 0x60, 0xCF, 0x0E, 0x20, 0x5E, 0x78, -0x02, 0xDA, 0xDB, 0x09, 0x10, 0x05, 0xF8, 0xD9, 0xC2, 0x05, -0xB4, 0x54, 0x41, 0x3D, 0xE3, 0x38, 0x42, 0x53, 0xEA, 0x20, -0xCA, 0xB6, 0x20, 0x64, 0x89, 0x1B, 0x8A, 0x5B, 0xFB, 0x82, -0x3D, 0xBE, 0x07, 0x5C, 0xA9, 0x6B, 0x29, 0x88, 0x4E, 0x5B, -0xC7, 0xE2, 0xB8, 0xF2, 0xED, 0x06, 0x4E, 0x9E, 0x3C, 0xC5, -0x65, 0xAA, 0xAA, 0xAA, 0xD6, 0x05, 0x04, 0x04, 0xCC, 0xD1, -0x5E, 0xDC, 0x0D, 0xDF, 0x38, 0x4A, 0xCE, 0x29, 0x53, 0x00, -0x29, 0x7D, 0xFD, 0xB3, 0x06, 0xD6, 0x73, 0xE5, 0x44, 0x53, -0x4F, 0x98, 0x9B, 0x9F, 0x83, 0xA9, 0xEF, 0x00, 0x3B, 0x92, -0x02, 0xF0, 0x41, 0x0A, 0x10, 0x68, 0xCB, 0x67, 0x40, 0x20, -0xA2, 0xD7, 0x92, 0xB0, 0x8D, 0x44, 0x16, 0xD5, 0x88, 0x3B, -0xC5, 0xBC, 0x74, 0xFD, 0x61, 0xB4, 0x1E, 0xF3, 0x81, 0xB3, -0x22, 0x12, 0xE3, 0xC7, 0x4F, 0xF8, 0x8A, 0x45, 0x55, 0x74, -0xAA, 0xF2, 0xE1, 0x53, 0xF8, 0x0C, 0x18, 0x43, 0x5A, 0x45, -0x40, 0x30, 0x95, 0x37, 0x15, 0x96, 0x20, 0xD9, 0x13, 0xF2, -0x9C, 0x1E, 0x60, 0x02, 0xDA, 0xC0, 0x99, 0xE8, 0x01, 0xF6, -0x4C, 0x4F, 0x60, 0x56, 0x0A, 0x3C, 0xA8, 0x8E, 0x7C, 0x5D, -0xE8, 0xF9, 0x24, 0xC1, 0xE4, 0xB5, 0x17, 0xF5, 0x02, 0x2F, -0x72, 0x28, 0x82, 0xC0, 0x79, 0x54, 0x20, 0xBE, 0x41, 0x0D, -0x04, 0xAE, 0xB2, 0xBF, 0x40, 0xA7, 0x6B, 0xBF, 0xCC, 0x0A, -0x0C, 0x09, 0x39, 0x60, 0x6E, 0x6B, 0xB1, 0x1F, 0x1C, 0xF9, -0x71, 0x04, 0xB0, 0xF2, 0x0F, 0xF8, 0x45, 0x02, 0x1D, 0xED, -0xA4, 0xE8, 0xDE, 0x81, 0x8D, 0x0B, 0x5F, 0xA2, 0x77, 0x00, -0xA1, 0xF4, 0xF6, 0x47, 0x2C, 0xD1, 0x6F, 0x4B, 0x4C, 0x7F, -0x77, 0xC0, 0x8F, 0xD6, 0xC1, 0x34, 0x07, 0x76, 0x23, 0x63, -0x64, 0xBB, 0x27, 0xB1, 0x58, 0x7D, 0xAB, 0x0A, 0x7B, 0xBF, -0x09, 0xB1, 0xD3, 0x59, 0x53, 0x5B, 0x87, 0x7D, 0xFB, 0xF6, -0x9D, 0xB6, 0x57, 0xF2, 0xF5, 0xEB, 0x65, 0x47, 0x24, 0x32, -0xCF, 0xA1, 0xFE, 0x4A, 0x05, 0xA2, 0x83, 0x3F, 0xC6, 0x8D, -0xAC, 0x9D, 0x40, 0x2B, 0xB5, 0x86, 0x7C, 0x7A, 0x91, 0x5B, -0x2C, 0xB6, 0x1D, 0x7A, 0x82, 0xF9, 0x97, 0x52, 0x91, 0xEC, -0x67, 0xEB, 0xA6, 0x94, 0xE3, 0x44, 0x8F, 0x88, 0x6C, 0xCA, -0x84, 0x8E, 0x54, 0xA6, 0x16, 0x85, 0xFB, 0xB5, 0x40, 0x77, -0xCB, 0x45, 0x4C, 0xCB, 0xF2, 0x22, 0x0A, 0xFC, 0x90, 0x97, -0xB7, 0xA8, 0x70, 0xD5, 0xAA, 0xFC, 0x9C, 0x37, 0xED, 0x5A, -0xAB, 0xD5, 0x5A, 0x25, 0x72, 0x09, 0x9C, 0x75, 0x8F, 0xC1, -0x1B, 0xBC, 0x87, 0x82, 0xA8, 0xC1, 0x8E, 0xD4, 0x47, 0x08, -0x17, 0x6B, 0xB1, 0xFC, 0x72, 0x18, 0x44, 0x52, 0x57, 0x74, -0x23, 0xBE, 0xC5, 0x5C, 0x0A, 0x0B, 0x81, 0x8A, 0x08, 0x9C, -0x47, 0x7D, 0x80, 0xCF, 0x75, 0xC4, 0xBF, 0xF5, 0x61, 0x25, -0x46, 0x44, 0xB5, 0xC3, 0x22, 0x0E, 0x83, 0xC9, 0x64, 0x84, -0x4C, 0x26, 0xB3, 0x63, 0xB3, 0x5E, 0x1B, 0x58, 0xB3, 0x7A, -0x75, 0x0A, 0x9B, 0x4D, 0xAE, 0xB9, 0xA9, 0x50, 0x7B, 0x70, -0x38, 0xD2, 0x8D, 0x3F, 0x63, 0xF9, 0x79, 0x25, 0x56, 0x55, -0xC5, 0xA3, 0xB7, 0xCA, 0x15, 0x89, 0x14, 0x9B, 0x70, 0x85, -0x43, 0x54, 0x24, 0x21, 0x44, 0x8F, 0xCA, 0xC7, 0x41, 0x91, -0xBC, 0xFD, 0x21, 0xE2, 0xBB, 0xBD, 0x40, 0x93, 0xD9, 0x1D, -0x42, 0xA1, 0x00, 0x11, 0x11, 0x11, 0x21, 0xEF, 0xB4, 0xEB, -0xD2, 0xD2, 0xD2, 0xAA, 0xAB, 0x57, 0x2E, 0x37, 0x25, 0x0F, -0x4D, 0x4F, 0x73, 0xF5, 0xF6, 0xC3, 0xA8, 0x18, 0x0E, 0x62, -0x70, 0x11, 0x72, 0xF2, 0x2E, 0x52, 0x49, 0xDE, 0xCB, 0x19, -0x28, 0x28, 0xB0, 0x5E, 0x12, 0xCA, 0x16, 0xFA, 0xC7, 0xC8, -0x89, 0x16, 0x73, 0x5B, 0x1D, 0x9A, 0x2A, 0xAF, 0x40, 0xCE, -0xD7, 0xC1, 0x3B, 0xB4, 0x2F, 0xA4, 0x32, 0x39, 0xA8, 0x68, -0x63, 0x6B, 0x6B, 0x6B, 0x6F, 0xBF, 0xC6, 0x7D, 0xE7, 0x8F, -0x16, 0x15, 0x15, 0xA5, 0xFA, 0x75, 0xD7, 0x6F, 0x77, 0x7C, -0x7D, 0x94, 0xD4, 0xFF, 0x39, 0xA8, 0x7B, 0x50, 0x8E, 0xEA, -0x17, 0xCD, 0xE0, 0xF2, 0xC5, 0xE0, 0xF0, 0x85, 0xF4, 0x64, -0x86, 0x3A, 0xA9, 0x11, 0xE6, 0x0E, 0x3D, 0xF8, 0x14, 0x8F, -0x10, 0x55, 0x0C, 0xCC, 0x2C, 0x06, 0xD7, 0xAE, 0x94, 0xE1, -0xF8, 0xF1, 0xA3, 0xB2, 0xA5, 0x4B, 0x35, 0x2D, 0x5D, 0xF1, -0x58, 0x6F, 0x1B, 0x28, 0x2F, 0x2F, 0xBF, 0x1B, 0xD1, 0x43, -0xC5, 0xA8, 0xA7, 0x4D, 0xFF, 0x6E, 0xD3, 0x96, 0x22, 0x54, -0x37, 0x71, 0xA1, 0x50, 0x86, 0xC2, 0xC5, 0xDD, 0x0D, 0x22, -0x2E, 0x1F, 0x22, 0x11, 0x89, 0x40, 0x08, 0x99, 0x87, 0x27, -0xDA, 0xC1, 0xC3, 0xCE, 0xDD, 0x25, 0xA6, 0xB8, 0x01, 0x03, -0xD7, 0xC6, 0xC7, 0xC7, 0x31, 0x6F, 0x83, 0xFF, 0xE7, 0x18, -0x95, 0x91, 0x20, 0xDD, 0xBB, 0x6D, 0x43, 0xD2, 0x3C, 0xF5, -0xC4, 0xF5, 0x79, 0xB3, 0xD5, 0x0D, 0x8B, 0xE7, 0xCF, 0xED, -0x9C, 0xA5, 0x56, 0x5B, 0xE6, 0xE5, 0xCE, 0xAE, 0x9B, 0x31, -0x55, 0xBD, 0xB2, 0x70, 0xCB, 0xC6, 0x78, 0xBA, 0x26, 0x78, -0x1F, 0xC6, 0x9B, 0x18, 0x14, 0x6C, 0x2D, 0x74, 0xFE, 0x69, -0xF3, 0x4A, 0xDF, 0x94, 0x81, 0x41, 0x7D, 0x8B, 0x76, 0x7E, -0x9B, 0x3A, 0x7D, 0x4A, 0x76, 0x82, 0x57, 0xC4, 0x67, 0xFD, -0xA4, 0xDD, 0x63, 0xF9, 0xBD, 0x53, 0x53, 0xEE, 0x0E, 0xEC, -0x13, 0x5D, 0x34, 0xF2, 0xC3, 0xB0, 0x3D, 0xF1, 0x03, 0x7A, -0xEC, 0xC8, 0x18, 0x9E, 0xB1, 0x27, 0x6D, 0x58, 0xFF, 0xFA, -0x98, 0x5E, 0xE1, 0xFE, 0x0B, 0x26, 0x8F, 0x4D, 0x5C, 0xF1, -0xF5, 0x9C, 0x3E, 0x9A, 0x99, 0x9F, 0xF4, 0x6C, 0x6C, 0x6C, -0x73, 0x29, 0xBD, 0x76, 0xD4, 0xDA, 0xAE, 0x13, 0x98, 0x2E, -0x5C, 0x38, 0x6B, 0xFB, 0xD1, 0xE1, 0x1F, 0xB3, 0xE8, 0x2A, -0xAD, 0x3A, 0xE2, 0xBD, 0xDD, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Log2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x27, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x8D, 0x56, 0x6B, 0x4C, 0x93, 0x67, 0x14, -0x7E, 0xBF, 0x7B, 0x5B, 0xDA, 0x3A, 0xA0, 0x08, 0x58, 0x0A, -0x72, 0x91, 0xD2, 0x5A, 0xB9, 0x0D, 0x36, 0x8D, 0xD1, 0x2C, -0x31, 0x51, 0xB6, 0x29, 0x2C, 0x46, 0x48, 0xE6, 0x74, 0x6E, -0x33, 0x0E, 0x75, 0x19, 0x6C, 0xC6, 0x0B, 0xCA, 0xD8, 0x0C, -0x33, 0xA2, 0x9B, 0xE8, 0x74, 0x93, 0xC9, 0x0F, 0x25, 0xA2, -0x6E, 0xEA, 0x44, 0x32, 0x17, 0x59, 0x14, 0xE7, 0x96, 0x99, -0xF8, 0x63, 0xEE, 0x07, 0x64, 0x13, 0x91, 0x4C, 0x28, 0x8C, -0x22, 0x17, 0xDB, 0x52, 0x5A, 0x7A, 0xFD, 0xDA, 0xEE, 0x9C, -0x52, 0x18, 0x9D, 0x5B, 0xB2, 0x93, 0x9C, 0x9C, 0xB7, 0xEF, -0xD7, 0xEF, 0x79, 0xCE, 0x7B, 0xCE, 0x79, 0xCF, 0xF9, 0x28, -0x32, 0x4B, 0xEA, 0xEB, 0xEB, 0xD5, 0x0F, 0x1E, 0x3C, 0x28, -0x77, 0x38, 0x1C, 0x8F, 0x39, 0x8E, 0x9B, 0xFD, 0x88, 0x04, -0x83, 0x41, 0x42, 0xD3, 0x34, 0xF9, 0xA7, 0xE0, 0x1E, 0x68, -0x30, 0x3A, 0x3A, 0x3A, 0xA6, 0xA5, 0xA5, 0xE5, 0xBE, 0xD1, -0x68, 0xFC, 0x76, 0xF6, 0x73, 0x76, 0xF6, 0x8F, 0x5B, 0xB7, -0x6E, 0xAD, 0x6B, 0x6B, 0x6B, 0xAB, 0x79, 0x0A, 0xE5, 0x7F, -0x8A, 0x5A, 0xAD, 0x26, 0x3B, 0x76, 0xEC, 0xA0, 0xFE, 0x93, -0x60, 0xDE, 0xBC, 0x79, 0x3A, 0xB4, 0x76, 0xBB, 0x3D, 0x40, -0x51, 0x54, 0x00, 0xBC, 0xA6, 0x02, 0x53, 0x42, 0xF9, 0x7C, -0x3E, 0xB4, 0x41, 0x5C, 0xFB, 0x41, 0xC0, 0x32, 0xA0, 0x22, -0xFE, 0x9E, 0x9C, 0x9C, 0x14, 0xB3, 0xB3, 0xB3, 0x15, 0x06, -0xC3, 0xC2, 0xA7, 0x48, 0x23, 0x08, 0x0A, 0x0B, 0x0B, 0x57, -0xA3, 0x05, 0x30, 0x3F, 0x9E, 0x1E, 0x49, 0x60, 0x1D, 0x44, -0x3C, 0x24, 0x13, 0x45, 0x31, 0xB4, 0x86, 0x67, 0x21, 0x62, -0x58, 0x13, 0xF8, 0x4F, 0x10, 0xF7, 0xED, 0xF6, 0x09, 0x7F, -0x92, 0x66, 0x3E, 0x33, 0x8D, 0x95, 0xAB, 0x8D, 0xDF, 0xDE, -0xF1, 0x70, 0xA4, 0x21, 0x82, 0xA0, 0xB8, 0xB8, 0x58, 0x8D, -0xD6, 0xED, 0x76, 0x8B, 0xF0, 0x22, 0xED, 0xF5, 0x7A, 0xC1, -0x50, 0x7E, 0x20, 0x41, 0x70, 0x3F, 0x82, 0x21, 0x21, 0x02, -0x86, 0x5F, 0xC1, 0xD3, 0x78, 0x6D, 0x36, 0x1B, 0xEF, 0xF2, -0x78, 0x5D, 0x84, 0xE6, 0xE5, 0x79, 0x99, 0x71, 0x45, 0x9B, -0xCA, 0xDF, 0x2D, 0x5F, 0xB6, 0xE2, 0xC5, 0x57, 0x34, 0x89, -0x71, 0x45, 0x11, 0x04, 0x71, 0x71, 0x71, 0x08, 0x4E, 0x20, -0xC9, 0x7E, 0x96, 0x65, 0x09, 0xBC, 0x2C, 0x22, 0x09, 0x86, -0x06, 0x41, 0xC3, 0xDE, 0x52, 0x53, 0x11, 0x0A, 0x10, 0xA7, -0x73, 0x32, 0x28, 0x93, 0x44, 0xD1, 0xE0, 0xB9, 0xE3, 0xFE, -0xEF, 0x5D, 0xE2, 0xD9, 0xC6, 0x63, 0xBE, 0xA6, 0x4B, 0xDF, -0x7D, 0x9F, 0x93, 0xFB, 0x3C, 0xA0, 0x4D, 0x92, 0xD2, 0xB5, -0x65, 0x97, 0x67, 0x08, 0x96, 0x2F, 0x5F, 0x9E, 0x8F, 0xA0, -0x83, 0x83, 0x83, 0x2E, 0xF4, 0x12, 0x88, 0x7C, 0x10, 0x16, -0xF4, 0x9E, 0x01, 0x40, 0x0C, 0x0D, 0x0A, 0xE6, 0x20, 0x20, -0xFA, 0x44, 0xE2, 0x0B, 0x78, 0x59, 0x8D, 0x26, 0xCD, 0x4B, -0x53, 0x8C, 0xE7, 0x7C, 0x73, 0x23, 0xE3, 0xB4, 0x5B, 0x12, -0x4E, 0x9F, 0xBB, 0xC8, 0xF6, 0x3C, 0xEC, 0x20, 0x27, 0x8E, -0xD5, 0x91, 0x8C, 0xCC, 0xCC, 0x7B, 0x57, 0x5A, 0xDB, 0xCE, -0xCF, 0x64, 0xFC, 0xE0, 0xC1, 0x83, 0x15, 0x5B, 0xB7, 0x6E, -0x3D, 0xDE, 0xDB, 0xDB, 0x6B, 0x81, 0xB2, 0x43, 0x2F, 0xD1, -0xDB, 0xC0, 0x54, 0x52, 0x45, 0xBF, 0xC7, 0x23, 0x12, 0x41, -0xE0, 0x28, 0x9E, 0x63, 0x18, 0x5E, 0x22, 0x63, 0x78, 0x4E, -0x66, 0xBD, 0x7B, 0xF7, 0x0E, 0xDD, 0x7A, 0xE5, 0x9C, 0xAA, -0xEE, 0xD0, 0x61, 0x59, 0x4E, 0x5E, 0x36, 0x69, 0x3C, 0xF9, -0x29, 0x19, 0x36, 0x07, 0xC8, 0xE3, 0x91, 0xD1, 0x4F, 0x1A, -0x1B, 0xBE, 0xDC, 0x83, 0xB8, 0x33, 0x85, 0x0D, 0x80, 0x2A, -0x08, 0x01, 0xC1, 0x58, 0x7B, 0x3C, 0x1E, 0x3F, 0xE6, 0x01, -0xC3, 0x81, 0x61, 0x91, 0x48, 0x64, 0x74, 0x74, 0xF4, 0x1C, -0x9E, 0x61, 0x68, 0x66, 0xCC, 0x62, 0xB7, 0xFE, 0x70, 0xFB, -0xA7, 0xEE, 0xA6, 0x33, 0x27, 0x18, 0x63, 0x77, 0x47, 0x72, -0xDB, 0x8D, 0x9B, 0x32, 0x99, 0x84, 0x26, 0x77, 0x7E, 0x6C, -0x23, 0x0F, 0xFF, 0xF8, 0x93, 0xDC, 0xBC, 0x71, 0xDB, 0x37, -0x0D, 0x1E, 0x4A, 0xD2, 0xF4, 0xA2, 0xA6, 0xA6, 0xE6, 0x72, -0x65, 0x65, 0x65, 0x69, 0x57, 0x57, 0xD7, 0x10, 0x03, 0x48, -0x82, 0x20, 0xB0, 0x70, 0x12, 0x1A, 0x4A, 0xD0, 0x3B, 0x3C, -0x3C, 0xE4, 0x75, 0x38, 0x9C, 0x1E, 0xB3, 0xD9, 0x36, 0xDA, -0xD5, 0xD5, 0x29, 0xA4, 0xA5, 0x6A, 0xB4, 0xD5, 0x1F, 0xEC, -0x57, 0x90, 0x80, 0x95, 0x7C, 0xF3, 0xF5, 0x05, 0x7F, 0xD9, -0x86, 0x0A, 0x7B, 0xD1, 0xAA, 0x15, 0x62, 0x72, 0x8A, 0xDE, -0x99, 0x97, 0xA7, 0x53, 0x6F, 0xDB, 0xB6, 0x7D, 0x26, 0xF4, -0x33, 0x65, 0x55, 0x5D, 0x5D, 0x5D, 0x0F, 0xC0, 0x73, 0x00, -0xD3, 0x21, 0x95, 0x4A, 0x05, 0x8B, 0xC5, 0xE2, 0x7A, 0xF4, -0xE8, 0xD1, 0x44, 0x5F, 0x5F, 0x9F, 0x8B, 0xE1, 0xA4, 0x16, -0xF3, 0x13, 0x8B, 0xE3, 0xC9, 0x58, 0x7F, 0xEA, 0xE6, 0x2D, -0x9B, 0xB4, 0xA5, 0xA5, 0x1B, 0x84, 0x6B, 0x97, 0x4E, 0x91, -0x92, 0x92, 0xB2, 0xC9, 0xEE, 0xFE, 0x09, 0xD3, 0xCE, 0x3D, -0x55, 0xD6, 0xB4, 0xF4, 0x4C, 0x6F, 0xF1, 0xEA, 0x95, 0x2E, -0x85, 0x32, 0x3A, 0xBE, 0xB9, 0xF9, 0xEC, 0x45, 0x80, 0x34, -0x47, 0x84, 0x48, 0xA5, 0x52, 0x69, 0x94, 0x4A, 0x25, 0x5E, -0x32, 0x4F, 0x67, 0x67, 0xE7, 0x48, 0x4F, 0x4F, 0x8F, 0x5D, -0xE0, 0x04, 0x9F, 0x4E, 0x9F, 0x3D, 0x3E, 0xD0, 0xDB, 0x2D, -0x7F, 0x26, 0x46, 0xB2, 0xA4, 0xEE, 0xD0, 0xD1, 0xC4, 0x05, -0xEA, 0x58, 0x52, 0xB6, 0x66, 0xA9, 0x6B, 0xDF, 0x81, 0x53, -0xC6, 0xD7, 0xCB, 0xF7, 0xF5, 0xEF, 0xFF, 0xB0, 0xDA, 0x95, -0xAD, 0xD7, 0xB2, 0x99, 0x19, 0xC9, 0x81, 0xE1, 0x91, 0xD1, -0x20, 0xC3, 0x50, 0x44, 0xA3, 0xD1, 0x3C, 0x3B, 0x8D, 0x3B, -0x4D, 0x20, 0x40, 0xDC, 0xA1, 0x82, 0x4C, 0xA3, 0x03, 0xFD, -0x7D, 0x56, 0x89, 0x4C, 0xCA, 0xE5, 0xE5, 0x15, 0xF8, 0x25, -0x32, 0xD9, 0xE4, 0x2F, 0x77, 0xDB, 0x33, 0xCA, 0x5E, 0x5D, -0xA7, 0x7B, 0xEB, 0x8D, 0x72, 0xF2, 0xF9, 0xE1, 0x9D, 0xA4, -0x60, 0xE9, 0xAA, 0x51, 0xA5, 0x7A, 0xF1, 0x40, 0xD3, 0x99, -0xD3, 0xCE, 0x35, 0x2F, 0xBD, 0x40, 0x79, 0xDC, 0x6E, 0xCE, -0x6A, 0xB5, 0x12, 0xAC, 0x62, 0x9E, 0xE7, 0xC9, 0xDC, 0xB9, -0x73, 0x49, 0x4C, 0x4C, 0x4C, 0x5A, 0xC4, 0x4D, 0x86, 0x26, -0x55, 0x68, 0x32, 0x99, 0x48, 0x6C, 0x6C, 0xAC, 0x45, 0xA3, -0x49, 0x99, 0x13, 0x97, 0x90, 0x34, 0xFE, 0x5B, 0xC7, 0x3D, -0x36, 0x2A, 0x4A, 0x92, 0xBF, 0x73, 0xD7, 0x7B, 0x4C, 0xE7, -0xAF, 0x3F, 0x93, 0x95, 0x9B, 0x37, 0x39, 0xF8, 0x18, 0xED, -0xC8, 0x67, 0x0D, 0x67, 0x3C, 0x39, 0xFA, 0x4C, 0xA6, 0x7F, -0xC0, 0xC8, 0x8D, 0x8D, 0x4D, 0x10, 0xCC, 0x97, 0x42, 0xA1, -0x10, 0xB1, 0xE9, 0xC1, 0x9D, 0x61, 0xE3, 0xE3, 0xE3, 0x49, -0x62, 0x62, 0xA2, 0x06, 0xA2, 0xF0, 0xF7, 0x09, 0xA0, 0xD6, -0xF5, 0x50, 0x25, 0x44, 0x15, 0xA3, 0x0A, 0xEA, 0x17, 0xE6, -0x5B, 0x6C, 0xE3, 0xA6, 0xD8, 0x82, 0x02, 0x43, 0x76, 0x4A, -0x42, 0x14, 0x53, 0xB1, 0x7D, 0x9B, 0xE7, 0xFD, 0xAA, 0xE3, -0xA6, 0xD7, 0xB6, 0xEC, 0x35, 0x9D, 0x6D, 0x3A, 0xE9, 0xCB, -0xCA, 0x48, 0x16, 0xFA, 0x8C, 0xFD, 0x6C, 0x30, 0x18, 0x02, -0x26, 0xA0, 0x94, 0x4C, 0x26, 0x63, 0x24, 0x12, 0x09, 0x38, -0x14, 0x05, 0x21, 0x62, 0x02, 0x06, 0x83, 0xA1, 0x30, 0x22, -0x44, 0x90, 0x54, 0x55, 0x56, 0x96, 0x81, 0x2C, 0xCA, 0x59, -0x64, 0xBE, 0x7E, 0xAD, 0x29, 0xF3, 0xF8, 0x91, 0xBA, 0x94, -0xDB, 0xD7, 0x5B, 0x49, 0xC5, 0xAE, 0xDA, 0xD1, 0xF9, 0xBA, -0x65, 0x83, 0x57, 0xAF, 0xB6, 0x38, 0xD7, 0xAD, 0x5D, 0xC5, -0x58, 0xC6, 0xCC, 0x52, 0x9B, 0xCD, 0x41, 0x41, 0xAE, 0x58, -0xA5, 0x52, 0x41, 0x03, 0x30, 0x2A, 0x41, 0x02, 0xC0, 0x80, -0x7B, 0x22, 0x50, 0x40, 0xE4, 0xD1, 0x83, 0x44, 0x10, 0x38, -0x9D, 0x6E, 0x83, 0x5A, 0x9D, 0xE8, 0xAD, 0xDE, 0xFD, 0x66, -0xDE, 0x85, 0xF3, 0x17, 0x94, 0xD1, 0xAA, 0x34, 0xEB, 0x80, -0x99, 0x18, 0x9B, 0xBF, 0x6A, 0x75, 0xEC, 0xDD, 0x5D, 0x49, -0x73, 0x0C, 0x25, 0x8C, 0x8C, 0x9A, 0x25, 0x2C, 0xC7, 0x12, -0x04, 0x07, 0x4F, 0x31, 0xDE, 0x14, 0x80, 0xF2, 0xA0, 0x34, -0xFC, 0x26, 0xB8, 0x87, 0x24, 0xD0, 0x0D, 0x3C, 0x3A, 0x9D, -0x4E, 0x88, 0x20, 0xC8, 0xCD, 0xCD, 0x5F, 0x7C, 0xAE, 0xE9, -0x04, 0xDF, 0xD5, 0x33, 0xE6, 0x7F, 0xFB, 0x9D, 0xBD, 0xC6, -0x3D, 0x55, 0x55, 0x96, 0x03, 0x1F, 0x7F, 0x14, 0x8C, 0x57, -0xC9, 0xF9, 0xA1, 0xA1, 0x21, 0xDE, 0xED, 0xF5, 0x72, 0xB2, -0x29, 0x20, 0x1E, 0xBC, 0xC4, 0x3B, 0xC2, 0xC9, 0xE5, 0x72, -0x06, 0x4F, 0x00, 0x1E, 0x23, 0x19, 0x0D, 0xCA, 0xE2, 0x3E, -0xE4, 0xC2, 0x89, 0x73, 0x01, 0x92, 0x9D, 0x36, 0x43, 0x20, -0x57, 0xF0, 0xA9, 0xCF, 0x2D, 0x79, 0xD9, 0x75, 0xE4, 0x68, -0xC3, 0x48, 0x59, 0xE9, 0x5A, 0x2A, 0x35, 0x35, 0x45, 0x32, -0x3E, 0x3E, 0x2E, 0x75, 0x38, 0x5C, 0x2C, 0x80, 0xB0, 0x18, -0x67, 0x00, 0xE2, 0x10, 0x0C, 0x54, 0x00, 0x22, 0x04, 0xE6, -0x41, 0x09, 0x5A, 0x0C, 0x11, 0x28, 0x9E, 0x80, 0xC3, 0xEE, -0x0A, 0xD3, 0x8D, 0x68, 0xB5, 0xDA, 0x45, 0x33, 0x04, 0x32, -0xA9, 0x9C, 0x68, 0xB3, 0xD2, 0xDD, 0xE9, 0x69, 0xC9, 0x02, -0x74, 0x52, 0xC9, 0xC4, 0xC4, 0x04, 0x0B, 0xC9, 0x0A, 0x81, -0x83, 0x67, 0xD0, 0x22, 0x18, 0x01, 0x80, 0xD0, 0x4B, 0x0E, -0x3D, 0x0D, 0x0B, 0x05, 0x8A, 0xFB, 0x04, 0xC6, 0x2B, 0x03, -0x8A, 0xC9, 0x66, 0xB1, 0xD5, 0xC0, 0xE9, 0x08, 0xDC, 0x23, -0x4D, 0x88, 0xA0, 0xB9, 0xB9, 0x39, 0x1D, 0xEB, 0x17, 0x9A, -0x9A, 0x1B, 0x80, 0xA5, 0x08, 0x80, 0xDE, 0x86, 0x8F, 0x1D, -0xB2, 0x00, 0x44, 0x87, 0x41, 0xF9, 0xF0, 0x9A, 0x43, 0x70, -0x7C, 0x06, 0xC0, 0x02, 0x37, 0x25, 0xE8, 0x0B, 0x8D, 0xFD, -0x0B, 0x81, 0x4B, 0x4A, 0x4A, 0x42, 0xB3, 0x85, 0x2E, 0x2A, -0x2A, 0xD2, 0xE3, 0x80, 0x87, 0xA6, 0xE6, 0x00, 0x0F, 0x44, -0x78, 0x11, 0xC7, 0xA5, 0x1F, 0xF7, 0xB0, 0xE7, 0xE3, 0x24, -0x83, 0x13, 0x84, 0x14, 0x05, 0x2D, 0xC4, 0x39, 0x80, 0xCF, -0xD1, 0x82, 0xE2, 0x3B, 0x21, 0x85, 0x3D, 0x11, 0x48, 0x70, -0xE2, 0x91, 0x84, 0x84, 0x84, 0xFC, 0xD0, 0x45, 0x83, 0x21, -0x53, 0x10, 0x4E, 0xF8, 0x02, 0x9C, 0x07, 0x21, 0xD6, 0xF0, -0xD7, 0xC3, 0x3F, 0xBF, 0x22, 0x00, 0x3C, 0xE2, 0xF7, 0xBF, -0x7D, 0x65, 0x4C, 0xCB, 0xFA, 0xF5, 0xEB, 0x57, 0xD6, 0xD6, -0xD6, 0x12, 0x76, 0xE3, 0xC6, 0x8D, 0x5F, 0x24, 0x25, 0x25, -0xE5, 0xC2, 0x9E, 0x0D, 0xAA, 0xC0, 0x8B, 0x71, 0x00, 0x8B, -0x17, 0x26, 0x54, 0x8A, 0xD8, 0x51, 0xB1, 0x8D, 0x23, 0x18, -0x9E, 0x08, 0xD7, 0x38, 0xD1, 0xC2, 0xF3, 0x39, 0x88, 0x2D, -0x06, 0x3F, 0x08, 0xE0, 0x16, 0xE3, 0x90, 0x0A, 0xBA, 0x5C, -0xAE, 0x00, 0x74, 0x84, 0xB8, 0xF6, 0xF6, 0xF6, 0x0E, 0x24, -0xFA, 0x0B, 0x4D, 0x2F, 0xE3, 0x89, 0x13, 0x31, 0x9B, 0x23, -0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, -0x60, 0x82 -}; - -static const unsigned char Toolbar_Open2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x89, 0x00, 0x00, 0x0B, 0x89, 0x01, -0x37, 0xC9, 0xCB, 0xAD, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, -0x4D, 0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, -0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, -0x7A, 0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, -0x00, 0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, -0xEA, 0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, -0x92, 0x5F, 0xC5, 0x46, 0x00, 0x00, 0x05, 0xD8, 0x49, 0x44, -0x41, 0x54, 0x78, 0xDA, 0xA4, 0x95, 0x6D, 0x6C, 0x95, 0x67, -0x1D, 0xC6, 0x7F, 0xCF, 0x73, 0x9E, 0x97, 0xF3, 0x7E, 0x38, -0x85, 0xC3, 0x69, 0x39, 0xD0, 0x02, 0x2D, 0x6B, 0x09, 0xD0, -0xC2, 0x4A, 0xB7, 0x8E, 0x95, 0x41, 0xC4, 0xD9, 0x68, 0x40, -0x09, 0x6C, 0x1A, 0x74, 0xCA, 0x22, 0xCA, 0x07, 0x43, 0x16, -0xCC, 0xB2, 0x8C, 0x44, 0xBF, 0x2C, 0xD1, 0xCD, 0x4D, 0x71, -0x68, 0x18, 0x3A, 0xD8, 0x8C, 0x26, 0xFB, 0xB0, 0x45, 0x40, -0x3A, 0xAC, 0x6E, 0xE0, 0x42, 0xC5, 0x8E, 0x0A, 0xA3, 0x6E, -0x65, 0x20, 0x6D, 0xE1, 0x70, 0xDA, 0x02, 0x7D, 0x39, 0x2F, -0x3D, 0x4F, 0xCF, 0x69, 0x9F, 0xF3, 0xF2, 0x9C, 0xE7, 0xDC, -0x7E, 0x9A, 0x09, 0x93, 0x81, 0xE8, 0xF5, 0xE9, 0x9F, 0x3B, -0xFF, 0x5C, 0xD7, 0x7D, 0xFD, 0x73, 0xFF, 0xEF, 0x0B, 0xEE, -0x0E, 0xFD, 0x93, 0xC2, 0x30, 0xDE, 0xDF, 0x64, 0x9A, 0x5D, -0x7F, 0x7E, 0xE1, 0x85, 0xB6, 0x47, 0xF9, 0x7F, 0xD1, 0xDF, -0xFF, 0xBB, 0x86, 0x97, 0x5F, 0xFE, 0xDE, 0x5B, 0x42, 0x08, -0x61, 0x18, 0xEF, 0x5E, 0x7F, 0xFD, 0xF5, 0x3A, 0x71, 0xF2, -0xE4, 0x0F, 0xC5, 0x99, 0x33, 0xFB, 0x44, 0x3A, 0x7D, 0x5A, -0x1C, 0x3B, 0xD6, 0xF7, 0xCD, 0xFF, 0x89, 0x78, 0xCF, 0x9E, -0xC7, 0x3F, 0x3F, 0x36, 0x36, 0x3A, 0x24, 0x3E, 0x85, 0xC3, -0x87, 0xF7, 0x8B, 0xE7, 0x9E, 0x0B, 0x88, 0xEE, 0xEE, 0x67, -0xC5, 0xA5, 0x4B, 0xAF, 0x09, 0x21, 0x3E, 0x16, 0x9D, 0x9D, -0x9D, 0x3F, 0xBA, 0x1B, 0x9F, 0xF4, 0x49, 0xB1, 0x77, 0xEF, -0x13, 0x9B, 0x36, 0x6C, 0xD8, 0xF1, 0xFB, 0xA6, 0xA6, 0xF5, -0x3A, 0x58, 0x64, 0x32, 0x49, 0x6C, 0x3B, 0x43, 0xA1, 0x90, -0xC5, 0xB2, 0x4C, 0x16, 0x2C, 0x78, 0x84, 0xF3, 0xE7, 0xDF, -0xE6, 0xEA, 0xD5, 0x5F, 0x21, 0x44, 0x90, 0xFA, 0xFA, 0x06, -0xAA, 0xAB, 0xBF, 0x44, 0x28, 0xD4, 0xA2, 0x02, 0xA5, 0x3B, -0x0A, 0x9C, 0x3B, 0x77, 0xE4, 0x4C, 0x4B, 0xCB, 0x96, 0x87, -0x84, 0xB8, 0x49, 0x2C, 0xD6, 0x47, 0xB1, 0x58, 0x00, 0x6C, -0xCA, 0xE5, 0x19, 0x2C, 0xAB, 0x4C, 0xA9, 0x54, 0x24, 0x9F, -0x4F, 0x32, 0x77, 0x6E, 0x0D, 0x92, 0xE4, 0xC1, 0x30, 0x62, -0x9C, 0x3D, 0xFB, 0x17, 0xFA, 0xFB, 0x0D, 0xFF, 0xFE, 0xFD, -0x3D, 0xD9, 0x3B, 0x39, 0x50, 0x76, 0xED, 0xDA, 0x7C, 0xA8, -0xA5, 0x65, 0xCB, 0x43, 0x5D, 0x5D, 0x2F, 0xA2, 0xEB, 0x12, -0xBA, 0xEE, 0x26, 0x9F, 0x9F, 0xC1, 0xB6, 0x4B, 0x08, 0x21, -0x50, 0x14, 0x0B, 0x87, 0xC3, 0x8D, 0x2C, 0xDB, 0x24, 0x12, -0x83, 0x08, 0x21, 0x21, 0x49, 0x25, 0xDA, 0xDA, 0x5A, 0xB1, -0xED, 0x53, 0x83, 0x40, 0xD5, 0xDD, 0x46, 0xB4, 0x7D, 0x6C, -0xEC, 0xF9, 0xDF, 0x0E, 0x0F, 0x4F, 0x62, 0x18, 0x05, 0x6C, -0xDB, 0xC6, 0xED, 0x76, 0xE3, 0xF1, 0x38, 0x51, 0x55, 0x17, -0xF9, 0x7C, 0x11, 0xDB, 0xB6, 0x91, 0x65, 0x17, 0xA6, 0x99, -0x41, 0x92, 0x14, 0x6C, 0xBB, 0x40, 0xA1, 0x30, 0x8D, 0xA6, -0xD9, 0x2C, 0x5F, 0x5E, 0x27, 0x22, 0x91, 0x67, 0xE5, 0x3B, -0x8E, 0xE8, 0xE9, 0xA7, 0x57, 0x88, 0xDD, 0xBB, 0xD7, 0xD0, -0xD5, 0x35, 0xC1, 0xB2, 0x65, 0x21, 0x8A, 0x45, 0x95, 0x1B, -0x37, 0x4C, 0xE2, 0xF1, 0x49, 0x6C, 0xBB, 0x80, 0x6D, 0x9B, -0x78, 0xBD, 0x12, 0x42, 0x48, 0x98, 0x66, 0x01, 0xAF, 0x57, -0xC3, 0x30, 0x8A, 0xE4, 0x72, 0x12, 0x4E, 0xA7, 0x8A, 0xA6, -0xA9, 0x27, 0x9E, 0x7A, 0xEA, 0xBD, 0xF6, 0xDB, 0x09, 0x38, -0x00, 0x7A, 0x7A, 0xE2, 0xE9, 0x6D, 0xDB, 0x56, 0x7C, 0x31, -0x12, 0xD1, 0x79, 0xE6, 0x99, 0xEB, 0x3C, 0xFF, 0x93, 0x3F, -0x71, 0x25, 0x2A, 0xA1, 0xA9, 0x0D, 0x64, 0xB3, 0x95, 0xF4, -0x7D, 0x6C, 0x71, 0xAA, 0x6B, 0x92, 0x92, 0xB5, 0x94, 0xD6, -0x56, 0x1F, 0xBA, 0xAE, 0xB0, 0x78, 0x71, 0x0D, 0xBA, 0x2E, -0x70, 0xBB, 0x05, 0x95, 0x95, 0xBE, 0x5A, 0xBF, 0x5F, 0x09, -0xF6, 0xF6, 0xC6, 0xDF, 0xF9, 0xCC, 0x57, 0xD4, 0xDC, 0x5C, -0x25, 0x1C, 0xDA, 0x02, 0x9A, 0x57, 0x35, 0xB1, 0xF7, 0xE7, -0xFB, 0x70, 0xE9, 0xEE, 0x5B, 0x1A, 0xB3, 0xE6, 0x14, 0x2F, -0xBD, 0xF4, 0x22, 0xFF, 0xF8, 0xA0, 0x8F, 0x5D, 0xBB, 0x16, -0xA2, 0x28, 0x0A, 0x3E, 0xDF, 0x6C, 0xD2, 0xE9, 0x61, 0x64, -0xD9, 0xC9, 0x03, 0x0F, 0xF8, 0x38, 0x7E, 0xFC, 0xFD, 0x43, -0xDB, 0xB7, 0x77, 0xEF, 0xFC, 0x0F, 0x07, 0x00, 0x63, 0xE3, -0xD3, 0xF7, 0x5F, 0xB8, 0x70, 0xB1, 0xFE, 0xB1, 0xAD, 0x8F, -0xA3, 0x2A, 0x2A, 0xA5, 0x72, 0x89, 0x82, 0x65, 0x83, 0x54, -0x06, 0x51, 0xC6, 0xA9, 0xB9, 0xF9, 0xDC, 0xFA, 0x0D, 0xAC, -0x58, 0xD9, 0xC8, 0xDE, 0x9F, 0x1D, 0x61, 0xCD, 0x9A, 0xC5, -0xA8, 0xAA, 0x1B, 0x9F, 0x6F, 0x01, 0xB9, 0x5C, 0x86, 0x64, -0x32, 0xC0, 0xBA, 0x75, 0x8D, 0xCD, 0x86, 0x71, 0x2E, 0xDC, -0xDB, 0x9B, 0xEF, 0xFC, 0xB4, 0x83, 0xB5, 0x42, 0x88, 0xD3, -0x00, 0xA3, 0x93, 0x49, 0x34, 0x40, 0x12, 0xA0, 0x6A, 0x1A, -0x0E, 0x49, 0xC2, 0x2C, 0x15, 0x70, 0x08, 0x05, 0x1C, 0x82, -0x0A, 0x7F, 0x90, 0xAB, 0xD7, 0x06, 0x79, 0xF5, 0xC0, 0xAF, -0xF9, 0xD6, 0x37, 0x9E, 0x44, 0xF7, 0xC4, 0x10, 0x22, 0x4F, -0x2A, 0x75, 0x83, 0x8A, 0x8A, 0x5A, 0x1A, 0x1A, 0x54, 0x56, -0xAF, 0xDE, 0xF8, 0x5A, 0x6F, 0x2F, 0xDF, 0xFD, 0xB7, 0xC0, -0x40, 0x6C, 0x50, 0xDC, 0xB7, 0x70, 0x09, 0x97, 0x07, 0x2F, -0x12, 0x98, 0x15, 0xC0, 0x04, 0xE6, 0xF8, 0x2A, 0x50, 0x8B, -0x65, 0x32, 0xC2, 0x44, 0x77, 0x7A, 0x31, 0xD3, 0x49, 0x24, -0x21, 0x28, 0x0A, 0x89, 0x45, 0x91, 0x1A, 0x8E, 0x76, 0x1E, -0x46, 0x2B, 0x3B, 0xB9, 0x7F, 0xD5, 0x2A, 0x64, 0x65, 0x1C, -0xCB, 0x32, 0x49, 0xA5, 0x46, 0x08, 0x85, 0xFC, 0x44, 0x22, -0x09, 0x54, 0x75, 0xC7, 0xF7, 0x4B, 0x25, 0xF6, 0x49, 0xCD, -0x9B, 0x1E, 0xFC, 0xF2, 0xF9, 0xB7, 0xFF, 0xDE, 0x31, 0x9A, -0xEA, 0x97, 0x72, 0xD3, 0x92, 0x98, 0x9C, 0x36, 0x59, 0x58, -0x5B, 0x43, 0x5F, 0xDF, 0x05, 0xDE, 0xEB, 0xE8, 0x40, 0x72, -0xBA, 0x68, 0x6E, 0x6A, 0xE4, 0xC1, 0x47, 0xD6, 0x62, 0xCE, -0x08, 0xF4, 0x7C, 0x11, 0xCF, 0x94, 0x85, 0xC7, 0x1B, 0xE4, -0xE4, 0xF9, 0x6E, 0x36, 0x7E, 0x7D, 0x33, 0xE3, 0xA3, 0x63, -0xA8, 0x9A, 0x81, 0x65, 0x19, 0x18, 0x46, 0x86, 0x40, 0xC0, -0x60, 0x72, 0xB2, 0x9B, 0xC6, 0xC6, 0x03, 0x92, 0xB2, 0xAD, -0xFD, 0xAB, 0x8F, 0x02, 0xCC, 0xF3, 0x22, 0x90, 0x9D, 0xD4, -0x86, 0x2A, 0x39, 0xD5, 0x7D, 0x9A, 0x5F, 0x1E, 0x38, 0xC4, -0xAA, 0x86, 0x26, 0x42, 0xEE, 0x20, 0xD7, 0x2E, 0x46, 0x49, -0xA5, 0xE2, 0xD4, 0x04, 0xBD, 0x4C, 0xAB, 0x82, 0x99, 0x25, -0x73, 0xC9, 0xD5, 0xBB, 0x71, 0xDB, 0x02, 0x39, 0x2B, 0x33, -0x7B, 0xCE, 0x2C, 0x64, 0xD9, 0x8F, 0xAA, 0x2E, 0xA5, 0x5C, -0xEE, 0x26, 0x16, 0xEB, 0xA3, 0xAD, 0xED, 0x15, 0x84, 0x78, -0x65, 0x9F, 0x12, 0x9E, 0x3B, 0x7B, 0x19, 0xE4, 0x18, 0x4B, -0x96, 0x91, 0x67, 0xF2, 0x84, 0x85, 0x6D, 0xFF, 0xF3, 0x7C, -0xCC, 0x11, 0x8E, 0x44, 0x68, 0x5D, 0xFB, 0x30, 0xFE, 0x80, -0x97, 0xA9, 0x91, 0x38, 0x46, 0x2E, 0xCD, 0x9B, 0x2D, 0xF3, -0x19, 0x77, 0xC8, 0x84, 0xF2, 0xD3, 0x44, 0xCE, 0x44, 0xA9, -0x1E, 0xCF, 0x41, 0x03, 0xE8, 0xB2, 0x07, 0x80, 0x81, 0x81, -0x0E, 0x42, 0xA1, 0x20, 0x6D, 0x6D, 0x7B, 0x48, 0xA7, 0x13, -0x57, 0x96, 0x2F, 0x5F, 0xF8, 0x53, 0xA5, 0x58, 0xB4, 0x64, -0x32, 0x2E, 0x3C, 0x1F, 0xD6, 0x11, 0x93, 0x6E, 0x32, 0x12, -0x4E, 0x3A, 0x46, 0xCC, 0x58, 0xFA, 0xE1, 0x95, 0xAB, 0x83, -0xD7, 0x86, 0xA2, 0x04, 0xFC, 0x41, 0xBC, 0x1E, 0x8D, 0x1A, -0x6F, 0x2D, 0x3B, 0x63, 0xAB, 0x19, 0xD2, 0xE2, 0x4C, 0x59, -0x37, 0x88, 0x67, 0x24, 0x92, 0x6A, 0x12, 0x64, 0x48, 0x4C, -0x24, 0x48, 0x4F, 0x4D, 0x52, 0x5F, 0xFF, 0x15, 0x32, 0x99, -0x2C, 0x5B, 0xB7, 0xAE, 0xDD, 0x74, 0xF4, 0x68, 0xF7, 0x1F, -0x01, 0x94, 0xDA, 0xAC, 0x3F, 0xCA, 0x65, 0xB1, 0xEE, 0x43, -0xF3, 0x14, 0x09, 0xE7, 0x0C, 0x05, 0x4B, 0xA1, 0x6A, 0x51, -0xE5, 0xF4, 0x68, 0x6C, 0x30, 0xB8, 0xB4, 0xB1, 0x15, 0x49, -0x92, 0x91, 0x72, 0x39, 0x3E, 0xC8, 0x7F, 0x44, 0xB5, 0xE4, -0xC6, 0xE3, 0x5F, 0x42, 0x61, 0x4E, 0x18, 0xB3, 0x6E, 0x1C, -0xCF, 0xF8, 0x25, 0xAC, 0x91, 0x09, 0xF4, 0x59, 0x83, 0xDC, -0x17, 0x5E, 0x4B, 0x7B, 0xFB, 0xFA, 0x8E, 0x13, 0x27, 0xFE, -0xBA, 0xF9, 0x96, 0x3D, 0x28, 0x85, 0x45, 0xD0, 0x5E, 0xEF, -0xDB, 0x3C, 0x98, 0xB8, 0x86, 0xC3, 0xAB, 0x51, 0x1A, 0x9B, -0x20, 0x30, 0xB7, 0x3A, 0x60, 0xAB, 0xA5, 0xF2, 0xF5, 0xE8, -0x88, 0x94, 0x9D, 0x4A, 0x60, 0x3B, 0x66, 0x98, 0x55, 0x3D, -0x8F, 0x81, 0xE9, 0x18, 0xCE, 0xC9, 0x21, 0xB4, 0xE9, 0x9B, -0xE4, 0xCC, 0x69, 0xBE, 0x30, 0x7B, 0x31, 0xD5, 0x8B, 0x16, -0x92, 0x48, 0x70, 0xE5, 0xC0, 0x81, 0x1F, 0x34, 0x1C, 0x3C, -0x78, 0xF8, 0x37, 0xB7, 0xDD, 0xE4, 0xA1, 0xE8, 0x80, 0xB8, -0x74, 0x73, 0x98, 0x7C, 0xEA, 0x3A, 0x66, 0xD9, 0x8B, 0xE4, -0x2A, 0x21, 0x5B, 0x1A, 0xA3, 0x89, 0x14, 0x25, 0x61, 0x11, -0xF6, 0x39, 0xA8, 0x9B, 0x57, 0x49, 0x4A, 0x73, 0x63, 0x67, -0x4A, 0x78, 0x8A, 0x05, 0xEA, 0xEA, 0x22, 0x0C, 0x5C, 0x1C, -0xE5, 0xE0, 0x1B, 0xAF, 0xEE, 0xEE, 0x38, 0xF6, 0xEE, 0x2F, -0x3E, 0xEB, 0xB3, 0x73, 0x00, 0xD4, 0x2E, 0x5B, 0x3C, 0xD1, -0xB8, 0x74, 0xC1, 0xC6, 0xB4, 0x01, 0x15, 0x73, 0xFC, 0x38, -0x1D, 0x4E, 0x3C, 0x65, 0x85, 0x80, 0xDB, 0xC5, 0x9C, 0x9A, -0xF9, 0x54, 0x05, 0xE6, 0x13, 0xF0, 0xB8, 0xA9, 0x0E, 0x55, -0xE1, 0x73, 0x57, 0xB0, 0x72, 0xD9, 0x52, 0x0E, 0x77, 0x74, -0x46, 0x9F, 0x78, 0xF2, 0xDB, 0xB3, 0x07, 0xFA, 0xA3, 0x67, -0xFF, 0xAB, 0x44, 0xBB, 0x3C, 0x70, 0xF1, 0x4D, 0x29, 0xE0, -0xFA, 0x5A, 0x32, 0x9E, 0x46, 0x96, 0x64, 0x3C, 0xB2, 0x82, -0x43, 0x72, 0xE0, 0xF2, 0xBA, 0x90, 0x9D, 0x3A, 0x2E, 0xA1, -0xE3, 0xD6, 0x15, 0x54, 0x45, 0x45, 0xD1, 0xB5, 0x3F, 0xA8, -0xAA, 0xBA, 0xE5, 0x9E, 0xF3, 0xF8, 0x9D, 0x93, 0x27, 0x1E, -0x8B, 0xC6, 0xC7, 0xC4, 0x70, 0x26, 0x29, 0x6E, 0x4C, 0xC4, -0x45, 0x36, 0x6B, 0xDC, 0x92, 0xCB, 0xB9, 0x5C, 0x4E, 0x7C, -0x74, 0xE1, 0xC2, 0x8E, 0x7B, 0xE1, 0x94, 0x6E, 0x77, 0x18, -0x8D, 0x46, 0xDB, 0x23, 0xF3, 0xE7, 0xAD, 0x73, 0x48, 0xF2, -0xCC, 0xDF, 0xBA, 0x7B, 0x7C, 0x3D, 0x3D, 0x47, 0xD6, 0x87, -0x43, 0x2B, 0x7E, 0xFC, 0x9D, 0x9D, 0x3B, 0x8F, 0xDF, 0xEB, -0xA5, 0xFF, 0x35, 0x00, 0xB6, 0xF9, 0xAF, 0x08, 0x54, 0xAA, -0xDA, 0xA9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x37, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x96, 0x6B, 0x50, 0x54, 0xE7, 0x19, -0xC7, 0x7F, 0x7B, 0x85, 0x5D, 0x60, 0x77, 0xC9, 0x02, 0x2B, -0xC2, 0x2E, 0xB8, 0xE8, 0x82, 0x5C, 0x14, 0x54, 0x94, 0xE2, -0xA5, 0xD1, 0x41, 0x11, 0x4D, 0x26, 0xE4, 0xF2, 0x21, 0x63, -0x6A, 0xA4, 0x19, 0xAB, 0x69, 0x27, 0x5E, 0xA2, 0x69, 0x4C, -0x13, 0x1D, 0x41, 0x63, 0x9B, 0x38, 0x63, 0xB5, 0x49, 0x3E, -0x34, 0x3A, 0x0D, 0x5E, 0x12, 0x23, 0x51, 0x4C, 0x68, 0x52, -0x27, 0x11, 0xE3, 0x05, 0x50, 0x58, 0x56, 0x41, 0x44, 0x05, -0x04, 0x56, 0x90, 0x3B, 0x59, 0xEE, 0x84, 0xAB, 0xB8, 0x7D, -0x77, 0xB1, 0xAD, 0x92, 0x2F, 0x6D, 0xA7, 0x7D, 0xCE, 0xFE, -0xE7, 0x79, 0xDF, 0xF3, 0x9E, 0x7D, 0xAE, 0xFF, 0xF3, 0xCC, -0x81, 0xFF, 0xB3, 0x48, 0x72, 0xBF, 0xCB, 0x8E, 0x68, 0x6A, -0x0B, 0xAE, 0xE8, 0x1D, 0xF6, 0x43, 0x29, 0x1B, 0xE1, 0x81, -0xB8, 0xFE, 0x21, 0xD2, 0x87, 0xFA, 0x81, 0x53, 0xAC, 0xC5, -0x46, 0xE2, 0xBA, 0x9C, 0xE2, 0x09, 0x09, 0xC8, 0x65, 0xAE, -0x03, 0x90, 0x29, 0x60, 0x78, 0x40, 0x46, 0x6C, 0x8C, 0x3F, -0x27, 0xB3, 0x5E, 0x5F, 0xB8, 0x6F, 0xFF, 0xB1, 0x82, 0x47, -0x1D, 0xC8, 0xF6, 0xFD, 0xF1, 0xC4, 0xAB, 0xA7, 0x4F, 0x57, -0x2D, 0x59, 0xB3, 0x26, 0x0E, 0x83, 0xBF, 0x9A, 0x50, 0xA3, -0x2F, 0x21, 0x46, 0x1D, 0x53, 0x04, 0x8C, 0xA1, 0x3A, 0x42, -0x82, 0x75, 0x84, 0x86, 0x3E, 0x5C, 0x9B, 0x74, 0x04, 0x05, -0x6B, 0x31, 0x85, 0xE8, 0x08, 0x34, 0x08, 0x04, 0xE9, 0x30, -0x04, 0xFA, 0xA2, 0x9F, 0xAC, 0xA5, 0xDB, 0xA1, 0xA6, 0xAA, -0xA2, 0x20, 0xC0, 0x5A, 0x6C, 0xFD, 0xFC, 0x31, 0x07, 0xBF, -0x58, 0xBD, 0xC1, 0xEC, 0xEB, 0xAF, 0x4F, 0x8D, 0x8F, 0xF5, -0x21, 0xC0, 0x4F, 0x29, 0xA0, 0x70, 0xC3, 0xDF, 0xA5, 0xF5, -0xE3, 0xDA, 0x5F, 0xE8, 0x80, 0x27, 0x14, 0xF8, 0x09, 0xE8, -0xC4, 0x33, 0x3E, 0x5A, 0x25, 0x6A, 0xBD, 0x12, 0x4F, 0x6F, -0x25, 0x0A, 0x0F, 0x25, 0x1E, 0x62, 0x3D, 0xD9, 0x28, 0xE3, -0xEC, 0xA9, 0x53, 0x17, 0x4A, 0xCB, 0x4B, 0xBF, 0x79, 0xD4, -0x81, 0x54, 0x21, 0x93, 0xD0, 0xD6, 0xDA, 0xEB, 0xDE, 0xB4, -0xF5, 0x83, 0xA3, 0x07, 0x9A, 0x3A, 0xA1, 0xB1, 0x03, 0xEA, -0xDA, 0xE1, 0x4E, 0x33, 0xDC, 0x6C, 0x84, 0xD2, 0x1A, 0xB8, -0x72, 0x0B, 0x2E, 0x97, 0x43, 0xB1, 0x5D, 0xE0, 0x0E, 0x14, -0xB8, 0xEE, 0x35, 0xC0, 0xB9, 0x0A, 0xB0, 0x09, 0xAD, 0xF2, -0x74, 0x3A, 0x27, 0xF6, 0x40, 0x8E, 0xB8, 0xE5, 0x21, 0x9C, -0xB8, 0x4E, 0x06, 0x87, 0x45, 0x59, 0xEF, 0x8B, 0x9A, 0x0A, -0x0C, 0x8C, 0xC2, 0x88, 0xD8, 0xFF, 0x38, 0x24, 0x30, 0x22, -0xCE, 0x04, 0x86, 0x44, 0x1F, 0x46, 0xD5, 0x70, 0xB7, 0x34, -0x1F, 0x7A, 0x7F, 0xA0, 0xA3, 0xA5, 0x0D, 0x0F, 0xA3, 0x91, -0xEE, 0x86, 0x8B, 0xA8, 0x82, 0x32, 0x88, 0xB4, 0x58, 0xEC, -0x13, 0x1D, 0x48, 0x65, 0x32, 0x27, 0x72, 0xF9, 0x03, 0x3A, -0x84, 0xD1, 0x16, 0x11, 0x75, 0xAD, 0x88, 0xBA, 0x5A, 0x44, -0x5D, 0x51, 0x0F, 0x37, 0x9A, 0xE0, 0xBA, 0x88, 0xBE, 0xAC, -0x16, 0x4A, 0x44, 0x56, 0x17, 0xAA, 0xEB, 0x38, 0xF9, 0xFE, -0xF3, 0x94, 0x7E, 0xFA, 0x0E, 0x97, 0x8E, 0x7F, 0xC8, 0xF9, -0x4F, 0x32, 0x38, 0xB3, 0x6B, 0x2D, 0x77, 0x72, 0xCE, 0x60, -0xCF, 0x79, 0x9E, 0xEB, 0x77, 0xED, 0x6F, 0x2D, 0x5A, 0xBA, -0x22, 0xE6, 0x31, 0x16, 0x35, 0xD4, 0x76, 0xA6, 0x7D, 0x53, -0xD8, 0x91, 0x39, 0x65, 0xEE, 0x54, 0x5A, 0x85, 0xB1, 0x31, -0xA5, 0x88, 0x5E, 0x44, 0x3D, 0x28, 0x1C, 0xF6, 0xF7, 0x89, -0x2C, 0xC4, 0xBA, 0x59, 0x44, 0x5E, 0x5D, 0x53, 0x89, 0x9F, -0x75, 0x27, 0x6A, 0xC5, 0x8F, 0x0C, 0xC8, 0x7D, 0xB8, 0x61, -0x2B, 0xC6, 0x5B, 0xEB, 0xCD, 0x7D, 0x91, 0xB6, 0x42, 0xE5, -0x83, 0x61, 0x92, 0x2F, 0x2F, 0xAF, 0xDB, 0xC4, 0x97, 0xD9, -0x59, 0x68, 0x34, 0xFA, 0x9C, 0xA3, 0x07, 0x0F, 0xA4, 0xBA, -0x33, 0xF0, 0x52, 0x8C, 0x51, 0xD3, 0x3F, 0x9E, 0x41, 0xD7, -0xA0, 0xA8, 0x79, 0x1D, 0x58, 0x8B, 0xE0, 0xC4, 0xD7, 0xF0, -0xE9, 0x69, 0xF8, 0x20, 0x0B, 0x8E, 0xBE, 0x6B, 0xE7, 0xC9, -0xEA, 0x1D, 0xCC, 0x48, 0x30, 0xB1, 0xE4, 0xC5, 0x5F, 0x12, -0x24, 0x18, 0x64, 0x08, 0xD0, 0x11, 0x13, 0x15, 0xCE, 0xC6, -0x2D, 0x1B, 0x09, 0x09, 0xD2, 0xD3, 0xD5, 0xD1, 0x49, 0x6E, -0xF6, 0x31, 0x3E, 0xDA, 0x9B, 0xC1, 0xDD, 0x7A, 0xFB, 0x33, -0xC7, 0x73, 0xCE, 0x6C, 0x77, 0x67, 0x30, 0xDC, 0xD9, 0x95, -0xB6, 0xEA, 0x40, 0x7B, 0xA6, 0x5C, 0x6D, 0xE1, 0xCA, 0x25, -0x68, 0xE8, 0x19, 0xE7, 0x37, 0x2E, 0x9E, 0x7B, 0x0A, 0x88, -0xDA, 0xA7, 0x4C, 0x3D, 0xC6, 0xAE, 0xD5, 0x76, 0x7E, 0xFF, -0x59, 0x23, 0xFA, 0x11, 0x03, 0xF7, 0xEC, 0x5E, 0x18, 0xC3, -0xF3, 0xD9, 0xBC, 0x65, 0x3F, 0xB6, 0xAB, 0x45, 0x4C, 0x0B, -0x9B, 0xC2, 0xC7, 0x1F, 0x1F, 0xA2, 0xFC, 0xE6, 0xCD, 0xFB, -0xD1, 0xD3, 0x2D, 0xF2, 0x05, 0x2B, 0x5F, 0xA0, 0xC4, 0x6A, -0xE5, 0xD0, 0x87, 0xFB, 0x64, 0x72, 0xA5, 0x06, 0xB2, 0x0F, -0x89, 0xF0, 0x0D, 0x8C, 0x23, 0x50, 0x40, 0x94, 0xC9, 0xDD, -0x75, 0x97, 0x13, 0xD1, 0x8B, 0xB5, 0x89, 0x7D, 0xE4, 0xD5, -0x6B, 0xE8, 0xB6, 0x37, 0xE2, 0x13, 0xDC, 0x4F, 0x5C, 0x82, -0x3F, 0x2D, 0x0E, 0x3D, 0x97, 0xAF, 0x14, 0xF0, 0xEA, 0xBA, -0xB5, 0xE4, 0xE7, 0x5F, 0x46, 0xAB, 0xD5, 0x22, 0x95, 0x38, -0x5F, 0x4F, 0x48, 0x9C, 0x5F, 0xD9, 0x5A, 0x5B, 0x9D, 0x3B, -0x26, 0xD3, 0xB0, 0xE5, 0x9D, 0x1D, 0xEB, 0xA5, 0xB8, 0x98, -0xE5, 0x31, 0x06, 0x53, 0x85, 0x31, 0x3F, 0x57, 0x4E, 0x02, -0x82, 0x41, 0x0C, 0x3F, 0x74, 0xE2, 0x62, 0x92, 0xA8, 0x73, -0xEB, 0xBD, 0x76, 0xC2, 0xCC, 0x26, 0x51, 0x54, 0x25, 0x09, -0x8B, 0x93, 0x88, 0x8E, 0x9C, 0x49, 0x79, 0x59, 0x09, 0xDB, -0xB7, 0x6F, 0x67, 0xCF, 0x9E, 0xDD, 0x44, 0x45, 0x47, 0x63, -0x32, 0x86, 0xA4, 0x6D, 0xD8, 0xB0, 0xE9, 0x5C, 0x7D, 0xED, -0xED, 0x7C, 0x5F, 0x7F, 0x1D, 0xED, 0xCD, 0x2D, 0xE1, 0x52, -0xB7, 0x11, 0xF5, 0x78, 0xC7, 0x95, 0x22, 0x11, 0xB9, 0x5C, -0xF8, 0x13, 0x90, 0x09, 0x28, 0x5C, 0xA5, 0x0A, 0x11, 0xEC, -0xEA, 0x95, 0xD0, 0xFD, 0x43, 0x2D, 0xE6, 0xA8, 0x78, 0x41, -0xE9, 0x61, 0xAA, 0x4B, 0xF2, 0xF8, 0xED, 0x9B, 0x6F, 0x50, -0x55, 0x55, 0x47, 0x6F, 0x77, 0x07, 0x16, 0x8B, 0x85, 0xD5, -0xAB, 0x5E, 0x22, 0xD0, 0x14, 0xEA, 0x9E, 0x2E, 0x46, 0xA3, -0xA9, 0x44, 0xAE, 0x50, 0x62, 0x2B, 0x2A, 0x2C, 0x11, 0x0E, -0x24, 0xEE, 0xD7, 0xC1, 0xF5, 0x53, 0xAB, 0x40, 0xEB, 0x01, -0x3A, 0x1F, 0x30, 0x1B, 0x21, 0x7A, 0x06, 0x44, 0xCE, 0x81, -0xAB, 0x03, 0x2A, 0x5A, 0x6E, 0x55, 0xA2, 0x0D, 0xD0, 0x63, -0x9E, 0x96, 0x40, 0x5E, 0x89, 0x9C, 0xBF, 0x9E, 0xCA, 0xE4, -0xB9, 0x67, 0x9F, 0xA6, 0xB4, 0xEC, 0x36, 0x29, 0x2B, 0x9F, -0xE2, 0xF0, 0x91, 0x23, 0x8C, 0x0C, 0xF4, 0xC6, 0x65, 0x67, -0x9D, 0x68, 0x93, 0xEA, 0x4C, 0x9B, 0x2A, 0x4B, 0x0A, 0x59, -0xB0, 0x24, 0x79, 0x50, 0xE2, 0x1C, 0xEA, 0x49, 0x93, 0x24, -0x36, 0x66, 0x2A, 0x67, 0x47, 0x12, 0x26, 0x8C, 0x6B, 0x45, -0x4F, 0xBC, 0x05, 0x4C, 0x01, 0xA5, 0xF4, 0x14, 0xEF, 0x22, -0x44, 0xA3, 0xE0, 0x5E, 0x47, 0x20, 0x6A, 0x4F, 0x6F, 0x54, -0xF2, 0x21, 0x96, 0x2D, 0x4D, 0xE6, 0x42, 0x6F, 0x2C, 0x29, -0x81, 0xED, 0xEC, 0xD9, 0x9C, 0xCA, 0xB6, 0x8C, 0x7D, 0xB4, -0xB6, 0x34, 0xD1, 0xD6, 0xDC, 0x4E, 0xB0, 0x39, 0x84, 0xD6, -0x11, 0x25, 0x57, 0x05, 0x5B, 0x7C, 0x94, 0x2A, 0x8E, 0x1C, -0xFA, 0x40, 0x22, 0x71, 0x76, 0x75, 0xFD, 0x4A, 0x32, 0xBF, -0xFD, 0xE0, 0xE4, 0xA7, 0x2C, 0xC4, 0x78, 0x8B, 0xD2, 0x68, -0x61, 0x59, 0x64, 0x31, 0xD6, 0xFD, 0x2B, 0x58, 0x90, 0xB4, -0x8D, 0x58, 0x73, 0x10, 0x0A, 0x9D, 0x2F, 0x59, 0x5F, 0x5F, -0x64, 0x4C, 0x33, 0x89, 0x27, 0x44, 0x39, 0xA5, 0x43, 0x2D, -0x34, 0x0D, 0xFA, 0x73, 0xA3, 0xE8, 0x7B, 0xE6, 0xC4, 0xCF, -0x21, 0x36, 0x76, 0x16, 0xB6, 0x6B, 0xD7, 0xC5, 0x7B, 0xA1, -0xA7, 0xB9, 0xBE, 0xC6, 0x35, 0x7F, 0x28, 0xBB, 0x6A, 0x3D, -0x5B, 0x66, 0x2B, 0x4A, 0x96, 0x38, 0x9D, 0xCE, 0x6D, 0xAA, -0xB9, 0xB6, 0xF7, 0x86, 0x4C, 0x11, 0xA4, 0x2E, 0xF4, 0x61, -0x55, 0xE2, 0x08, 0xA7, 0xF7, 0x26, 0x11, 0x3E, 0x65, 0x1E, -0xE9, 0x7F, 0xD8, 0xCB, 0xDC, 0x45, 0x4F, 0xB2, 0xE3, 0xED, -0xDF, 0x11, 0xE0, 0x2D, 0x23, 0xE7, 0xA2, 0x8D, 0x76, 0x31, -0x43, 0x86, 0x1C, 0x0E, 0x3C, 0x15, 0xF7, 0x09, 0x0C, 0x36, -0xD3, 0xD0, 0xD4, 0x44, 0x57, 0x67, 0x97, 0x9B, 0x00, 0xA3, -0xA3, 0x23, 0x48, 0xE4, 0x6A, 0x91, 0x41, 0x5E, 0x5F, 0x61, -0xFE, 0x79, 0x0D, 0x0F, 0x39, 0x23, 0x88, 0xE4, 0x2C, 0x86, -0x3E, 0xBD, 0xE8, 0x42, 0xEB, 0x77, 0xDF, 0x66, 0xCF, 0xFB, -0xE2, 0xCB, 0x4B, 0xB2, 0x67, 0x52, 0x96, 0x62, 0x89, 0x8A, -0x62, 0xBA, 0x68, 0xA0, 0xC1, 0x30, 0x89, 0xD6, 0xD6, 0x66, -0xFE, 0x7C, 0xF0, 0x2F, 0x94, 0xD9, 0x5B, 0x70, 0x34, 0xD9, -0x1D, 0xBE, 0x5E, 0x1A, 0x8D, 0x54, 0xE5, 0xA1, 0x0C, 0x9A, -0x6C, 0x40, 0xED, 0x1C, 0xC5, 0x1C, 0x3D, 0x9B, 0xB3, 0xE7, -0xF3, 0x28, 0xBD, 0x56, 0xB4, 0xDF, 0x7A, 0xF1, 0xDC, 0x96, -0x7F, 0x8E, 0x8A, 0x89, 0xC3, 0x29, 0x30, 0x2C, 0x22, 0xFD, -0x95, 0xDF, 0x6C, 0xDD, 0x39, 0x23, 0xD0, 0x93, 0xB8, 0xB8, -0x58, 0x32, 0x8F, 0x7E, 0xC6, 0x8C, 0xE8, 0x08, 0x16, 0x2F, -0x5C, 0xC4, 0xD1, 0x9C, 0x5C, 0xAC, 0xB6, 0x12, 0x2A, 0xCB, -0x8A, 0x5E, 0x4E, 0x7A, 0xFA, 0x85, 0xAF, 0x7A, 0x1C, 0x8E, -0xCD, 0x26, 0xA3, 0xD1, 0xD2, 0x58, 0x53, 0xDE, 0x54, 0x75, -0xA7, 0xA6, 0x48, 0x17, 0x14, 0x52, 0xF0, 0xB7, 0x2F, 0x8E, -0x3B, 0x1E, 0x9F, 0xA6, 0x13, 0xE4, 0x95, 0x75, 0xAF, 0xC9, -0x0A, 0x2F, 0x7C, 0x4B, 0xD4, 0xFA, 0x75, 0xDC, 0xBE, 0x5D, -0xC1, 0xB4, 0xF0, 0x68, 0xDA, 0xBA, 0xFA, 0x28, 0xBA, 0x69, -0x17, 0x14, 0x56, 0x71, 0xB7, 0xE2, 0x06, 0xA6, 0xD0, 0xA9, -0x75, 0x7F, 0x7A, 0x77, 0x87, 0x98, 0x54, 0xEC, 0x7E, 0xFC, -0xDF, 0x97, 0x27, 0x9A, 0xFB, 0x69, 0x06, 0x61, 0xD3, 0x23, -0xE7, 0xCC, 0x4B, 0x98, 0x6F, 0x8B, 0x88, 0x9A, 0x25, 0x9A, -0x17, 0x43, 0xC6, 0xDB, 0x6F, 0xA0, 0xF2, 0xF0, 0x26, 0x62, -0xF6, 0x2C, 0x96, 0x2F, 0x5F, 0xC9, 0xD6, 0xD7, 0xD6, 0x8F, -0x79, 0x7B, 0x79, 0x19, 0x6E, 0x95, 0x5D, 0xEB, 0xF8, 0x89, -0xB5, 0x7F, 0x57, 0xD6, 0xA4, 0xAD, 0xCD, 0x8D, 0x4F, 0x5C, -0xE4, 0x3C, 0x7C, 0x32, 0xC7, 0x99, 0xB4, 0x7C, 0x85, 0x73, -0xF1, 0xCF, 0x17, 0x3A, 0x3F, 0xFA, 0xE4, 0xB0, 0xF3, 0xA5, -0xF5, 0x5B, 0x9D, 0x46, 0x53, 0x70, 0xEA, 0x7F, 0x6D, 0xF8, -0x11, 0x91, 0x2E, 0x4B, 0x49, 0x7D, 0xF3, 0xD7, 0xDB, 0xD2, -0x87, 0x37, 0xBE, 0xB5, 0xA7, 0x3F, 0xFD, 0xFD, 0x03, 0x03, -0xBB, 0x77, 0xA5, 0xE7, 0xEF, 0x3C, 0x70, 0x70, 0x59, 0x44, -0xD4, 0x4C, 0xCB, 0xFF, 0xC2, 0x81, 0x5B, 0x66, 0xC6, 0xFF, -0x2C, 0x60, 0x71, 0x72, 0x8A, 0x79, 0x69, 0xF2, 0xCA, 0x30, -0xFE, 0xF5, 0x91, 0xF1, 0x1F, 0xC9, 0xDF, 0x01, 0x3F, 0x79, -0x56, 0x4A, 0xCF, 0x4C, 0xD6, 0xCC, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x7C, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xBD, 0x55, 0x7B, 0x50, 0x93, 0x57, 0x16, -0xFF, 0x7D, 0x79, 0x92, 0x90, 0x90, 0x87, 0x10, 0x49, 0x80, -0x00, 0xF2, 0x08, 0xE1, 0x51, 0x90, 0xD0, 0x20, 0x28, 0x09, -0xAF, 0x42, 0x11, 0x10, 0x21, 0x0A, 0x15, 0x10, 0x30, 0x0A, -0x2A, 0x10, 0x02, 0xE8, 0x22, 0xA6, 0x01, 0x4C, 0x5D, 0x94, -0x5A, 0xCA, 0x2A, 0xDB, 0x55, 0xB7, 0xB3, 0x6B, 0xAB, 0x4E, -0x15, 0x6D, 0x67, 0x5A, 0xBA, 0x75, 0x14, 0x57, 0x3B, 0xDD, -0x2D, 0x3A, 0xE2, 0x0A, 0x0A, 0x5B, 0x51, 0xB4, 0x05, 0x7C, -0x31, 0x5D, 0x05, 0x94, 0xC5, 0x1A, 0xB0, 0x9A, 0x6F, 0xBF, -0x64, 0xD7, 0x8E, 0xDB, 0xDD, 0xF6, 0x8F, 0x76, 0x67, 0x7F, -0x33, 0xF7, 0x3B, 0xE7, 0x9E, 0x7B, 0xCF, 0xEF, 0x9E, 0x73, -0xEF, 0xFD, 0xCE, 0x05, 0xFE, 0xDF, 0x50, 0x2A, 0x83, 0xD2, -0x9D, 0x38, 0x9C, 0x46, 0x4A, 0x65, 0x3C, 0xB3, 0x55, 0x55, -0x19, 0x94, 0x9F, 0x0E, 0xF4, 0x4E, 0x1B, 0x2D, 0x16, 0xB2, -0xA9, 0x6D, 0x17, 0x79, 0xE4, 0xC4, 0x31, 0xDB, 0xBB, 0x1F, -0x74, 0x54, 0x3E, 0xEF, 0x47, 0xA3, 0x11, 0xAB, 0x65, 0x73, -0x5D, 0xD7, 0x7D, 0x9F, 0x8F, 0xF6, 0x7C, 0xC7, 0xC9, 0x55, -0x42, 0xDE, 0xB9, 0x37, 0xFD, 0xC9, 0x8C, 0x75, 0xD6, 0x42, -0x10, 0xEC, 0x6F, 0x17, 0xC5, 0xC5, 0x6C, 0x75, 0x62, 0xF3, -0xEA, 0xB2, 0x74, 0x19, 0x83, 0x09, 0x61, 0x91, 0xBC, 0xA9, -0x5B, 0x8F, 0x31, 0xFC, 0xE7, 0x8B, 0x90, 0xBB, 0xBA, 0x13, -0xC5, 0xBA, 0xBC, 0x5F, 0xB3, 0x05, 0x92, 0x8F, 0x04, 0x72, -0x1F, 0x13, 0x9B, 0xCE, 0x26, 0x15, 0x8A, 0xA8, 0xDF, 0x8D, -0xCD, 0xF0, 0xF7, 0x80, 0x21, 0x24, 0xB3, 0x17, 0x27, 0xA4, -0xFF, 0xC7, 0x02, 0xA1, 0xE1, 0xE1, 0xA4, 0xA1, 0xA0, 0x00, -0xBA, 0xC5, 0x49, 0x30, 0x18, 0x0C, 0xD8, 0x62, 0xAE, 0xC7, -0xED, 0xD1, 0x09, 0xF3, 0xCC, 0xEC, 0xC3, 0xD7, 0x69, 0x4C, -0x26, 0xBE, 0xB9, 0x3F, 0x89, 0x8C, 0x44, 0x3F, 0x78, 0x85, -0x48, 0xB0, 0x40, 0x15, 0x89, 0x81, 0xFE, 0x5E, 0x70, 0x65, -0xB2, 0x2C, 0xCE, 0xFD, 0xA7, 0xCD, 0xA3, 0xED, 0x3B, 0x70, -0x6B, 0x64, 0x10, 0xAF, 0x9A, 0x8C, 0x30, 0x6D, 0x31, 0xE1, -0xF3, 0xA1, 0x07, 0x9F, 0x78, 0x0A, 0x9D, 0xE7, 0x7E, 0xB7, -0x80, 0x9B, 0xAB, 0x5B, 0x6D, 0x64, 0xEC, 0x22, 0x5C, 0xBD, -0x37, 0x86, 0x7D, 0xFB, 0xF7, 0xA3, 0xBD, 0x7D, 0x27, 0x42, -0xB4, 0x2A, 0xC8, 0x95, 0x5E, 0xD4, 0x28, 0x0B, 0x5D, 0xC7, -0x4F, 0xE2, 0x6C, 0xCF, 0x39, 0x2A, 0x45, 0x21, 0x92, 0x53, -0xD3, 0x71, 0xB4, 0xE3, 0x08, 0x95, 0xED, 0x1C, 0xDC, 0xBF, -0x7D, 0x0B, 0x98, 0xBE, 0x85, 0x86, 0xEE, 0x4B, 0x98, 0xB6, -0x3E, 0x44, 0x18, 0x1F, 0xF8, 0x72, 0xB0, 0x17, 0xE3, 0x1C, -0x16, 0x02, 0x62, 0x93, 0x0E, 0xDA, 0xB9, 0xE9, 0xF6, 0x8F, -0xD4, 0x7B, 0x5E, 0xD1, 0xE0, 0xCD, 0xB1, 0xA8, 0xDE, 0xD3, -0x7F, 0xC4, 0xD8, 0xFD, 0x47, 0x18, 0x1A, 0xEE, 0x47, 0x72, -0x74, 0x02, 0x76, 0xEF, 0xDA, 0x05, 0xA9, 0xAF, 0x02, 0x2C, -0x2E, 0x0D, 0x1B, 0x8D, 0x46, 0x48, 0x5C, 0x84, 0xE0, 0x70, -0xB9, 0x58, 0xA4, 0x89, 0xC3, 0x66, 0xB3, 0x19, 0xF3, 0xA4, -0xEE, 0x78, 0xE2, 0x15, 0x88, 0x07, 0x53, 0x5F, 0x23, 0x5E, -0xAD, 0x86, 0x66, 0x71, 0x26, 0x26, 0x1F, 0xCD, 0x60, 0xFA, -0xEA, 0x00, 0x9A, 0x5B, 0xDB, 0x7C, 0x26, 0xBF, 0x1E, 0x7B, -0xCD, 0x71, 0x90, 0xF5, 0xE6, 0xF5, 0xF3, 0x1A, 0xEA, 0x5A, -0x71, 0xAD, 0xF7, 0x22, 0xDC, 0x55, 0xF3, 0x71, 0xF7, 0xFA, -0xAC, 0x63, 0xDB, 0xDC, 0xBD, 0x7D, 0xD0, 0x7F, 0x79, 0x18, -0x77, 0xBA, 0x6E, 0xA2, 0xE3, 0x68, 0x07, 0x92, 0x13, 0x53, -0x30, 0x3E, 0x35, 0x81, 0xC9, 0xBE, 0xB3, 0xE8, 0xF8, 0xF8, -0x73, 0xB8, 0x10, 0x13, 0xB8, 0x3D, 0x72, 0x1B, 0x9B, 0x36, -0xD5, 0xC1, 0x2F, 0x38, 0x18, 0x24, 0x49, 0x3A, 0xFC, 0x08, -0x82, 0x40, 0xFD, 0xB6, 0x16, 0x6B, 0xCB, 0xA5, 0x0B, 0xFF, -0xBC, 0x29, 0xA5, 0x05, 0x15, 0xC9, 0xE5, 0x1B, 0xEB, 0xB0, -0xF7, 0xD0, 0x7B, 0x28, 0x7C, 0xFC, 0x10, 0xE9, 0x31, 0x71, -0x58, 0x5F, 0xBE, 0x1A, 0xB6, 0x59, 0x1B, 0xE4, 0x9E, 0xBE, -0x18, 0xE8, 0xEB, 0x43, 0xFE, 0x8A, 0x55, 0xE8, 0xFD, 0xCB, -0x19, 0xA8, 0xA3, 0x16, 0x20, 0x2C, 0x26, 0x01, 0xB6, 0x99, -0x07, 0x48, 0x7C, 0x39, 0x0B, 0x8A, 0xE0, 0x40, 0xF0, 0x78, -0x02, 0x7C, 0x39, 0x7C, 0x03, 0x5C, 0x27, 0x11, 0xDC, 0x02, -0x82, 0x10, 0xB4, 0x30, 0x05, 0x47, 0xF6, 0xED, 0xE5, 0x95, -0x6D, 0x2C, 0x53, 0xD0, 0xE2, 0xB4, 0x9A, 0xE8, 0xDF, 0x1F, -0x3C, 0x40, 0x0B, 0x90, 0x88, 0xD1, 0xF5, 0x59, 0x37, 0x56, -0x55, 0xD4, 0x52, 0x11, 0xD0, 0x70, 0xE3, 0xE6, 0x24, 0x18, -0x0C, 0x12, 0xDF, 0xFC, 0xED, 0x3A, 0x88, 0xD9, 0xC7, 0xF0, -0xF4, 0x54, 0x42, 0xB5, 0x20, 0x9E, 0x1A, 0x63, 0x61, 0x7C, -0x74, 0x94, 0xB2, 0x4F, 0xA0, 0xB3, 0xF3, 0x28, 0x78, 0x14, -0xA9, 0xA5, 0xC9, 0x02, 0x3F, 0x5F, 0x77, 0x44, 0xA4, 0xBE, -0x8C, 0xA7, 0x34, 0x02, 0xBB, 0x36, 0xEA, 0xB1, 0xC9, 0xBC, -0x15, 0x13, 0x13, 0xAC, 0x30, 0x86, 0x4C, 0xE9, 0x2D, 0x3F, -0x7F, 0xED, 0x32, 0x22, 0x43, 0x43, 0x70, 0xA5, 0xAF, 0xC7, -0x91, 0x62, 0xD4, 0x82, 0x85, 0xE0, 0xD3, 0xD9, 0x50, 0xA8, -0x14, 0x88, 0xC9, 0x59, 0x0E, 0x2E, 0x8F, 0x83, 0xB7, 0x36, -0x37, 0x22, 0x2F, 0x57, 0x07, 0x3A, 0xFD, 0x29, 0x06, 0x7A, -0xCE, 0x63, 0x4D, 0xAD, 0x19, 0x74, 0x5F, 0x35, 0x86, 0x7A, -0x3E, 0xC5, 0xEE, 0xB7, 0xDF, 0x46, 0x55, 0x9D, 0x09, 0x23, -0x83, 0xFD, 0xD4, 0xA1, 0x72, 0x60, 0xF5, 0xF6, 0xC7, 0xB9, -0xE3, 0x5D, 0x78, 0x62, 0xB3, 0x6A, 0x69, 0x7C, 0x26, 0xE7, -0x45, 0x67, 0x96, 0x13, 0x2E, 0x7E, 0x31, 0x02, 0xF3, 0x9B, -0xDB, 0xA1, 0x54, 0xC4, 0xE0, 0xC2, 0xB9, 0x33, 0x18, 0xA5, -0x22, 0x5F, 0x9E, 0x99, 0x06, 0x7F, 0x65, 0x04, 0x42, 0x22, -0x22, 0xC1, 0x67, 0x91, 0x90, 0xF9, 0x29, 0x41, 0x63, 0xF2, -0x21, 0x90, 0x0B, 0x91, 0xBA, 0x64, 0x29, 0x9C, 0x85, 0x7C, -0xAC, 0x5A, 0xB9, 0x14, 0xB3, 0xD6, 0x59, 0x58, 0xA7, 0xC6, -0x1D, 0xC1, 0xE5, 0x97, 0xAF, 0xC5, 0x07, 0x87, 0x0F, 0xC3, -0x8D, 0xC6, 0x04, 0x57, 0x24, 0xC8, 0xA3, 0xC9, 0x3D, 0xFD, -0x7C, 0x46, 0x86, 0xEF, 0x50, 0x7B, 0x3A, 0x05, 0x2B, 0xC9, -0x85, 0x58, 0x26, 0x06, 0x93, 0x4E, 0x3F, 0x7D, 0xBE, 0xA7, -0x8F, 0x48, 0x48, 0x5B, 0x81, 0x13, 0xEF, 0x1F, 0x40, 0xD9, -0xE2, 0xA5, 0xB8, 0xF7, 0x77, 0xFA, 0xD8, 0xC9, 0x93, 0xA7, -0x7E, 0x73, 0xEC, 0xC3, 0x13, 0xAD, 0x57, 0x2F, 0x8D, 0x7F, -0xA5, 0x4B, 0x48, 0xC2, 0x17, 0xDD, 0x9D, 0x28, 0xD5, 0x6F, -0x40, 0x7E, 0x99, 0x71, 0xAD, 0x0B, 0x93, 0x61, 0xE0, 0x0B, -0xC5, 0xF0, 0x0B, 0x0B, 0x02, 0x83, 0x4E, 0x07, 0x49, 0x3C, -0x01, 0xF1, 0x2D, 0x69, 0xC3, 0xB2, 0x92, 0xA2, 0xDF, 0x1A, -0x2C, 0x5B, 0xC8, 0xB4, 0x12, 0x3D, 0xB9, 0xC6, 0x6C, 0x26, -0x6B, 0x4D, 0x9B, 0xC9, 0xEC, 0xDC, 0x22, 0x9D, 0xE3, 0x0E, -0x33, 0x18, 0x02, 0x31, 0x4F, 0x61, 0xA3, 0xD4, 0xBF, 0x7E, -0xBF, 0x04, 0xD0, 0x21, 0xAA, 0xA0, 0x04, 0xA9, 0xC9, 0xD3, -0x6F, 0xF9, 0xEE, 0xAF, 0xE5, 0x30, 0xC8, 0x92, 0xFA, 0x26, -0x32, 0xA7, 0xB4, 0x82, 0xAC, 0x68, 0x6A, 0x24, 0x5F, 0xA9, -0xAD, 0xBB, 0x4B, 0x14, 0x54, 0x55, 0x97, 0xB8, 0x88, 0x45, -0xEF, 0x5C, 0xBF, 0x7A, 0x0D, 0x49, 0xDA, 0x38, 0x9C, 0xFE, -0xE8, 0x43, 0x9C, 0xEA, 0xEA, 0x22, 0x7E, 0xA4, 0x5C, 0xFD, -0x20, 0x22, 0xE6, 0xAB, 0xDB, 0x3C, 0xC2, 0x42, 0x6B, 0xB8, -0x42, 0x01, 0x44, 0x02, 0x17, 0x3C, 0x98, 0xB6, 0x5E, 0x40, -0x74, 0x6A, 0x56, 0xC1, 0xAA, 0xDA, 0x6A, 0x72, 0x99, 0xB1, -0x8A, 0x34, 0x98, 0x4D, 0x24, 0x4F, 0xE4, 0xE6, 0xF3, 0x53, -0xC8, 0x9F, 0x41, 0x2C, 0x97, 0x93, 0x79, 0x55, 0x35, 0xE4, -0x3A, 0xCB, 0x76, 0x32, 0x3A, 0x3B, 0xB7, 0xC1, 0x61, 0x7C, -0xA9, 0x70, 0x2D, 0xD9, 0xFC, 0xD6, 0x5E, 0xD2, 0xC3, 0x3B, -0x30, 0xF9, 0xE7, 0x90, 0x3B, 0x40, 0x40, 0xA4, 0xCD, 0xC8, -0x26, 0x4B, 0x5B, 0x76, 0x92, 0x74, 0x1A, 0x57, 0xE5, 0xB0, -0x09, 0xFD, 0x42, 0x37, 0x2D, 0xCC, 0x4C, 0xDF, 0xF3, 0xB3, -0xC9, 0xFF, 0x05, 0x06, 0x9D, 0x19, 0x1F, 0xAC, 0xD6, 0x7E, -0xEC, 0xD0, 0x5F, 0xD0, 0x24, 0x26, 0x2E, 0x4C, 0x48, 0x08, -0xE7, 0x8A, 0x9C, 0xCF, 0xA8, 0x14, 0x21, 0xBD, 0xED, 0xAD, -0x3B, 0x4A, 0x29, 0x7B, 0xDF, 0x4F, 0x25, 0x97, 0x07, 0x05, -0xFE, 0x41, 0x57, 0x6A, 0xF8, 0x8A, 0xE1, 0xCC, 0xEB, 0x67, -0xB9, 0x70, 0x2A, 0xB1, 0x6E, 0xF3, 0x2F, 0x96, 0x57, 0xBE, -0x66, 0xB1, 0x68, 0x74, 0xB9, 0x7A, 0xD3, 0x1B, 0x6D, 0x95, -0x6B, 0xD6, 0xEB, 0x3B, 0x0F, 0x1D, 0xFF, 0x93, 0xEC, 0x39, -0x1F, 0x0D, 0xD5, 0x22, 0xFE, 0x0B, 0x97, 0x48, 0x00, 0x4E, -0x1C, 0x78, 0xC2, 0x39, 0xCF, 0x0C, 0x3C, 0x01, 0x7F, 0x77, -0xED, 0x8E, 0x76, 0x73, 0xCE, 0xFA, 0xEA, 0xFC, 0x72, 0xB3, -0xB9, 0xAC, 0xB8, 0x69, 0x5B, 0x0D, 0x5A, 0xDE, 0x6C, 0x8D, -0x4F, 0x2F, 0x5A, 0x99, 0xB3, 0xD2, 0x58, 0x9D, 0xD4, 0xBC, -0x7F, 0x5F, 0x62, 0x76, 0x7E, 0x59, 0x1A, 0x35, 0x37, 0x2F, -0x25, 0x27, 0x43, 0x96, 0xBA, 0xE4, 0x95, 0x86, 0xC2, 0x2A, -0x63, 0x45, 0x4E, 0x41, 0xF1, 0x06, 0xB9, 0x3C, 0x54, 0x1F, -0x1D, 0xA7, 0x8D, 0x4A, 0x4A, 0x4C, 0x7A, 0x21, 0x50, 0x19, -0x9C, 0x99, 0x94, 0x99, 0xB6, 0x61, 0xA5, 0xF9, 0xD5, 0xD5, -0xCB, 0xD6, 0xAC, 0xAB, 0x5F, 0x51, 0xA0, 0x8F, 0x99, 0x1F, -0x11, 0x92, 0xC8, 0x60, 0x72, 0x72, 0x5A, 0x0E, 0x1E, 0x50, -0x65, 0x57, 0x94, 0x6B, 0x0D, 0x4D, 0x0D, 0x31, 0x05, 0x86, -0xAA, 0x78, 0x94, 0x54, 0xE8, 0xA5, 0x3B, 0xF6, 0xED, 0x51, -0xEF, 0x3E, 0x72, 0x28, 0x50, 0xEE, 0x1F, 0x18, 0x44, 0x91, -0xCF, 0xA3, 0x5A, 0x70, 0x46, 0x4A, 0x7A, 0x6A, 0xF7, 0x67, -0xC7, 0x3C, 0x8E, 0x0F, 0xDD, 0xF0, 0xEE, 0x1E, 0xBA, 0x22, -0xD5, 0xA8, 0x55, 0x01, 0x79, 0xAB, 0x2B, 0xB5, 0xEA, 0x58, -0x8D, 0x46, 0x1D, 0xEA, 0x13, 0xD1, 0x75, 0xF1, 0xBC, 0x6C, -0xEF, 0xE5, 0x3B, 0x5E, 0x3B, 0x0F, 0x1E, 0x90, 0xE8, 0x0A, -0x8B, 0x5F, 0xE4, 0x08, 0xE7, 0x86, 0x53, 0x7E, 0x32, 0x91, -0xC8, 0xDD, 0xBF, 0xE3, 0x54, 0x97, 0x77, 0xF3, 0x7B, 0x87, -0x83, 0x8A, 0x36, 0x98, 0xE4, 0xF6, 0xCC, 0x08, 0x9D, 0x2E, -0x57, 0xF1, 0xAB, 0xB6, 0xD7, 0x65, 0x1C, 0x17, 0x89, 0xC7, -0xD2, 0xAC, 0x74, 0xCF, 0xC2, 0xA2, 0x62, 0xA9, 0xAF, 0x3C, -0x60, 0x4E, 0x6A, 0x46, 0xA6, 0x74, 0x7E, 0x78, 0x94, 0x07, -0x35, 0xC7, 0xDE, 0xDC, 0x03, 0xFC, 0xFC, 0xC5, 0xCB, 0x73, -0x0B, 0x5D, 0x29, 0x5D, 0x62, 0x27, 0x53, 0x28, 0xC2, 0xA4, -0x76, 0xB9, 0x7D, 0xEB, 0xD6, 0x39, 0x54, 0xA9, 0x96, 0x80, -0x2B, 0xF5, 0xA4, 0xFA, 0x73, 0x9B, 0xDF, 0x68, 0x77, 0xAB, -0x31, 0x1A, 0x7D, 0x95, 0xD1, 0xB1, 0x5C, 0x7B, 0xB9, 0x26, -0x55, 0x8B, 0x42, 0xA6, 0x1A, 0x7F, 0xD9, 0xCE, 0x7E, 0x74, -0x77, 0xE4, 0x09, 0xD8, 0x5C, 0x7B, 0x51, 0xB7, 0xBF, 0x74, -0xCE, 0xEA, 0xE8, 0x38, 0xDB, 0x0C, 0x83, 0x67, 0x03, 0x47, -0x44, 0xB3, 0x98, 0xAB, 0x59, 0x8D, 0xA6, 0x46, 0x96, 0x3D, -0xA2, 0xEB, 0xDB, 0x2C, 0xB6, 0x40, 0xFF, 0x20, 0x1A, 0x5F, -0xE8, 0x44, 0xDA, 0x51, 0x53, 0x59, 0xEE, 0x4C, 0xBD, 0x01, -0xB6, 0x93, 0x9D, 0xEF, 0x13, 0x2F, 0x65, 0x2E, 0x61, 0xBB, -0x7A, 0x29, 0x6D, 0xDA, 0x94, 0xD8, 0xC7, 0x57, 0x7A, 0xCE, -0x3E, 0x7A, 0x76, 0x3E, 0xFF, 0xF6, 0xF8, 0xFF, 0x2F, 0xE0, -0x26, 0xF3, 0x11, 0xDB, 0xE5, 0x3F, 0x00, 0x43, 0xAA, 0x34, -0xCA, 0xD3, 0x4A, 0x6B, 0x34, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x2B, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x59, 0x6C, 0x5C, 0x67, 0x19, -0x86, 0x9F, 0xB3, 0xCC, 0xD9, 0x66, 0xF3, 0x8C, 0xC7, 0xF1, -0x1A, 0x3B, 0x5E, 0x43, 0xB3, 0x48, 0x4D, 0xE2, 0xB4, 0xD0, -0x26, 0x45, 0x50, 0x1C, 0x91, 0x46, 0x21, 0x95, 0x10, 0x55, -0x03, 0xC1, 0xA5, 0x51, 0x83, 0xD4, 0x8B, 0x80, 0xA0, 0x50, -0x16, 0x95, 0x0B, 0x90, 0x10, 0x12, 0x5C, 0x56, 0xC0, 0x05, -0x6D, 0x5A, 0x7A, 0x51, 0xC2, 0xA2, 0x10, 0xE2, 0xA8, 0x45, -0x89, 0x0A, 0x4D, 0xC8, 0x0D, 0x89, 0x83, 0xB3, 0x91, 0xC5, -0x4E, 0xEC, 0x38, 0xCE, 0x78, 0x3C, 0xF6, 0x78, 0xD6, 0x73, -0xCE, 0x6C, 0xE7, 0xCC, 0xCF, 0x45, 0x16, 0xB5, 0x02, 0x4A, -0x78, 0xAF, 0xFE, 0x9B, 0xEF, 0x79, 0x2F, 0xBE, 0xEF, 0x7F, -0x5F, 0x89, 0x8F, 0x56, 0xA0, 0x7F, 0xED, 0xAA, 0x9D, 0xA3, -0xA3, 0x7B, 0xD7, 0x77, 0xB7, 0x77, 0x3D, 0x19, 0x09, 0x47, -0x1E, 0x16, 0x12, 0xBE, 0x5D, 0x2C, 0x9E, 0x3D, 0x7F, 0xE9, -0xEC, 0xFB, 0x6F, 0x1C, 0x78, 0xEB, 0x5C, 0x3E, 0x53, 0x3A, -0xCA, 0xFF, 0xAB, 0xA6, 0xAE, 0x96, 0xF8, 0xB7, 0xBF, 0xF7, -0xF5, 0xB1, 0x54, 0xEA, 0xB6, 0xF8, 0x5F, 0x9A, 0xBE, 0x79, -0x5D, 0x3C, 0xB7, 0x6F, 0xF7, 0x41, 0x40, 0x7B, 0x30, 0x7A, -0x80, 0xD1, 0x9C, 0x5D, 0xB8, 0x0F, 0x68, 0x08, 0x4F, 0x94, -0x5D, 0x47, 0xD8, 0x65, 0x57, 0x94, 0x1D, 0x57, 0xD8, 0x65, -0x57, 0x54, 0xAA, 0x8E, 0x28, 0x57, 0xAA, 0x1F, 0x32, 0x9A, -0x9C, 0x9D, 0x12, 0xC0, 0xE7, 0x3E, 0x92, 0xDD, 0x3B, 0xD4, -0xF7, 0xF3, 0x7B, 0x03, 0x79, 0xA7, 0x24, 0xB2, 0x85, 0x65, -0x51, 0x2A, 0x14, 0x85, 0x6D, 0xDB, 0xA2, 0x58, 0x2E, 0x09, -0xDB, 0x71, 0x84, 0xED, 0x3A, 0xC2, 0x71, 0x1D, 0x51, 0x72, -0x4A, 0xC2, 0xB6, 0x8B, 0xA2, 0x58, 0xCA, 0x8B, 0x72, 0xAD, -0x7C, 0xDF, 0x48, 0x0F, 0x6B, 0x2F, 0x7F, 0x90, 0x29, 0xDD, -0x7B, 0xF4, 0xAD, 0xEB, 0xFD, 0xFE, 0x8D, 0x8B, 0xD3, 0x3F, -0x06, 0x98, 0x4B, 0xCF, 0x61, 0x98, 0x61, 0x2A, 0x55, 0x13, -0x8A, 0x3A, 0x9E, 0x0F, 0x7E, 0x15, 0xF4, 0x60, 0x15, 0x2B, -0xE6, 0x50, 0xB3, 0x83, 0x38, 0x35, 0x9D, 0x40, 0x00, 0x54, -0x1F, 0x84, 0x5E, 0x43, 0x0D, 0xE4, 0x68, 0x6B, 0x69, 0x05, -0x40, 0x0B, 0x4A, 0x5F, 0xAC, 0xBB, 0xFC, 0x06, 0x40, 0xBE, -0xCB, 0xEF, 0xBF, 0x07, 0x9F, 0x9A, 0x9A, 0x42, 0x57, 0x55, -0x84, 0x5F, 0x26, 0xBD, 0xA0, 0x53, 0xE8, 0x07, 0x7F, 0x08, -0x66, 0xD6, 0x83, 0xB3, 0xA0, 0xE3, 0xFB, 0x75, 0x66, 0xA6, -0x75, 0xFE, 0xA8, 0x42, 0xA6, 0x1B, 0x8E, 0xE4, 0xAB, 0xB8, -0x8B, 0x1A, 0x8A, 0x0A, 0x73, 0xC9, 0x9B, 0x00, 0xA4, 0xE7, -0x53, 0x6F, 0x03, 0xA1, 0xFB, 0x06, 0xBF, 0x3E, 0x72, 0xE0, -0x38, 0xC0, 0xD5, 0xE4, 0x3F, 0x89, 0x44, 0x34, 0x5C, 0xA7, -0x8A, 0x63, 0x57, 0xF1, 0x0A, 0x10, 0x01, 0x06, 0x80, 0x11, -0x20, 0x9B, 0x83, 0x6C, 0xC5, 0xA5, 0xA9, 0x1B, 0x96, 0xE6, -0x3C, 0x36, 0x01, 0x2F, 0x6E, 0xD0, 0x59, 0x4A, 0x41, 0xD9, -0x76, 0x69, 0xC8, 0x30, 0x73, 0x6B, 0x92, 0x58, 0xB4, 0x8D, -0x1F, 0xFD, 0xEC, 0x95, 0x77, 0xEE, 0x18, 0x0C, 0x05, 0xDA, -0x47, 0x77, 0x3E, 0xDF, 0x5B, 0x6B, 0x64, 0x31, 0x7C, 0x1D, -0xA7, 0x56, 0x03, 0xA9, 0x4C, 0xAD, 0x56, 0xE3, 0xD6, 0x19, -0x98, 0xF2, 0x60, 0xDA, 0x85, 0x53, 0x75, 0x78, 0x7A, 0xF7, -0x6F, 0x79, 0xEB, 0xF5, 0x5F, 0xFE, 0x65, 0xE7, 0xDA, 0xA3, -0x54, 0x0A, 0x0E, 0x29, 0xE0, 0x4A, 0x0E, 0x92, 0x2E, 0x14, -0x24, 0x1F, 0x47, 0x80, 0x5D, 0xF1, 0x28, 0x65, 0x8A, 0xEC, -0xDF, 0xF3, 0xF2, 0xD6, 0x50, 0x34, 0x10, 0x53, 0xBF, 0xFC, -0xAD, 0xD1, 0x51, 0x00, 0x47, 0x5E, 0x64, 0x65, 0xA7, 0x41, -0xCD, 0xF5, 0xC9, 0xE6, 0xC1, 0xAD, 0x16, 0x31, 0x87, 0xE0, -0xEC, 0x0D, 0x68, 0x24, 0xE0, 0x72, 0x1A, 0xCC, 0x40, 0x90, -0x9E, 0x78, 0xF7, 0x7C, 0x2C, 0x64, 0x51, 0x2D, 0x39, 0x9C, -0xCE, 0x46, 0x59, 0xB6, 0xA1, 0x7A, 0x08, 0x64, 0xEB, 0x3A, -0x46, 0xA5, 0x01, 0x01, 0x8B, 0xDB, 0xD1, 0x1C, 0x0F, 0x6D, -0x7D, 0x9C, 0xE7, 0xF7, 0xEC, 0xF9, 0x92, 0x3A, 0xD2, 0xFA, -0xE8, 0x00, 0x40, 0x2C, 0xEB, 0x83, 0x24, 0x30, 0x3D, 0x85, -0x4E, 0x23, 0x4E, 0xA7, 0xD1, 0xCA, 0x1A, 0x07, 0xFE, 0xBC, -0x08, 0xA6, 0x01, 0xD7, 0x96, 0x60, 0xD7, 0x86, 0x0D, 0x24, -0xDA, 0xDD, 0xC8, 0xC7, 0x37, 0xAD, 0x26, 0x6B, 0x7B, 0x1C, -0x9F, 0x87, 0x5C, 0x01, 0x92, 0x67, 0xC6, 0xB1, 0x5F, 0x9C, -0x27, 0xB3, 0x31, 0x86, 0xD3, 0x2A, 0x50, 0xF0, 0xE9, 0xE4, -0x14, 0x03, 0xCF, 0x3E, 0xDA, 0xA3, 0xB6, 0x87, 0x57, 0x8C, -0x80, 0x83, 0xE3, 0x68, 0x48, 0xB2, 0x8E, 0x25, 0x2B, 0x64, -0x8B, 0x79, 0x82, 0x05, 0x8D, 0xF4, 0x4B, 0x51, 0xC2, 0xBF, -0x50, 0x58, 0xAE, 0x41, 0x5A, 0x82, 0x42, 0xFE, 0x14, 0xAF, -0x7E, 0xE1, 0xD9, 0x5D, 0x8F, 0xB5, 0x9C, 0x14, 0x9D, 0xBB, -0x57, 0x73, 0x71, 0x11, 0x5C, 0x17, 0xC6, 0x27, 0x87, 0x49, -0x94, 0x1B, 0x98, 0x76, 0x89, 0xC4, 0x0D, 0x9B, 0xB6, 0x85, -0x2A, 0xAB, 0xCC, 0x02, 0xE9, 0xCB, 0x85, 0xCF, 0xA8, 0xF5, -0xAA, 0x12, 0x9A, 0x2A, 0x14, 0x59, 0x12, 0x65, 0xF4, 0xBC, -0x47, 0x66, 0x21, 0x4F, 0xD6, 0x4E, 0xD3, 0x11, 0x59, 0xC5, -0x9B, 0x7E, 0x83, 0xD4, 0x65, 0x98, 0x35, 0x15, 0xAE, 0x4E, -0xC1, 0x93, 0x77, 0x4F, 0x2E, 0x1F, 0x4C, 0xB2, 0x32, 0xD5, -0xC9, 0xC9, 0x85, 0x15, 0xE0, 0x78, 0xBC, 0xF0, 0xBE, 0xCA, -0xE6, 0xCF, 0x2E, 0xD3, 0x10, 0x75, 0x34, 0xBB, 0x4E, 0xA3, -0xE2, 0xE3, 0x87, 0x3D, 0x9C, 0xA2, 0x58, 0xAD, 0xC6, 0x2C, -0xA5, 0x38, 0xE8, 0xB7, 0x37, 0x0F, 0x8E, 0x47, 0xA1, 0x6E, -0x41, 0x08, 0xCA, 0x31, 0x98, 0x32, 0xF2, 0x44, 0xD7, 0x06, -0x78, 0xF3, 0x4F, 0x97, 0x61, 0xCB, 0x1A, 0xA8, 0x81, 0x21, -0x37, 0xF3, 0xC3, 0x57, 0xBE, 0xF3, 0xC8, 0xF8, 0xEB, 0xEB, -0x31, 0x4C, 0x19, 0x04, 0xE0, 0x29, 0xAC, 0x11, 0x10, 0x8E, -0x6F, 0x21, 0xAB, 0x97, 0x58, 0x08, 0xB9, 0x94, 0x4C, 0x07, -0x6D, 0x85, 0x45, 0x3D, 0x5A, 0xB8, 0xAC, 0xAA, 0xE3, 0x99, -0xF7, 0x10, 0xBC, 0x90, 0x56, 0xA7, 0x99, 0x89, 0x15, 0xB9, -0x59, 0x4F, 0xB2, 0xBC, 0x9C, 0xC2, 0xF5, 0xEA, 0x5C, 0x95, -0xBF, 0x42, 0x68, 0xA0, 0x1D, 0x3B, 0x0C, 0x28, 0xD0, 0x17, -0xDE, 0xC0, 0xB6, 0xA7, 0xC2, 0xAF, 0x56, 0x92, 0x61, 0xE6, -0x0D, 0x0D, 0x2A, 0x40, 0xA7, 0xC4, 0xB9, 0x03, 0xF0, 0xCC, -0x13, 0x79, 0xCC, 0x48, 0x94, 0x98, 0xD3, 0x20, 0xEF, 0xE5, -0x31, 0xE5, 0x06, 0x37, 0xAE, 0x2D, 0x1E, 0x57, 0x0F, 0xCD, -0x9D, 0xBC, 0x9A, 0xD9, 0xD1, 0xC9, 0x78, 0x61, 0x82, 0x60, -0x5E, 0x27, 0x84, 0x46, 0x58, 0xED, 0xA6, 0x25, 0x0A, 0xDA, -0x7B, 0x36, 0x91, 0x6F, 0x74, 0x60, 0xDF, 0xFD, 0x8E, 0x33, -0x17, 0xA7, 0x99, 0xBC, 0x78, 0xE1, 0xFC, 0xB1, 0x23, 0xB9, -0xCD, 0xBD, 0x9B, 0xD6, 0xDE, 0x49, 0x01, 0x1B, 0x2E, 0xE4, -0x32, 0x7C, 0x2A, 0x7F, 0x1A, 0xA9, 0xA2, 0xE2, 0x35, 0xB7, -0x53, 0x4B, 0x24, 0x08, 0xC7, 0x5B, 0x29, 0x5D, 0x99, 0x9D, -0x95, 0xFF, 0x76, 0x2D, 0xF9, 0x36, 0x85, 0x2A, 0x6B, 0xF5, -0x01, 0x56, 0x4A, 0x6D, 0xB4, 0x18, 0xDD, 0x84, 0xCC, 0x32, -0x52, 0x7A, 0x9E, 0x39, 0xE2, 0x34, 0x85, 0x7C, 0x06, 0x43, -0xD0, 0x64, 0xC2, 0xA9, 0x7C, 0x86, 0x64, 0x29, 0xB9, 0xDD, -0xB5, 0x0D, 0xA9, 0x6C, 0xA9, 0x60, 0x41, 0x40, 0x13, 0x78, -0xDD, 0x3A, 0x4A, 0xA0, 0x81, 0x25, 0x14, 0x9A, 0x92, 0x93, -0xF4, 0xCC, 0xFE, 0x03, 0xF9, 0xD2, 0x04, 0xF3, 0x37, 0x6F, -0x1F, 0x94, 0x4F, 0xBD, 0xFB, 0x6E, 0x6A, 0xF6, 0xEC, 0x95, -0xF3, 0xFD, 0x5D, 0x3D, 0xA0, 0x68, 0xF8, 0x46, 0x09, 0x3D, -0x5B, 0xA2, 0xA8, 0xB7, 0xF1, 0xF0, 0x1A, 0x8D, 0x4F, 0x76, -0x08, 0xB6, 0xF7, 0xC0, 0x70, 0xB8, 0x42, 0x8C, 0xD5, 0xA8, -0xAD, 0x2B, 0xBB, 0x3E, 0xD1, 0x36, 0x44, 0x47, 0xC4, 0x67, -0x7B, 0x1F, 0xEC, 0xEC, 0x97, 0x18, 0xEE, 0x0F, 0xD3, 0x14, -0x89, 0x10, 0xD4, 0x1B, 0x68, 0xCD, 0x2B, 0xE8, 0x6C, 0xED, -0xC6, 0xFF, 0xFB, 0xB9, 0x77, 0xFE, 0x70, 0xE8, 0x70, 0x5E, -0x05, 0x38, 0x7A, 0x78, 0xEC, 0xE9, 0xC7, 0x46, 0xB6, 0xCD, -0xC4, 0xBA, 0x4D, 0xEA, 0xD7, 0x97, 0xC9, 0x98, 0x9D, 0xB4, -0x44, 0x24, 0x5A, 0xA2, 0x3A, 0x9B, 0x7B, 0xA1, 0xEC, 0xFB, -0x74, 0x74, 0x80, 0x39, 0xDC, 0x46, 0xA2, 0x39, 0x41, 0xF3, -0x23, 0x1D, 0x3C, 0xD4, 0x31, 0x4F, 0x36, 0x0C, 0x8A, 0x27, -0x30, 0x3E, 0x26, 0x91, 0x88, 0xB7, 0xA0, 0x54, 0xAA, 0x68, -0xAA, 0x4F, 0x20, 0x20, 0xF3, 0xDC, 0x57, 0xF7, 0x7F, 0x9E, -0x3B, 0xAB, 0x83, 0xC9, 0x1B, 0x37, 0xF3, 0xA6, 0x65, 0xE4, -0x76, 0x3C, 0xBE, 0x69, 0xFB, 0x82, 0x6D, 0x60, 0x86, 0x54, -0x12, 0xA6, 0x86, 0x17, 0x30, 0x98, 0x3E, 0x1C, 0x86, 0x49, -0x19, 0xFB, 0x77, 0x2A, 0x9B, 0x76, 0x2F, 0xD1, 0xDF, 0xEF, -0x11, 0x1E, 0x30, 0x30, 0xA7, 0xDB, 0x30, 0x2E, 0xC0, 0x46, -0x4B, 0x62, 0xD5, 0x40, 0x91, 0x78, 0xCC, 0xC3, 0x0A, 0x04, -0x69, 0xEF, 0xE8, 0x62, 0x62, 0x62, 0x62, 0xC7, 0xC1, 0x83, -0xBF, 0xBF, 0xF2, 0xA1, 0xB8, 0x06, 0x78, 0xED, 0x57, 0xAF, -0xFD, 0x64, 0xE4, 0x99, 0x1D, 0xDF, 0x2D, 0xCC, 0x25, 0x99, -0x2F, 0x57, 0xB1, 0x64, 0x99, 0xA0, 0x65, 0xA2, 0x4A, 0x0A, -0x7E, 0xD5, 0x23, 0x60, 0x1A, 0x58, 0x8A, 0x86, 0x6F, 0x04, -0xD0, 0x34, 0x1D, 0xB5, 0xE6, 0x23, 0x49, 0x02, 0x45, 0x01, -0x45, 0xD5, 0x49, 0xC4, 0x9B, 0x39, 0x37, 0x31, 0xB1, 0x77, -0xC3, 0xC6, 0x8D, 0x6F, 0xFC, 0x5B, 0x1F, 0xDC, 0xD3, 0xB1, -0x63, 0x63, 0xBB, 0x36, 0x8F, 0x3C, 0x75, 0xB8, 0x98, 0xCF, -0x52, 0xA9, 0xB9, 0x54, 0xEB, 0x0D, 0x02, 0x5E, 0x83, 0x88, -0xA4, 0xA2, 0x04, 0x4D, 0x02, 0xB2, 0x7C, 0x27, 0x84, 0x55, -0x19, 0x5D, 0x0E, 0x10, 0x0C, 0x5A, 0x1F, 0x1C, 0xFF, 0xB4, -0x24, 0x49, 0x7F, 0x7D, 0xA0, 0xE6, 0x14, 0x42, 0xFC, 0x34, -0x53, 0x58, 0x2E, 0x17, 0x1B, 0x35, 0x91, 0x5A, 0xCA, 0x88, -0x5C, 0x2E, 0x2B, 0x0A, 0x85, 0x82, 0x28, 0x3A, 0x45, 0xE1, -0x94, 0x6D, 0xE1, 0x37, 0xEE, 0x34, 0x58, 0xA9, 0x54, 0xCA, -0x0A, 0x21, 0x7E, 0xF0, 0x20, 0x4C, 0xA9, 0xAB, 0xAB, 0x2B, -0xD2, 0xD4, 0xD4, 0xD4, 0x16, 0x8B, 0xC5, 0x9B, 0x77, 0x6C, -0xDF, 0xD6, 0xF6, 0xD2, 0xD7, 0xBE, 0xB9, 0x37, 0xB3, 0x98, -0xF9, 0xAF, 0xCD, 0x7F, 0xFA, 0xCC, 0x99, 0xF1, 0x7D, 0xFB, -0xF6, 0xED, 0x5F, 0xB7, 0x6E, 0x5D, 0x1F, 0xD0, 0x03, 0x0C, -0x01, 0xC6, 0x7F, 0xAC, 0x4C, 0x80, 0xE1, 0xE1, 0xE1, 0x50, -0x24, 0x12, 0x51, 0x06, 0x07, 0x07, 0x57, 0x5C, 0xB8, 0x70, -0x29, 0x1E, 0x0A, 0x5B, 0xEE, 0xD6, 0x2D, 0x4F, 0x44, 0xFA, -0xFA, 0xBA, 0x9B, 0x15, 0x59, 0x8B, 0x68, 0x86, 0xA1, 0xEB, -0x86, 0x6E, 0xCA, 0xC0, 0x42, 0x3A, 0x9D, 0x9A, 0xBB, 0x75, -0x2B, 0xE3, 0xBA, 0x6E, 0x68, 0x6C, 0x6C, 0xAC, 0x14, 0x0C, -0x06, 0xE7, 0x2D, 0xCB, 0xCA, 0x9E, 0x38, 0x71, 0xA2, 0x08, -0x78, 0xF7, 0x98, 0xFF, 0x1A, 0x00, 0x12, 0x76, 0x28, 0x70, -0x52, 0x4A, 0xD5, 0x77, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0xF5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x7D, 0x56, 0x0B, 0x50, 0x54, 0xD7, 0x19, -0xFE, 0xEE, 0xDD, 0xBB, 0x7B, 0xF7, 0x7D, 0xF7, 0xFD, 0x80, -0x65, 0x97, 0x5D, 0xC0, 0xC0, 0x2A, 0x22, 0xC2, 0x0A, 0x0A, -0x11, 0xAB, 0x06, 0x1A, 0xA1, 0xC4, 0x36, 0x36, 0xA1, 0x9A, -0x60, 0x02, 0xD6, 0x88, 0x01, 0x27, 0xA3, 0x53, 0xDB, 0x4C, -0x4C, 0x22, 0xD4, 0xA6, 0x1D, 0x6C, 0x62, 0x99, 0xA8, 0x10, -0x51, 0x62, 0x90, 0xC6, 0x19, 0xEC, 0x80, 0xC1, 0x98, 0x10, -0xC4, 0xA6, 0x38, 0xD8, 0x14, 0x2C, 0x19, 0x2A, 0x02, 0x26, -0x8C, 0x88, 0xA0, 0xBC, 0xC1, 0x05, 0x16, 0xDC, 0x17, 0xBB, -0xBD, 0x8B, 0xD3, 0xCC, 0x84, 0x32, 0xFE, 0x33, 0xE7, 0xDC, -0xF3, 0xF8, 0xFF, 0xEF, 0x3F, 0xFF, 0xF9, 0x1F, 0xE7, 0x02, -0x4F, 0xA0, 0xAD, 0xBF, 0x4C, 0x33, 0xBF, 0xBC, 0x6B, 0xFB, -0xCE, 0xBD, 0xF9, 0x7B, 0xCF, 0x7E, 0x54, 0x5E, 0x76, 0xBF, -0xF2, 0xD3, 0x4F, 0xA6, 0xCB, 0xCA, 0x4F, 0x3E, 0xD8, 0x5B, -0xF0, 0xFA, 0xC9, 0x9C, 0xD7, 0x76, 0x66, 0x8B, 0x15, 0xA2, -0xD0, 0x27, 0xC9, 0x07, 0x88, 0x5A, 0x72, 0x95, 0x43, 0xC6, -0xD4, 0xD4, 0x56, 0xD7, 0x24, 0x27, 0x26, 0x5B, 0xD4, 0x6A, -0xED, 0xE2, 0x5D, 0x09, 0xDB, 0xF2, 0x02, 0xAD, 0xFC, 0xC4, -0x19, 0x7C, 0x50, 0xFA, 0x41, 0xF7, 0x6F, 0x0A, 0x0E, 0xA6, -0xB3, 0xF3, 0xBB, 0x4B, 0x41, 0x11, 0x8B, 0x17, 0xDE, 0xF8, -0xD3, 0x9B, 0x1F, 0x1F, 0xF8, 0x55, 0xDE, 0x2B, 0x06, 0x63, -0xC8, 0xC2, 0xDC, 0xE9, 0x9C, 0x83, 0xC7, 0x0F, 0x70, 0x39, -0x04, 0x08, 0x1F, 0x09, 0x2F, 0xE9, 0x07, 0x67, 0xDE, 0x07, -0x5A, 0x20, 0x60, 0x85, 0x1F, 0x8B, 0xCF, 0xCE, 0xCD, 0xC1, -0xB6, 0x21, 0xF6, 0xF7, 0xDD, 0x37, 0xBE, 0x7F, 0xE7, 0x89, -0x0A, 0x72, 0xF6, 0xEE, 0xBA, 0x74, 0xE6, 0x44, 0x79, 0x46, -0x60, 0x3C, 0x3C, 0x35, 0x0A, 0x1D, 0xA3, 0x79, 0xBC, 0xE1, -0xF6, 0x63, 0xDC, 0x33, 0x05, 0x21, 0xC1, 0x85, 0x8F, 0xC3, -0x01, 0xC9, 0x2A, 0xF0, 0xFB, 0xE7, 0x01, 0x3F, 0x2B, 0x4E, -0x11, 0x10, 0xF1, 0x45, 0x0B, 0x6C, 0xB1, 0x6B, 0x56, 0x56, -0xB4, 0xDF, 0xE8, 0xC8, 0x5D, 0x52, 0xC1, 0xB3, 0x3F, 0xDB, -0x78, 0xEE, 0x8B, 0xBA, 0xAB, 0x2F, 0x39, 0x5C, 0x76, 0xD8, -0xA7, 0x9C, 0x30, 0xA8, 0x74, 0xA8, 0xF8, 0xA6, 0x02, 0x0E, -0x8F, 0x1D, 0xAF, 0x25, 0x14, 0x80, 0xE6, 0x71, 0xE1, 0x71, -0x7A, 0x30, 0xE5, 0x79, 0x08, 0x0E, 0x45, 0xC1, 0xC7, 0x82, -0x73, 0x59, 0xF1, 0x79, 0x82, 0x80, 0xFB, 0xD1, 0x1C, 0xB4, -0x6A, 0xFD, 0x02, 0x4E, 0x74, 0x7C, 0xD8, 0xB1, 0x5B, 0x6D, -0xBD, 0xFB, 0x7F, 0xA4, 0xC0, 0xBA, 0x26, 0x2A, 0xA6, 0xB3, -0xA5, 0xAB, 0xDD, 0xEF, 0x76, 0xE1, 0xEE, 0xF0, 0x20, 0x84, -0x12, 0x1A, 0x52, 0x97, 0x02, 0x95, 0xCD, 0x95, 0x68, 0x10, -0x7D, 0x0E, 0x86, 0x51, 0xC0, 0x3F, 0xEB, 0x47, 0x91, 0xA9, -0x08, 0x46, 0x85, 0x09, 0x6E, 0xCA, 0x8F, 0x19, 0xFF, 0x43, -0x4C, 0xB9, 0x58, 0xAB, 0x28, 0x3E, 0xB8, 0x24, 0x17, 0x8E, -0xD9, 0x39, 0x98, 0x42, 0x8C, 0x8F, 0x41, 0x09, 0xC2, 0xC4, -0x7E, 0xFA, 0x17, 0xDC, 0x19, 0xE8, 0x2E, 0x5D, 0xBE, 0xD8, -0x61, 0xD0, 0x19, 0x45, 0x3D, 0x63, 0xB7, 0x21, 0x21, 0x05, -0x98, 0xF7, 0x10, 0x18, 0x71, 0xDF, 0x07, 0xF9, 0x1D, 0x8D, -0x5B, 0xFC, 0xDB, 0x38, 0xB7, 0xB9, 0x12, 0x12, 0xA5, 0x14, -0x45, 0x3D, 0x87, 0x71, 0xBE, 0xF7, 0x02, 0x98, 0x29, 0x2E, -0x22, 0x85, 0x2B, 0xA0, 0x66, 0x54, 0x98, 0x70, 0x4F, 0xC0, -0x31, 0x33, 0x05, 0x8A, 0x24, 0x31, 0x3A, 0x39, 0x02, 0xA5, -0x5C, 0x05, 0x8A, 0xCF, 0xF9, 0xC5, 0xD7, 0x57, 0xBF, 0xFE, -0x4B, 0x00, 0x9B, 0xC4, 0x7A, 0x51, 0x78, 0x42, 0x4C, 0x92, -0xDA, 0x31, 0x37, 0x02, 0xEE, 0x2C, 0x0F, 0x33, 0x5E, 0x17, -0xFC, 0x98, 0x03, 0xC5, 0x11, 0x40, 0x23, 0x97, 0x63, 0xA2, -0xD3, 0x8E, 0x06, 0x7C, 0x85, 0x4D, 0xB2, 0x4D, 0xA8, 0xDD, -0xF0, 0x19, 0x0A, 0xD3, 0x0E, 0xA1, 0x91, 0x6E, 0x42, 0xDE, -0x37, 0xBB, 0xF1, 0xE7, 0xC6, 0xF7, 0xC1, 0x1F, 0xA6, 0x11, -0x26, 0x8C, 0x82, 0x8B, 0x4F, 0xC2, 0x31, 0xEF, 0xC1, 0xD8, -0xE0, 0x28, 0x0E, 0x1D, 0x7C, 0xDB, 0x64, 0x08, 0x0E, 0x8A, -0x5D, 0x50, 0xB0, 0x2D, 0x2D, 0x6B, 0x4B, 0x60, 0xE0, 0x15, -0x0E, 0xC3, 0x68, 0xA1, 0xA1, 0x93, 0x90, 0x70, 0x7B, 0xBD, -0xF0, 0xCE, 0xDA, 0x21, 0x5B, 0x2F, 0x47, 0x50, 0xB5, 0xB0, -0x3D, 0xBF, 0xAE, 0x60, 0xC6, 0x85, 0x59, 0xD4, 0xFA, 0x6A, -0x61, 0xE1, 0x86, 0xA3, 0x64, 0x4D, 0x09, 0xDE, 0x7C, 0xE1, -0x6D, 0x50, 0x56, 0x02, 0x3B, 0xBA, 0xB2, 0x71, 0xB0, 0xE1, -0x77, 0xF0, 0xB5, 0xDA, 0x11, 0x3E, 0xCC, 0x60, 0xBA, 0x7F, -0x20, 0x70, 0x6C, 0x6C, 0x49, 0x4D, 0x29, 0x08, 0xE0, 0x52, -0xA9, 0xD6, 0x95, 0x4F, 0x07, 0x06, 0x32, 0x3B, 0x9B, 0x12, -0x7E, 0x1F, 0xC4, 0x6C, 0x70, 0x88, 0xF9, 0x32, 0x40, 0xB3, -0x0C, 0xF7, 0xFA, 0xDB, 0xDD, 0x6E, 0x8A, 0xFE, 0x87, 0xEB, -0x53, 0xAF, 0xFF, 0xFD, 0xCC, 0xE2, 0x58, 0x15, 0xA1, 0xC3, -0x71, 0x94, 0x40, 0x09, 0x15, 0x74, 0xD0, 0x20, 0x79, 0xD9, -0x3A, 0x64, 0x2E, 0xCB, 0x44, 0xF7, 0xC8, 0x6D, 0xFC, 0xF1, -0xCB, 0x77, 0x61, 0x9F, 0xD6, 0x40, 0xB3, 0x3E, 0x03, 0xEB, -0x58, 0x8E, 0xD4, 0xBC, 0xEC, 0xC4, 0x53, 0x1F, 0x9F, 0x07, -0xD1, 0x70, 0xA5, 0x76, 0xE0, 0x99, 0xCD, 0xCF, 0x18, 0xA6, -0xFB, 0x06, 0xC1, 0xE3, 0x31, 0xE0, 0x83, 0x86, 0xDD, 0x3E, -0x0A, 0x66, 0x46, 0x82, 0xFE, 0xC9, 0x3B, 0x1D, 0xA7, 0x6F, -0xB6, 0xB4, 0xD6, 0xBF, 0x53, 0xC5, 0x65, 0xEE, 0x29, 0xB6, -0xC7, 0xEB, 0xA2, 0xA9, 0x3E, 0xD6, 0x77, 0x6E, 0x78, 0xE0, -0x5B, 0xB8, 0x5F, 0x92, 0xE5, 0xE7, 0xC2, 0x8C, 0x70, 0xD8, -0x10, 0x8F, 0xBE, 0xF1, 0xEF, 0xD1, 0xD2, 0xD1, 0x01, 0x27, -0xDF, 0x84, 0x97, 0x34, 0x36, 0x6C, 0x0B, 0x7F, 0x9E, 0x20, -0x2E, 0x7E, 0x55, 0x3F, 0x13, 0xB1, 0x7E, 0x95, 0xF8, 0xC1, -0xD8, 0x03, 0x08, 0xA6, 0x78, 0xB8, 0xDB, 0x7F, 0x07, 0xF3, -0xB3, 0x2E, 0x44, 0x69, 0x43, 0xD1, 0x3F, 0x35, 0xD6, 0xC1, -0xF5, 0x7B, 0x5B, 0x47, 0x4E, 0xDC, 0x9F, 0x7E, 0xEB, 0xC5, -0xA2, 0xB5, 0x13, 0x39, 0xA3, 0x89, 0x8B, 0x13, 0x89, 0xFC, -0x5F, 0x38, 0x7A, 0x81, 0x04, 0x6A, 0x0D, 0xA2, 0x59, 0xDB, -0x46, 0x2E, 0x77, 0x22, 0x2A, 0x7A, 0x1B, 0xAE, 0x1D, 0x69, -0x5E, 0xC1, 0xD9, 0x93, 0xFB, 0xF3, 0x7C, 0x9B, 0xDA, 0x26, -0x09, 0x6B, 0x50, 0xC2, 0x38, 0xAA, 0x47, 0x8C, 0x38, 0x12, -0x06, 0x65, 0x04, 0x5C, 0x2A, 0x01, 0xEE, 0xF4, 0x5F, 0x9F, -0x76, 0xDD, 0x75, 0x76, 0x0C, 0x10, 0xE3, 0x21, 0xDD, 0xFB, -0xDA, 0x52, 0x97, 0xD3, 0x56, 0x04, 0x43, 0x8F, 0x30, 0x84, -0x22, 0x8A, 0xED, 0x23, 0xFD, 0x91, 0x88, 0x7E, 0x14, 0x8D, -0x8D, 0xDC, 0x4D, 0x78, 0x96, 0xB4, 0xC1, 0x3C, 0x24, 0x87, -0xBF, 0xD9, 0x00, 0xFE, 0xA3, 0x6C, 0x6C, 0x59, 0x9B, 0xF7, -0xE8, 0xBD, 0xCC, 0xDD, 0x6F, 0x90, 0xFA, 0x5E, 0x5C, 0x47, -0x0B, 0x30, 0x20, 0xED, 0x41, 0x63, 0x50, 0x23, 0x2A, 0x7C, -0x9F, 0xA0, 0x6A, 0xA8, 0x04, 0x97, 0x3A, 0xCF, 0x21, 0x28, -0xC6, 0x18, 0xF1, 0x6D, 0xF5, 0x35, 0xAA, 0x7B, 0x75, 0xD7, -0xF2, 0x97, 0xA5, 0xD9, 0x48, 0x72, 0x27, 0x63, 0x3D, 0x52, -0x90, 0x84, 0xA7, 0x91, 0x34, 0xBF, 0x01, 0x99, 0xC4, 0x56, -0xE4, 0x08, 0xB3, 0xB0, 0xFA, 0xDE, 0x32, 0xC8, 0x3F, 0xFB, -0x29, 0xA4, 0x35, 0x07, 0xA0, 0x1A, 0xCF, 0xC5, 0xF2, 0xE4, -0x44, 0xFC, 0xA7, 0xBE, 0xFA, 0xDE, 0x82, 0x65, 0xB9, 0xB9, -0x2F, 0xEE, 0x79, 0xBE, 0x28, 0xBF, 0xF4, 0x7A, 0x4B, 0x13, -0xEB, 0x3A, 0x09, 0x24, 0xF3, 0x22, 0xD0, 0xD2, 0x60, 0x88, -0xE9, 0x39, 0x38, 0x86, 0x1C, 0xB8, 0x72, 0xF9, 0xBA, 0x77, -0xD3, 0xA9, 0x78, 0x8A, 0x27, 0x10, 0xC2, 0x09, 0x17, 0x44, -0x2C, 0x8F, 0x9E, 0xBD, 0x06, 0x2E, 0x84, 0x18, 0xBE, 0xDD, -0x87, 0x1B, 0x97, 0x7B, 0x21, 0xE8, 0x93, 0x41, 0x16, 0xA2, -0x81, 0x20, 0xD1, 0x08, 0xB7, 0x55, 0x0B, 0x9E, 0x4A, 0x85, -0xF1, 0xB2, 0xE3, 0xE5, 0xBF, 0xCD, 0x3B, 0xB0, 0x9B, 0x6C, -0x6E, 0xEF, 0xA8, 0x97, 0xDB, 0x69, 0xAC, 0xE2, 0x58, 0x61, -0xE2, 0x18, 0xA1, 0x60, 0x42, 0x21, 0xF6, 0x0F, 0x82, 0x9C, -0x9C, 0x43, 0x5B, 0x77, 0x3F, 0xAC, 0x49, 0x06, 0xCA, 0x26, -0x58, 0x07, 0x23, 0x4C, 0xEC, 0xC9, 0xD7, 0xB1, 0x57, 0x13, -0x89, 0xFB, 0x57, 0x86, 0xD0, 0x72, 0xF8, 0x0B, 0xB4, 0x9E, -0xBA, 0x05, 0x4A, 0x26, 0x81, 0x21, 0x5D, 0x0B, 0xA3, 0x4D, -0x0A, 0xE5, 0x64, 0x37, 0xF4, 0xFF, 0x6C, 0x84, 0xA8, 0xF7, -0x26, 0x86, 0xDB, 0x7A, 0x4A, 0x16, 0x7C, 0xF4, 0x5D, 0x5B, -0x57, 0xDF, 0x50, 0x4F, 0xCF, 0x03, 0x8B, 0xC1, 0x04, 0x17, -0xC9, 0x01, 0x87, 0x3B, 0x04, 0x62, 0x92, 0x80, 0x5D, 0xA2, -0x86, 0x67, 0xB0, 0x17, 0x19, 0x3B, 0xB6, 0x41, 0xCD, 0x86, -0xA4, 0x7F, 0xD2, 0x8F, 0xDA, 0xB2, 0x7A, 0x9C, 0x7D, 0xF5, -0x14, 0x9A, 0xFE, 0x7A, 0x15, 0xBA, 0x95, 0x2A, 0x64, 0xE5, -0x6E, 0x46, 0xEC, 0xEA, 0xA7, 0xA0, 0x14, 0x0B, 0xD8, 0x44, -0x62, 0x6B, 0x94, 0x44, 0x01, 0x4D, 0x58, 0x0C, 0x9C, 0xF5, -0x4D, 0x7D, 0xC7, 0x4E, 0x97, 0x75, 0xFE, 0x10, 0x04, 0x7F, -0x6F, 0xFC, 0x7C, 0x2B, 0x25, 0x11, 0x43, 0xAA, 0x9A, 0x07, -0x3D, 0xEC, 0x81, 0x3B, 0xC4, 0x0C, 0xDF, 0xC0, 0x00, 0x56, -0xFC, 0x24, 0x9E, 0x0D, 0x39, 0x07, 0xCE, 0x7E, 0x78, 0x1A, -0x35, 0xFB, 0x2F, 0x62, 0xE4, 0xE1, 0x2C, 0xE2, 0x9E, 0xDB, -0x80, 0x57, 0xF7, 0xE7, 0x42, 0xAA, 0x36, 0x82, 0x4F, 0xFA, -0x10, 0x24, 0x10, 0x43, 0xC5, 0xC8, 0x60, 0x90, 0x9B, 0xA1, -0xE4, 0x11, 0x10, 0x13, 0x4E, 0x40, 0x6E, 0x88, 0xF9, 0x51, -0x94, 0x1D, 0x3F, 0x7E, 0xFE, 0xDF, 0xAD, 0xFF, 0xBA, 0x52, -0x99, 0x60, 0x0C, 0x85, 0x9D, 0x31, 0x40, 0xCB, 0x03, 0x82, -0x42, 0xF4, 0xE0, 0x71, 0x19, 0x34, 0x7D, 0xD8, 0x8C, 0x08, -0x45, 0x38, 0xB6, 0x64, 0xA7, 0x63, 0xC7, 0x0B, 0xE9, 0x30, -0x45, 0x45, 0xB0, 0xB5, 0x46, 0x08, 0x9D, 0xC0, 0x08, 0x0E, -0xCD, 0x20, 0x58, 0xA6, 0x81, 0x4A, 0xA6, 0x84, 0x48, 0x28, -0x84, 0x56, 0x63, 0x41, 0x68, 0x50, 0xF8, 0xA1, 0x57, 0xB6, -0x67, 0x4D, 0x2F, 0x0E, 0x63, 0xFC, 0x3A, 0x3B, 0x7F, 0xE7, -0xDF, 0xBE, 0xFC, 0xF6, 0xDA, 0xC6, 0x8D, 0x31, 0x6C, 0x89, -0x67, 0x8B, 0xAC, 0x5C, 0x89, 0x08, 0x93, 0x19, 0x19, 0x59, -0xCF, 0x21, 0xC2, 0xB6, 0x12, 0xFA, 0x60, 0x2D, 0x44, 0x1C, -0x31, 0x74, 0x34, 0x6B, 0xA9, 0x42, 0x09, 0x75, 0x88, 0x9A, -0x4D, 0x4C, 0x25, 0x68, 0x4A, 0x00, 0xA9, 0x50, 0x0C, 0xB3, -0x39, 0x14, 0x96, 0xA7, 0x22, 0x8E, 0x49, 0xE5, 0xAA, 0x3F, -0x2C, 0x95, 0x27, 0x0B, 0xB4, 0x67, 0x57, 0x6E, 0x8A, 0xF7, -0xA1, 0xE3, 0xE4, 0x72, 0x5B, 0x0A, 0x0C, 0x1A, 0x2D, 0x34, -0xC1, 0x3A, 0x78, 0x39, 0x6C, 0xAE, 0x52, 0x24, 0xE4, 0x32, -0x05, 0x14, 0x62, 0x06, 0x0A, 0x25, 0x03, 0x39, 0x57, 0x08, -0x89, 0x48, 0x0C, 0x8D, 0x5E, 0x0F, 0x99, 0x52, 0x09, 0x8D, -0x52, 0x03, 0xAE, 0x80, 0x7E, 0x8B, 0x2D, 0xD3, 0xFB, 0xB1, -0x88, 0xC8, 0xC5, 0x0B, 0x41, 0xFA, 0xB0, 0xD7, 0x07, 0x6F, -0x76, 0x69, 0xAC, 0x21, 0xE6, 0x8B, 0x06, 0xAD, 0xC1, 0x29, -0x13, 0x0B, 0x59, 0x27, 0x32, 0x10, 0xB2, 0x4F, 0x24, 0x97, -0xE6, 0x81, 0xC7, 0xD6, 0x7F, 0xB1, 0x90, 0x7D, 0x2F, 0xC4, -0x62, 0xF0, 0x38, 0xE4, 0x18, 0x87, 0xE0, 0xD4, 0x11, 0x8F, -0xE9, 0xBD, 0xC5, 0x58, 0xFF, 0xA7, 0xC0, 0x62, 0xB1, 0xA8, -0x13, 0x6C, 0x09, 0xBA, 0xB4, 0x8C, 0x34, 0x6A, 0x5F, 0xFE, -0xBE, 0xC2, 0xEA, 0x8A, 0x73, 0x47, 0x83, 0x44, 0x32, 0x28, -0x34, 0x1A, 0x30, 0x52, 0x36, 0xD6, 0x25, 0x01, 0x45, 0x6C, -0x9E, 0x70, 0xF9, 0x98, 0x98, 0x98, 0x98, 0x3C, 0x5A, 0x7C, -0xF4, 0xA3, 0xC2, 0xC2, 0xC2, 0x40, 0xDD, 0x37, 0x33, 0x0C, -0x63, 0xD5, 0xE9, 0x74, 0xD2, 0xA5, 0x94, 0xFC, 0x40, 0x71, -0x71, 0x71, 0x12, 0x95, 0x4A, 0xA5, 0x08, 0xB3, 0x58, 0xAC, -0x31, 0x71, 0x71, 0x6B, 0x0B, 0x0F, 0xBF, 0xBB, 0xAA, 0xB4, -0xB4, 0x34, 0xA5, 0xBC, 0xFC, 0xCC, 0xD6, 0xAA, 0xAA, 0xAA, -0x1D, 0x35, 0x35, 0x35, 0x39, 0x75, 0x75, 0x75, 0x7B, 0x2E, -0x5C, 0xB8, 0xB0, 0xF3, 0xC8, 0x91, 0x23, 0x29, 0xC5, 0xC5, -0xC5, 0xE9, 0xA9, 0x2C, 0x09, 0x04, 0x02, 0x2B, 0x9F, 0xCF, -0x0F, 0xFC, 0x7E, 0xD0, 0x8B, 0x31, 0xFF, 0x0B, 0x25, 0x2D, -0x52, 0x75, 0x3C, 0x77, 0xAA, 0x9E, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Refresh2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x03, 0xDF, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0xB4, 0x54, 0x6D, 0x4C, 0x5B, 0x55, 0x18, -0x7E, 0xCE, 0xB9, 0xB7, 0xB7, 0x2D, 0x6D, 0xB9, 0xED, 0xCA, -0x04, 0x1C, 0x74, 0x8C, 0x82, 0x8C, 0x31, 0x56, 0x46, 0xE6, -0x9C, 0xC9, 0x7E, 0xEC, 0x8F, 0xFE, 0x51, 0x14, 0xD9, 0x8C, -0x31, 0x71, 0xA2, 0x59, 0x82, 0x9B, 0x1F, 0x09, 0x9A, 0x25, -0xFE, 0xF0, 0x97, 0xFE, 0x21, 0xC1, 0x1F, 0x26, 0x4B, 0xFC, -0x4A, 0x70, 0x9A, 0x48, 0x64, 0x28, 0x84, 0x04, 0x84, 0x30, -0xB7, 0x91, 0x6C, 0xD3, 0x2C, 0xCB, 0xB6, 0x3A, 0x1C, 0x1B, -0xE3, 0x63, 0x0C, 0xB8, 0x85, 0x16, 0x5A, 0xBE, 0x5A, 0x5A, -0xA0, 0xA5, 0xF7, 0xF5, 0x87, 0x17, 0x72, 0x35, 0x73, 0x2B, -0x6E, 0x3E, 0xC9, 0x9B, 0x73, 0xF2, 0x9E, 0x37, 0xCF, 0x73, -0x9E, 0xF3, 0xBE, 0x39, 0x8C, 0x88, 0xB0, 0x11, 0x94, 0xEC, -0x2C, 0x16, 0xC7, 0x46, 0xC7, 0x72, 0x9C, 0x0E, 0x87, 0xAB, -0x7C, 0x77, 0xB9, 0x07, 0x00, 0xBF, 0x70, 0xF1, 0x82, 0x12, -0x89, 0xC6, 0x26, 0x9C, 0x4E, 0xE7, 0x80, 0xDF, 0x1F, 0x98, -0xD7, 0xD7, 0x33, 0x6C, 0x0C, 0xE5, 0x00, 0xEA, 0x76, 0x7B, -0x76, 0x6E, 0xD9, 0xF7, 0xE4, 0xDE, 0x9C, 0x1D, 0x45, 0xC5, -0xB3, 0x49, 0x4E, 0x69, 0x93, 0x8A, 0x62, 0xE8, 0xE8, 0xEA, -0x8A, 0xF7, 0x0F, 0xDE, 0x19, 0x02, 0xF0, 0x09, 0x80, 0xB3, -0xF8, 0x0F, 0x78, 0x27, 0xEF, 0xF1, 0xEC, 0xB3, 0x23, 0x7D, -0x37, 0x2E, 0x13, 0xD1, 0x02, 0x11, 0x2D, 0x13, 0x51, 0x82, -0x88, 0x56, 0xB5, 0x35, 0x78, 0xD3, 0x7B, 0x65, 0xC4, 0xCC, -0x71, 0x1E, 0x40, 0xF5, 0x46, 0xC9, 0x73, 0x5F, 0xA8, 0x78, -0xAE, 0x83, 0x88, 0x7E, 0x25, 0xA2, 0xA5, 0xC5, 0x70, 0x78, -0x72, 0x7A, 0x6A, 0xEA, 0x76, 0x70, 0x26, 0x34, 0x10, 0x9C, -0x99, 0x19, 0x08, 0x4E, 0x4D, 0xDF, 0x59, 0x8C, 0x44, 0x43, -0x9A, 0xE8, 0x70, 0x61, 0x6E, 0xF6, 0x19, 0x00, 0x7B, 0x36, -0xF2, 0x44, 0x5F, 0x12, 0x91, 0x1B, 0xC0, 0xD3, 0xD3, 0x93, -0xFE, 0xFE, 0x34, 0x9B, 0x15, 0x5C, 0xE0, 0x50, 0x49, 0x55, -0x39, 0x13, 0x63, 0x44, 0x6A, 0x7C, 0x25, 0x1E, 0xC7, 0x62, -0x64, 0x41, 0x74, 0xB9, 0xF2, 0x8A, 0x00, 0x04, 0x19, 0x63, -0xA3, 0x00, 0xAA, 0x84, 0x14, 0xC8, 0xCD, 0x5D, 0x3F, 0x77, -0x1E, 0x29, 0x7C, 0xA2, 0x70, 0xB3, 0x32, 0xAE, 0x5C, 0x4E, -0xB7, 0xDB, 0x7D, 0xE0, 0x2C, 0x24, 0x30, 0x16, 0x32, 0x8A, -0xC6, 0xA8, 0x68, 0x10, 0x48, 0x94, 0x24, 0x66, 0x14, 0xA5, -0x25, 0xA3, 0x51, 0x9A, 0xF5, 0xFB, 0xFD, 0xA3, 0xB2, 0xDD, -0x2E, 0x64, 0x6E, 0x72, 0x18, 0x3B, 0xBB, 0xBB, 0xCF, 0xA5, -0xE2, 0xE0, 0x70, 0x62, 0x75, 0x65, 0x3F, 0x4B, 0xB2, 0xEE, -0xB9, 0x68, 0x98, 0x9B, 0x25, 0xC9, 0x6C, 0x10, 0x24, 0xE2, -0x06, 0x51, 0x65, 0x1C, 0x49, 0x46, 0x4C, 0xE0, 0x9C, 0xDB, -0x00, 0xE4, 0x02, 0xC8, 0x5C, 0x5C, 0x8A, 0x32, 0xAB, 0xD9, -0x12, 0x58, 0x58, 0x98, 0x2B, 0xB5, 0xDB, 0x37, 0xB5, 0x88, -0x29, 0x08, 0xB8, 0xA2, 0xE1, 0x68, 0x42, 0x76, 0x38, 0x9C, -0x19, 0xA2, 0x23, 0x0B, 0x9C, 0x4B, 0xBA, 0xB3, 0x24, 0x18, -0xE2, 0x00, 0x66, 0x00, 0xF4, 0x26, 0x55, 0x08, 0x16, 0x93, -0xA9, 0x10, 0x80, 0x2C, 0xCB, 0x8E, 0xB1, 0xE2, 0x82, 0x02, -0x53, 0x2A, 0x02, 0xC3, 0xB2, 0xC3, 0x51, 0x02, 0x20, 0x03, -0x9C, 0xCB, 0x5A, 0xDF, 0xC4, 0x75, 0x81, 0xBF, 0xC2, 0x0A, -0x20, 0x9B, 0x33, 0x0A, 0xAA, 0xAA, 0x7A, 0x4B, 0x10, 0x84, -0xE4, 0x84, 0xA2, 0x1C, 0x9A, 0x9D, 0x0F, 0xCF, 0xF3, 0x14, -0x04, 0xDA, 0xEA, 0x3F, 0xAD, 0x2F, 0x01, 0x60, 0x00, 0x90, -0x01, 0x40, 0xD6, 0x22, 0x5D, 0x8B, 0x34, 0x00, 0x46, 0x00, -0x22, 0x63, 0xCC, 0x26, 0x08, 0x86, 0x12, 0x00, 0xBE, 0x86, -0x6F, 0x4F, 0xA6, 0x4F, 0x85, 0xA6, 0x47, 0x52, 0x71, 0x10, -0xBF, 0x7A, 0xC9, 0xDB, 0x03, 0xC0, 0x0D, 0x80, 0x00, 0x38, -0xB5, 0xFC, 0xAA, 0xB6, 0x2E, 0x6B, 0xE2, 0x4C, 0x13, 0xBB, -0x3E, 0x11, 0xF0, 0x6D, 0xEF, 0xEE, 0xFC, 0x25, 0x0B, 0x80, -0x37, 0x15, 0x07, 0xF8, 0xA9, 0xAD, 0xF9, 0xC3, 0xE2, 0xED, -0x45, 0xD5, 0x00, 0x26, 0x00, 0x70, 0x00, 0x16, 0xED, 0xF6, -0x56, 0x00, 0x36, 0x6D, 0x6F, 0x03, 0x30, 0x16, 0x4F, 0x2C, -0x45, 0xDA, 0x9A, 0xDB, 0x1B, 0xA7, 0x67, 0x42, 0x2F, 0x42, -0xF7, 0x96, 0xF7, 0xC5, 0xBE, 0xBD, 0x4F, 0x35, 0x08, 0xA2, -0x08, 0xC6, 0xD8, 0x47, 0x7F, 0x5C, 0xFF, 0xFD, 0x5A, 0xA9, -0xA7, 0x2C, 0x06, 0x20, 0x0C, 0x20, 0xAE, 0x39, 0x98, 0x05, -0x10, 0x6D, 0x3A, 0xD5, 0xB8, 0xBF, 0xB5, 0xB9, 0xFD, 0xE5, -0x1B, 0xBD, 0x37, 0x2B, 0x46, 0xEE, 0x0E, 0x06, 0x00, 0xF0, -0x07, 0x8E, 0xA9, 0x64, 0xE0, 0xED, 0xB5, 0xB5, 0xEF, 0x57, -0x9C, 0x38, 0xF1, 0xF9, 0xB2, 0xC5, 0x22, 0x3F, 0x93, 0xEF, -0xDA, 0xFA, 0xAE, 0x55, 0xB6, 0xBC, 0x52, 0xF9, 0x52, 0x15, -0xDC, 0x85, 0xDB, 0x62, 0x89, 0xC4, 0xCA, 0xF2, 0xD0, 0xE0, -0xB0, 0xF5, 0xEB, 0xAF, 0x1A, 0xA4, 0xEC, 0xCC, 0xCC, 0xE1, -0x58, 0x6C, 0xF9, 0x80, 0xB7, 0xF7, 0xEA, 0x9A, 0x53, 0xF5, -0xBE, 0x02, 0x6F, 0xD7, 0x1C, 0xA3, 0xA1, 0xE1, 0x7E, 0x9C, -0xEB, 0xB9, 0xB8, 0xA8, 0x22, 0x69, 0x5B, 0xCB, 0x97, 0x95, -0x7A, 0xF2, 0x67, 0xE7, 0x23, 0xC7, 0x63, 0xE1, 0x85, 0xAD, -0x44, 0x60, 0x26, 0xAB, 0x35, 0xC2, 0x88, 0x3E, 0xF6, 0xF9, -0xC7, 0x6F, 0x69, 0x25, 0x46, 0x00, 0x2B, 0xFF, 0xFA, 0x55, -0x18, 0x25, 0xC9, 0x59, 0x5F, 0x57, 0x17, 0x9A, 0x0C, 0x28, -0x38, 0xD3, 0xF3, 0x1B, 0xBC, 0xD7, 0xAE, 0xAC, 0xD5, 0x6D, -0x06, 0x10, 0x7C, 0x80, 0x69, 0x41, 0x1B, 0x5D, 0xDC, 0xB3, -0x07, 0x19, 0x0E, 0x67, 0xDE, 0xF1, 0x0F, 0xDE, 0xBB, 0x4B, -0x0C, 0x68, 0x3A, 0xD5, 0x82, 0x71, 0xC5, 0xB7, 0x46, 0x2E, -0xEB, 0xC8, 0x39, 0x00, 0x55, 0xF7, 0xE5, 0x93, 0x2E, 0x97, -0xD4, 0xF3, 0xFD, 0x4D, 0xC0, 0xED, 0xDE, 0xF6, 0x6C, 0xCD, -0x5B, 0x35, 0xA7, 0x23, 0xE1, 0x39, 0x34, 0x35, 0xB7, 0xE9, -0xC9, 0xB3, 0x00, 0x04, 0x74, 0xA5, 0xAA, 0x6E, 0x4F, 0xF7, -0xC8, 0xAD, 0x63, 0x7D, 0x4C, 0x77, 0x95, 0x96, 0xBD, 0x7A, -0xF4, 0xE8, 0xB1, 0xD3, 0x46, 0x41, 0x40, 0x6B, 0x4B, 0x87, -0xD2, 0xDB, 0xD7, 0xBB, 0x46, 0xEE, 0xFA, 0x07, 0xF9, 0x86, -0xC0, 0x00, 0xE0, 0x8D, 0xD7, 0x5E, 0xAF, 0xDD, 0xE1, 0x29, -0xFD, 0x4C, 0x94, 0x80, 0x93, 0x5F, 0x7C, 0x73, 0xBE, 0x6F, -0xE0, 0xF6, 0x01, 0x00, 0x12, 0x80, 0xC7, 0x00, 0xF8, 0xF0, -0x10, 0x60, 0x55, 0x95, 0xCF, 0x57, 0xE7, 0xBB, 0x0B, 0xBE, -0x13, 0x24, 0x11, 0x3F, 0x7C, 0xFF, 0x63, 0xAB, 0xE2, 0x1B, -0x3F, 0xA4, 0x7D, 0x09, 0xA6, 0x87, 0x25, 0x07, 0x00, 0xBC, -0x79, 0xF8, 0x08, 0x1D, 0xAC, 0xAC, 0x20, 0x70, 0xD6, 0xA2, -0xA5, 0x72, 0x00, 0x6C, 0xC1, 0xA3, 0x82, 0x67, 0xD7, 0x9E, -0x1C, 0xB3, 0xC1, 0xD4, 0xA8, 0x6B, 0x66, 0x2E, 0xFE, 0x27, -0x14, 0x3C, 0xD2, 0x9B, 0x6B, 0xF8, 0x73, 0x00, 0xD6, 0xD2, -0x86, 0xAE, 0xCA, 0xDF, 0x49, 0x07, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x88, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x5B, 0x6C, 0x93, 0xF7, 0x1D, -0x86, 0x9F, 0xCF, 0x9F, 0xCF, 0xC7, 0xD8, 0x81, 0x1C, 0xC8, -0x81, 0x90, 0x12, 0x60, 0x10, 0xAA, 0x14, 0x92, 0x06, 0x46, -0x12, 0xC1, 0x80, 0x4C, 0x1D, 0x74, 0x80, 0xAA, 0x8A, 0x55, -0xD0, 0x4C, 0x45, 0xE2, 0x62, 0x93, 0x60, 0xD3, 0x4A, 0x41, -0xAB, 0x36, 0x69, 0xDD, 0x34, 0xA4, 0x51, 0xA1, 0x5E, 0x4C, -0x55, 0xD1, 0x54, 0xD1, 0x32, 0x44, 0x45, 0x55, 0x4D, 0x6D, -0x09, 0x42, 0x5B, 0xE8, 0xC4, 0x50, 0x8B, 0x96, 0x90, 0x10, -0x20, 0x07, 0xC8, 0xD1, 0x31, 0x4E, 0x88, 0xE3, 0xC4, 0xFE, -0x12, 0x7F, 0x3E, 0xC4, 0xF6, 0x67, 0x7F, 0xFF, 0x5D, 0x54, -0x54, 0x14, 0xED, 0xC0, 0xDE, 0xBB, 0xF7, 0xE2, 0xF7, 0x3C, -0x77, 0xBF, 0x57, 0xE2, 0xBF, 0xC7, 0xF4, 0xCC, 0xBA, 0xAA, -0x17, 0xDB, 0xDA, 0x0E, 0xAD, 0xAF, 0x2C, 0x2D, 0xDF, 0xEE, -0x76, 0xB9, 0xEB, 0x84, 0x44, 0x3E, 0xA1, 0xAA, 0xB7, 0xEE, -0x0E, 0xDC, 0xFA, 0xC7, 0x07, 0x67, 0xFF, 0x7C, 0x67, 0x21, -0x12, 0xBF, 0xCC, 0xFF, 0x9B, 0x82, 0xF2, 0xA5, 0xBE, 0x37, -0x7E, 0xF9, 0xB3, 0xF6, 0x50, 0x68, 0x4A, 0xFC, 0xAF, 0xF8, -0x03, 0x63, 0xE2, 0xC7, 0x87, 0x5F, 0xB9, 0x08, 0x98, 0x9F, -0x8E, 0x6E, 0xA2, 0x6D, 0x3E, 0x11, 0xFB, 0x06, 0xA0, 0x8B, -0x9C, 0xC8, 0xA4, 0x17, 0x45, 0x3E, 0x12, 0x11, 0x99, 0x8E, -0x0E, 0x91, 0xB9, 0x76, 0x4D, 0xE8, 0x8B, 0x8B, 0x22, 0x9D, -0xC9, 0x7C, 0x4B, 0x34, 0xF2, 0x60, 0x54, 0x00, 0x3F, 0x7C, -0x12, 0x67, 0x78, 0xBC, 0xAC, 0x58, 0x55, 0xFD, 0xAE, 0xC8, -0x8A, 0x73, 0x05, 0x0E, 0x37, 0xB1, 0x54, 0x82, 0x79, 0x55, -0x21, 0xA9, 0xA6, 0x10, 0x48, 0xE4, 0x67, 0x66, 0x30, 0x0F, -0x0E, 0x62, 0xBA, 0x73, 0x07, 0x5D, 0x55, 0xC9, 0xEB, 0x39, -0x92, 0xC9, 0x38, 0xF1, 0x44, 0x8C, 0xB4, 0x96, 0xA6, 0xA6, -0x72, 0x25, 0x42, 0x88, 0xCF, 0x2D, 0x2E, 0xF3, 0xF1, 0x7F, -0x2B, 0xA8, 0xAE, 0x5D, 0xF1, 0xA6, 0x7F, 0x78, 0xFC, 0xA7, -0x00, 0x93, 0xE1, 0x49, 0xB2, 0xB9, 0x1C, 0xBA, 0x6C, 0x40, -0x97, 0x72, 0xE4, 0xF5, 0x1C, 0x5A, 0x30, 0x08, 0x9D, 0x9D, -0x48, 0x9D, 0x9D, 0xE4, 0xA2, 0x51, 0x04, 0x06, 0x72, 0x42, -0x47, 0x08, 0x9D, 0xD4, 0x62, 0x86, 0x99, 0xB9, 0x30, 0x00, -0x69, 0x35, 0xF3, 0x07, 0x93, 0x9D, 0x57, 0x9E, 0x14, 0x3C, -0x33, 0xDE, 0xEF, 0xFF, 0x3D, 0xC0, 0xE8, 0xE8, 0x28, 0x16, -0xA3, 0x11, 0x91, 0x5F, 0xC4, 0x6A, 0xB4, 0x60, 0x5B, 0xD4, -0xE0, 0xCB, 0x1B, 0xE4, 0x67, 0x67, 0x49, 0x75, 0x77, 0xB3, -0xD0, 0xD9, 0x49, 0x7E, 0x62, 0x02, 0xF1, 0xF1, 0xC7, 0xB8, -0x64, 0x33, 0x46, 0x93, 0x15, 0x5D, 0x4B, 0x23, 0x1B, 0x61, -0xF2, 0x61, 0x00, 0x80, 0xF0, 0x74, 0xE8, 0x23, 0xC0, 0xF9, -0x8D, 0xE0, 0xDC, 0xA5, 0xB3, 0x57, 0x01, 0x86, 0x1E, 0x0E, -0xE2, 0x76, 0x9B, 0x49, 0x25, 0x33, 0x58, 0x4D, 0x4E, 0xD2, -0x5F, 0xDE, 0x60, 0xBE, 0xB1, 0x91, 0xF4, 0xE9, 0xD3, 0x64, -0x65, 0x99, 0x6E, 0xBF, 0x9F, 0xDE, 0x07, 0x0F, 0xC8, 0x68, -0x1A, 0xF1, 0xE3, 0xC7, 0x89, 0xAC, 0x5B, 0x87, 0x76, 0xFB, -0x0E, 0x16, 0x8B, 0x8D, 0xC5, 0x44, 0x0A, 0xDD, 0x00, 0x13, -0xC1, 0x11, 0xBC, 0x9E, 0x12, 0x7E, 0xFB, 0xF6, 0xAF, 0xAE, -0x7C, 0x2D, 0x58, 0x65, 0x2A, 0x6D, 0x7B, 0xF1, 0xB5, 0x15, -0x59, 0x5D, 0xC1, 0x9A, 0xB7, 0x90, 0xCC, 0x66, 0x29, 0xF4, -0x79, 0x50, 0xAE, 0x7E, 0x41, 0x6A, 0xFF, 0x7E, 0x26, 0x03, -0x01, 0xC6, 0x4B, 0x4A, 0x48, 0x38, 0x1C, 0xDC, 0x07, 0xEE, -0x03, 0xF9, 0xF2, 0x72, 0xFA, 0xEB, 0xEA, 0x98, 0x08, 0x04, -0x58, 0xD8, 0xBD, 0x1B, 0xB5, 0xA7, 0x17, 0xBB, 0xD7, 0x4B, -0x52, 0x40, 0x22, 0x9D, 0x23, 0x1E, 0x51, 0x39, 0x72, 0xF0, -0x78, 0xB3, 0xD3, 0x63, 0xF2, 0x1A, 0x5E, 0x3D, 0xD6, 0xD6, -0x06, 0x90, 0x34, 0xCC, 0x52, 0x51, 0x66, 0xA4, 0xCC, 0x67, -0x45, 0x8F, 0xA7, 0xF1, 0xEF, 0xDF, 0xCF, 0x98, 0xA2, 0x10, -0xDA, 0xB7, 0x8F, 0xA2, 0xDF, 0xFD, 0xE6, 0xE1, 0xC3, 0xB9, -0x39, 0x46, 0x80, 0x61, 0x20, 0xA1, 0x69, 0xAC, 0x7D, 0xFF, -0x4F, 0xD3, 0xCA, 0xD1, 0xA3, 0x0C, 0x28, 0x0A, 0x43, 0x7B, -0xF6, 0xE0, 0xB3, 0x3A, 0x71, 0xF6, 0x07, 0x70, 0x8C, 0xCC, -0x32, 0x75, 0xBF, 0x9F, 0x82, 0x12, 0x17, 0xAF, 0x1D, 0x3C, -0x78, 0xC0, 0xB0, 0xB3, 0xB8, 0x71, 0x25, 0x80, 0x57, 0xC9, -0x23, 0xAB, 0x60, 0xB2, 0x95, 0x71, 0xE5, 0xE4, 0x49, 0xB2, -0x9A, 0x46, 0xFF, 0xFA, 0xF5, 0xB4, 0x7C, 0xF8, 0x41, 0x72, -0x7E, 0x21, 0x3E, 0x3A, 0xAB, 0x69, 0x04, 0x01, 0x3F, 0x10, -0xD7, 0x75, 0xE6, 0xA3, 0xF1, 0xAE, 0xBA, 0x13, 0xC7, 0xE6, -0x86, 0xB6, 0x6D, 0x23, 0xAD, 0xAA, 0x7C, 0xFA, 0xD6, 0x5B, -0x14, 0x35, 0x35, 0x70, 0x6E, 0xB7, 0xE0, 0x4C, 0x73, 0x94, -0x53, 0x7C, 0xC5, 0xCA, 0x1F, 0x35, 0x2E, 0x37, 0x94, 0xBA, -0x8A, 0x76, 0x42, 0x92, 0x64, 0xD2, 0x4C, 0x96, 0x02, 0x66, -0x26, 0x27, 0xE9, 0x3B, 0x7F, 0x9E, 0x80, 0x24, 0xB1, 0xA4, -0xAD, 0x8D, 0xB0, 0xA2, 0x0C, 0xCD, 0x4C, 0x4E, 0x15, 0xC4, -0x01, 0x05, 0x98, 0x01, 0x32, 0x80, 0x51, 0x36, 0x2C, 0x9D, -0x9F, 0x9C, 0x19, 0xD8, 0x78, 0xE2, 0x04, 0x77, 0x81, 0xC1, -0x0B, 0x17, 0x98, 0x9D, 0x9A, 0xA2, 0x21, 0x5A, 0xCC, 0xB2, -0x1B, 0x69, 0xAA, 0x7A, 0x63, 0x48, 0xF7, 0x62, 0x3B, 0x0C, -0x5A, 0x46, 0x76, 0x8E, 0xC6, 0x54, 0xEE, 0x8A, 0x45, 0x62, -0x42, 0xA0, 0x46, 0xA3, 0x88, 0x58, 0x8C, 0x3E, 0x59, 0xA6, -0xB2, 0xB1, 0x91, 0x70, 0x68, 0x36, 0xBC, 0xBC, 0xA2, 0xD2, -0x91, 0x06, 0x0A, 0x01, 0x37, 0x90, 0x05, 0xB2, 0xB9, 0xB4, -0x5B, 0x4D, 0x65, 0xA6, 0xD7, 0xD7, 0xD7, 0x33, 0x08, 0xA8, -0xD3, 0xD3, 0xE4, 0xB3, 0x59, 0xAA, 0x14, 0x23, 0x85, 0xC1, -0x3C, 0xF9, 0xE9, 0x1C, 0x49, 0x55, 0xAC, 0x36, 0x7A, 0xED, -0xB2, 0x5A, 0x93, 0x2F, 0x2D, 0xAC, 0xE9, 0xF1, 0x40, 0x9D, -0x9D, 0x88, 0xF0, 0xA3, 0x02, 0x71, 0x49, 0xC2, 0x00, 0x84, -0x42, 0x7E, 0x93, 0x6F, 0xCD, 0x73, 0x23, 0x5B, 0x5A, 0x5A, -0x6A, 0x86, 0x5E, 0x7A, 0x89, 0x1A, 0x97, 0x8B, 0x35, 0xAB, -0x57, 0x33, 0x1E, 0x08, 0x8E, 0xC7, 0x17, 0x66, 0x65, 0xC4, -0x6A, 0x72, 0x40, 0x48, 0x08, 0xF2, 0x42, 0x90, 0x2C, 0x2E, -0x62, 0x7C, 0xFB, 0x5A, 0xCC, 0x45, 0x76, 0x34, 0x4F, 0xEC, -0x9E, 0xC1, 0xD8, 0x13, 0xF9, 0x3B, 0xFD, 0x10, 0x36, 0xFA, -0xF1, 0x6B, 0xE3, 0x14, 0xFA, 0x7C, 0xC4, 0x2D, 0x16, 0xBC, -0xB9, 0x1C, 0xD9, 0xAE, 0x2E, 0xAA, 0x2A, 0x97, 0xAF, 0xFB, -0xEB, 0xA7, 0x9F, 0x0D, 0x1B, 0x64, 0x5B, 0xC7, 0x9B, 0x67, -0xCE, 0x28, 0xC7, 0x4E, 0x9F, 0x8E, 0xCC, 0x45, 0x63, 0x1D, -0x43, 0x5D, 0x37, 0x83, 0x9A, 0x43, 0x6C, 0x98, 0xEE, 0xED, -0x25, 0x05, 0x14, 0x14, 0x17, 0x63, 0x37, 0x9B, 0xB1, 0xAA, -0x06, 0x2A, 0xC6, 0x34, 0xAA, 0x22, 0x3A, 0x86, 0xE1, 0xD9, -0xAB, 0xF2, 0x92, 0xB5, 0x85, 0xAB, 0xB4, 0xAD, 0xCE, 0xD6, -0xCB, 0xD1, 0xAF, 0x98, 0x5E, 0x08, 0xD1, 0x52, 0xD7, 0x8C, -0x6D, 0x6C, 0x8C, 0x78, 0x5F, 0x1F, 0x3E, 0x45, 0xA1, 0xEE, -0xD8, 0x1B, 0xAE, 0x44, 0x26, 0xBA, 0xF4, 0xDA, 0x17, 0x97, -0xEF, 0x29, 0x53, 0x73, 0x77, 0x87, 0xEE, 0xDD, 0x1B, 0x1E, -0xE8, 0xED, 0x4A, 0x2D, 0x29, 0x71, 0x35, 0x6E, 0x6A, 0xDE, -0x59, 0x7B, 0xEB, 0xE8, 0xCF, 0x51, 0x03, 0x01, 0xF6, 0x1E, -0x38, 0xC0, 0x77, 0xF6, 0xEE, 0xE5, 0xE6, 0xCC, 0x24, 0x8A, -0xDB, 0x8D, 0xB3, 0x6C, 0x19, 0x81, 0x8F, 0xFE, 0x72, 0x41, -0xC6, 0x5B, 0x1C, 0x68, 0xD9, 0xBC, 0xF1, 0x75, 0xAF, 0xE6, -0xC1, 0x96, 0x31, 0xA3, 0xC4, 0x53, 0x6C, 0xD9, 0xB1, 0x9D, -0xDC, 0x7B, 0xEF, 0x51, 0x11, 0x89, 0xE0, 0x9E, 0x09, 0x53, -0xFD, 0x93, 0x23, 0x3E, 0xA7, 0xB7, 0xB0, 0x6E, 0x74, 0xCA, -0x5F, 0x91, 0x33, 0x64, 0x6B, 0xD6, 0x3C, 0x5B, 0xBB, 0xE5, -0xBB, 0xCD, 0xDB, 0x97, 0x89, 0xB7, 0xDF, 0x21, 0x7C, 0xFE, -0x3C, 0x95, 0x66, 0x33, 0xAD, 0x97, 0x2E, 0x71, 0x7D, 0x60, -0x90, 0xF4, 0xE4, 0x30, 0xDE, 0xF4, 0x1C, 0xB9, 0x54, 0x82, -0xEE, 0xCF, 0xFF, 0xF6, 0xAA, 0x1C, 0x1C, 0x1B, 0x4B, 0x34, -0x6F, 0xD8, 0xB0, 0xEF, 0xD9, 0xF5, 0xCF, 0x95, 0x44, 0x63, -0x09, 0x52, 0x06, 0x05, 0x4F, 0x61, 0x11, 0x6B, 0x9E, 0xDF, -0x4C, 0xF9, 0xE0, 0x20, 0x56, 0xBB, 0x1D, 0xF1, 0x20, 0xC8, -0xB2, 0x95, 0xAB, 0xD8, 0xD4, 0xBC, 0xD5, 0xD9, 0x50, 0xBB, -0xC1, 0x55, 0x91, 0x43, 0x32, 0xBE, 0x7F, 0x16, 0x77, 0xFB, -0x65, 0x4A, 0x10, 0xAC, 0xBC, 0x70, 0x81, 0x70, 0xD1, 0x12, -0xC2, 0xA1, 0x00, 0x06, 0xA7, 0x87, 0xD2, 0xA5, 0xC5, 0xCC, -0x75, 0xDD, 0xBA, 0x72, 0xF2, 0xD4, 0x3B, 0x67, 0x25, 0x80, -0xDD, 0xAD, 0x5B, 0xAB, 0x4E, 0xBE, 0xFB, 0xC7, 0x89, 0xD9, -0x64, 0x08, 0x6D, 0x6C, 0x8A, 0x84, 0xAB, 0x9C, 0xFA, 0xDA, -0xD5, 0x54, 0x44, 0x16, 0x90, 0x7B, 0x7A, 0xC0, 0xE3, 0x81, -0xA2, 0x22, 0x44, 0x3E, 0x0F, 0xBA, 0x8E, 0x94, 0xCD, 0xC2, -0x84, 0x1F, 0x22, 0x51, 0xC4, 0xCB, 0x2F, 0x33, 0x57, 0xEC, -0x65, 0x3C, 0xF8, 0x10, 0x39, 0x9D, 0xC1, 0x6C, 0xCC, 0x63, -0xB2, 0x5B, 0xA9, 0x5D, 0xDB, 0x60, 0x03, 0xD2, 0x32, 0xC0, -0xC8, 0x78, 0x60, 0xC1, 0x66, 0xB7, 0xCE, 0xEF, 0xDA, 0xB2, -0xF1, 0x85, 0x99, 0x84, 0x15, 0x93, 0x55, 0xC2, 0x98, 0x4F, -0x43, 0x49, 0x19, 0xAE, 0xA6, 0x26, 0xA4, 0xCA, 0xE5, 0x60, -0xB7, 0x23, 0x15, 0x2D, 0x45, 0xF2, 0x15, 0x82, 0xD7, 0x0B, -0x0D, 0xCF, 0x43, 0x6B, 0x2B, 0x29, 0x9B, 0x89, 0x44, 0x22, -0x81, 0xCD, 0x68, 0xC2, 0x6E, 0x72, 0x50, 0xBA, 0xAC, 0x9C, -0xDB, 0xB7, 0x6F, 0xEF, 0xBA, 0x78, 0xF1, 0x93, 0xFB, 0x00, -0xF2, 0xA3, 0xB7, 0xFA, 0xCF, 0x1B, 0x9D, 0x5D, 0xEB, 0x6A, -0x37, 0x59, 0x37, 0x7F, 0xBF, 0xA9, 0xC9, 0xAA, 0x69, 0x84, -0x33, 0x39, 0x12, 0x09, 0x15, 0xC9, 0x20, 0xE1, 0xF1, 0x2D, -0x41, 0x58, 0x2C, 0x20, 0xCB, 0x60, 0xB6, 0x40, 0x81, 0x07, -0xC9, 0xE9, 0x44, 0x59, 0x88, 0x91, 0x4C, 0xA5, 0x30, 0x19, -0x65, 0x6C, 0x76, 0x27, 0x65, 0x15, 0xE5, 0x0C, 0x0D, 0x0F, -0x1F, 0xDA, 0xB6, 0x6D, 0xC7, 0x27, 0x8F, 0xB8, 0xD2, 0x93, -0x0B, 0xD4, 0xD1, 0xD1, 0xBE, 0xA7, 0x61, 0xE7, 0x0F, 0x3E, -0x53, 0x17, 0x14, 0xD2, 0xD9, 0x14, 0x19, 0x4D, 0xC7, 0x63, -0xB4, 0xE0, 0xB3, 0x39, 0x90, 0x2D, 0x66, 0x0C, 0x48, 0xE8, -0x42, 0xA0, 0xE9, 0x39, 0x64, 0x61, 0xC0, 0xE1, 0xB0, 0x3F, -0x7E, 0xFE, 0x3D, 0x49, 0x92, 0xAE, 0x3D, 0xD5, 0x72, 0x0A, -0x21, 0x4E, 0x45, 0x62, 0xD1, 0x45, 0x55, 0xCF, 0x8A, 0xD0, -0x5C, 0x44, 0xCC, 0xCF, 0x2B, 0x22, 0x16, 0x8B, 0x09, 0x35, -0xA9, 0x8A, 0xE4, 0x62, 0x42, 0xE4, 0xF5, 0xAF, 0xA7, 0x32, -0x1E, 0x8F, 0x2B, 0x42, 0x88, 0x5F, 0x3F, 0x0D, 0x53, 0x2A, -0x2F, 0x2F, 0x77, 0x17, 0x14, 0x14, 0x94, 0x78, 0xBD, 0xBE, -0xC2, 0x5D, 0x2F, 0xB4, 0x96, 0xBC, 0x7E, 0xF4, 0x17, 0x87, -0x22, 0xB3, 0x91, 0xFF, 0xB8, 0xFC, 0x37, 0xBB, 0xBB, 0x7B, -0x0E, 0x1F, 0x3E, 0x7C, 0xA4, 0xB6, 0xB6, 0xB6, 0x1A, 0x58, -0x0E, 0xAC, 0x02, 0xAC, 0xDF, 0x82, 0x3E, 0x5E, 0xEA, 0xEB, -0xEB, 0x9D, 0x6E, 0xB7, 0x5B, 0xAE, 0xA9, 0xA9, 0x29, 0xEA, -0xEB, 0x1B, 0xF0, 0x39, 0x5D, 0xF6, 0x54, 0x73, 0x53, 0x8B, -0xBB, 0xBA, 0xBA, 0xB2, 0x50, 0x36, 0x98, 0xDD, 0x66, 0xAB, -0xD5, 0x62, 0xB1, 0x5A, 0x6C, 0x06, 0x60, 0x26, 0x1C, 0x0E, -0x4D, 0x06, 0x83, 0x91, 0x54, 0x2A, 0xE5, 0x6C, 0x6F, 0x6F, -0x8F, 0x3B, 0x1C, 0x8E, 0x69, 0xBB, 0xDD, 0xAE, 0x5C, 0xBF, -0x7E, 0x5D, 0x05, 0x72, 0x8F, 0x98, 0xFF, 0x1A, 0x00, 0xFC, -0x64, 0x6E, 0x7F, 0x37, 0xBA, 0xF4, 0x32, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x57, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x69, 0x6C, 0x54, 0x55, 0x18, -0x3D, 0xD3, 0xD9, 0x3A, 0xFB, 0xBC, 0x59, 0xDE, 0x9B, 0x79, -0xAF, 0x33, 0xD3, 0xBE, 0x4E, 0x67, 0x6B, 0xA1, 0x74, 0x99, -0xD2, 0x95, 0x96, 0x62, 0x8B, 0x58, 0x96, 0x4A, 0x82, 0x4D, -0x04, 0xA2, 0x80, 0x80, 0x2C, 0x2A, 0xBB, 0x10, 0xD0, 0x96, -0x88, 0xA1, 0x48, 0x8C, 0x26, 0x04, 0x13, 0xA2, 0x44, 0xB6, -0x44, 0x13, 0xB1, 0x9A, 0x80, 0x85, 0xD0, 0x52, 0x45, 0x04, -0x4C, 0xDC, 0x08, 0x5B, 0x6B, 0x89, 0x11, 0x52, 0x22, 0x4B, -0xCB, 0x56, 0x59, 0x07, 0xDA, 0xCF, 0x3B, 0x13, 0x20, 0xB2, -0x05, 0xE2, 0x6F, 0x4F, 0x72, 0xB7, 0xF7, 0x6E, 0xBE, 0x73, -0xCF, 0xF9, 0xBE, 0x7B, 0x81, 0xFF, 0xF1, 0x04, 0x28, 0xEF, -0x5F, 0x2A, 0x0A, 0x73, 0xF3, 0x0B, 0x5E, 0x96, 0xE5, 0xB4, -0x19, 0x63, 0x9F, 0x1B, 0xB9, 0xF5, 0xB5, 0x59, 0xD3, 0x1B, -0xC6, 0x3C, 0x53, 0xD1, 0x30, 0x61, 0xDC, 0x0B, 0x0D, 0x6E, -0x41, 0xCC, 0x2F, 0xCF, 0xCD, 0xD7, 0xEF, 0xFB, 0xF5, 0xE7, -0x23, 0x6C, 0x63, 0xFF, 0xD3, 0x12, 0x28, 0xEE, 0x4E, 0xBE, -0xDA, 0xDA, 0xB4, 0x76, 0xEA, 0x8C, 0xD9, 0x33, 0x7B, 0xBA, -0xFF, 0xC2, 0xE2, 0x45, 0x2B, 0xD0, 0xF8, 0xDE, 0x4A, 0x8C, -0xA8, 0xA9, 0x86, 0x56, 0xA7, 0x45, 0xD0, 0x2B, 0xA1, 0xF1, -0xFD, 0xD5, 0x38, 0xF0, 0x5D, 0x2B, 0xDA, 0x3B, 0x3B, 0x71, -0xE5, 0xCA, 0x95, 0x0E, 0x91, 0xE7, 0xCB, 0xC6, 0x4D, 0x9C, -0xDC, 0xF3, 0x54, 0x0A, 0x88, 0xE8, 0xDB, 0x50, 0x24, 0x3C, -0x6E, 0xD1, 0xC2, 0xF9, 0x98, 0xBF, 0xE0, 0x75, 0x7C, 0xD9, -0xF4, 0x19, 0x0E, 0xB7, 0x1F, 0x42, 0x67, 0xFB, 0x11, 0xD8, -0xCC, 0x02, 0x23, 0xD1, 0x61, 0xE6, 0xDC, 0x79, 0x58, 0xB1, -0xF2, 0x5D, 0xE8, 0x92, 0x00, 0xC1, 0x95, 0xE2, 0x70, 0x38, -0xB8, 0x45, 0xB9, 0x05, 0x79, 0xC3, 0xB7, 0x6F, 0xDF, 0xF1, -0x05, 0x0B, 0x71, 0xF3, 0x71, 0x04, 0x2A, 0x51, 0x14, 0xC7, -0xB0, 0xB1, 0xE2, 0x78, 0xC7, 0x61, 0xE8, 0x8C, 0x46, 0x98, -0xF5, 0x16, 0xAC, 0x5F, 0xBF, 0x21, 0xD1, 0x0E, 0xEC, 0x3F, -0x80, 0xA9, 0xD3, 0xA7, 0x61, 0xE3, 0xA6, 0xDD, 0x89, 0xCD, -0x26, 0xBD, 0x29, 0x7E, 0x18, 0xFC, 0x76, 0xF0, 0x08, 0x38, -0x5E, 0x87, 0xE9, 0x85, 0x83, 0x8B, 0x24, 0xA7, 0xE7, 0xF2, -0xA8, 0xB1, 0xB5, 0x93, 0xD8, 0xEF, 0x0D, 0x8F, 0x54, 0xA0, -0xD7, 0xD9, 0x3B, 0x16, 0x2C, 0x9C, 0x03, 0xBD, 0x91, 0xC3, -0xB9, 0xD3, 0x67, 0xC0, 0x09, 0x76, 0x9C, 0x3E, 0x75, 0x0A, -0xAD, 0xBB, 0xBE, 0x41, 0x49, 0x71, 0x29, 0xE6, 0xCC, 0x9D, -0x8B, 0x86, 0x86, 0x06, 0xD4, 0x8C, 0x1A, 0x8E, 0xA5, 0x4B, -0x96, 0xE2, 0xEC, 0xE9, 0xD3, 0x30, 0x5B, 0x0D, 0x30, 0xA8, -0x2C, 0xE8, 0xE9, 0xBD, 0x8C, 0x68, 0x41, 0x01, 0x74, 0x06, -0x43, 0x6D, 0x6B, 0x4B, 0xCB, 0x46, 0x16, 0xEF, 0xD2, 0x43, -0x39, 0x50, 0x42, 0x4B, 0x53, 0xA6, 0xBD, 0x84, 0x75, 0xEB, -0xD6, 0x25, 0x3E, 0xB4, 0xB5, 0xED, 0x81, 0xA2, 0x2F, 0x86, -0xFC, 0xC2, 0x22, 0x5C, 0xBF, 0x71, 0x13, 0xDD, 0xA7, 0xCE, -0xC0, 0xCA, 0x5B, 0x20, 0x49, 0x29, 0xB8, 0x7C, 0xE9, 0x02, -0x8E, 0xB6, 0x77, 0x80, 0xE7, 0x39, 0x24, 0x91, 0x16, 0x7D, -0xB7, 0xFA, 0x91, 0x11, 0xF6, 0xA3, 0xA3, 0xF3, 0x38, 0x72, -0x06, 0x66, 0xE3, 0xC6, 0xCD, 0xEB, 0x8A, 0x07, 0x09, 0x92, -0x86, 0x8F, 0x2C, 0x9F, 0xF8, 0xF9, 0xE6, 0xAD, 0x90, 0xFD, -0x32, 0x4E, 0x9C, 0x38, 0x8E, 0xCA, 0xCA, 0x72, 0x0C, 0xAD, -0xAA, 0x82, 0x52, 0xA9, 0x82, 0x5A, 0x45, 0xE0, 0x44, 0x3B, -0xFA, 0xFA, 0x08, 0xC7, 0x3B, 0x8F, 0xA2, 0xAB, 0xAB, 0x0B, -0xC6, 0x64, 0x1D, 0x62, 0xD7, 0x62, 0xB8, 0x41, 0x97, 0x61, -0xB1, 0x5B, 0x13, 0x41, 0x7E, 0xFA, 0x71, 0x1F, 0x4A, 0xA3, -0xE5, 0x70, 0x72, 0xDE, 0xDE, 0x87, 0x08, 0x9A, 0xB7, 0xEF, -0xDA, 0x92, 0xE1, 0x4F, 0x8B, 0x65, 0xF8, 0x22, 0x28, 0x2A, -0xAC, 0x42, 0xED, 0xE8, 0x91, 0xF8, 0x7E, 0xEF, 0x5E, 0xE8, -0xF5, 0xC9, 0xE0, 0x38, 0x07, 0x44, 0xC1, 0x05, 0xAF, 0xD7, -0x83, 0x74, 0x39, 0x02, 0x39, 0x3D, 0x00, 0xA3, 0x59, 0x09, -0x93, 0x51, 0x87, 0x48, 0x46, 0x0E, 0x53, 0xE2, 0xC0, 0xAA, -0xC6, 0x77, 0xD1, 0xF0, 0xCE, 0x6A, 0x6C, 0xD8, 0xBC, 0x09, -0xC3, 0x2A, 0xCB, 0x4C, 0x1A, 0x7D, 0xF2, 0x8C, 0xFB, 0x08, -0xE2, 0x9D, 0xDE, 0x68, 0xA8, 0xD7, 0x6A, 0x81, 0xB2, 0x92, -0x62, 0x6C, 0x6B, 0x6E, 0x43, 0xF9, 0x90, 0x21, 0x50, 0x28, -0x14, 0x98, 0x35, 0x7B, 0x16, 0xDE, 0xAE, 0xAF, 0x47, 0x3B, -0xB3, 0xA5, 0x8F, 0x62, 0x50, 0x6B, 0x14, 0x70, 0x58, 0x79, -0x5C, 0xB8, 0x78, 0x91, 0xE5, 0xA5, 0x1E, 0x2E, 0x97, 0x1B, -0x8B, 0x97, 0x2C, 0x83, 0x2A, 0x49, 0x89, 0x3F, 0xBB, 0x4E, -0x62, 0xF9, 0xF2, 0x65, 0x70, 0x5A, 0xC5, 0x8F, 0x58, 0x48, -0xF5, 0xBD, 0x1C, 0xDC, 0x9D, 0x78, 0x7D, 0x72, 0x4C, 0x74, -0xDA, 0xD4, 0x7D, 0x49, 0x0A, 0x3C, 0x5F, 0x3B, 0x16, 0x8D, -0xAB, 0x57, 0x41, 0x11, 0x53, 0xB3, 0xCA, 0xD1, 0xE3, 0x54, -0xF7, 0xC9, 0xC7, 0x55, 0x21, 0xB2, 0xB2, 0x32, 0x71, 0xF3, -0x5A, 0x3F, 0x4C, 0x66, 0x0E, 0x53, 0xA7, 0x4C, 0xC6, 0x0F, -0xFB, 0xF7, 0x60, 0xDB, 0xF6, 0x96, 0x2D, 0xBD, 0x7F, 0x9F, -0x99, 0x78, 0x4F, 0x41, 0x1C, 0x2E, 0x9E, 0x97, 0x0E, 0xFE, -0xCE, 0x2E, 0x29, 0xA9, 0xD1, 0xDC, 0xDC, 0x8C, 0x14, 0xD1, -0x85, 0xEC, 0xDC, 0x6C, 0x8C, 0xAE, 0x1D, 0x83, 0xF1, 0x2F, -0x4E, 0xC2, 0xA0, 0xCC, 0x3C, 0xB8, 0x24, 0x09, 0x0E, 0xBB, -0x1D, 0x16, 0x8B, 0x85, 0xD9, 0x23, 0xC0, 0xC5, 0xF6, 0x5C, -0x38, 0x7F, 0x0E, 0x4A, 0x4D, 0x12, 0xCE, 0xF6, 0x9C, 0xC4, -0xDC, 0x37, 0xE7, 0xE1, 0x7A, 0xEF, 0x35, 0xE4, 0x46, 0x23, -0x13, 0x1E, 0xCA, 0x45, 0xBC, 0x2B, 0x2D, 0x2C, 0x9B, 0xAC, -0xD6, 0x24, 0x53, 0x30, 0x14, 0xA2, 0x9A, 0xEA, 0x51, 0x54, -0x57, 0x5B, 0x47, 0x65, 0x85, 0x95, 0x94, 0x9F, 0x17, 0xA5, -0xEA, 0xCA, 0x6A, 0xCA, 0xCD, 0x29, 0x21, 0x97, 0x24, 0x92, -0xD3, 0xC9, 0x91, 0xD5, 0x6A, 0x23, 0x93, 0xC9, 0x48, 0x0E, -0x07, 0x4F, 0x3E, 0x9F, 0x87, 0x42, 0xC1, 0x2C, 0x8A, 0x44, -0xC2, 0x14, 0x0A, 0x67, 0x51, 0xF5, 0xD0, 0x11, 0x54, 0x54, -0xC2, 0x7C, 0x7E, 0x00, 0xAA, 0x84, 0x55, 0x5E, 0xDF, 0x4C, -0xAD, 0x5A, 0x4B, 0xA9, 0xE9, 0x11, 0xCA, 0x1C, 0x10, 0xA5, -0x57, 0x5F, 0x99, 0x46, 0xCB, 0x16, 0xBD, 0x45, 0x75, 0x75, -0x13, 0x28, 0x1A, 0x2D, 0x23, 0x59, 0xF6, 0x92, 0xCD, 0x61, -0x23, 0x1B, 0x67, 0x23, 0xA6, 0x84, 0x5C, 0x2E, 0x17, 0x79, -0x3C, 0x3E, 0x4A, 0x4F, 0x4B, 0xA3, 0x60, 0x24, 0x42, 0x81, -0xF4, 0x4C, 0x1A, 0x52, 0x5A, 0x45, 0xC5, 0x05, 0xC5, 0x6D, -0xF7, 0xE5, 0xE0, 0x0E, 0x58, 0xAA, 0x11, 0xF3, 0xF9, 0x52, -0xDF, 0x38, 0x7F, 0xBE, 0xFB, 0x03, 0x9E, 0xB7, 0xC1, 0x60, -0x70, 0x63, 0x60, 0x38, 0x13, 0xD9, 0x83, 0x07, 0xE0, 0x8F, -0x43, 0x1D, 0xF8, 0x7A, 0xE7, 0x0E, 0x66, 0x63, 0x3F, 0x6E, -0xF5, 0x5F, 0x65, 0x4F, 0x5E, 0x5C, 0x38, 0x41, 0xA7, 0x33, -0x41, 0xAB, 0xD5, 0xB1, 0xD2, 0x66, 0x6F, 0x20, 0xA9, 0x60, -0x73, 0x58, 0xC0, 0xE9, 0x4D, 0xBF, 0xEC, 0x6C, 0x6B, 0xC9, -0x7F, 0xE8, 0x62, 0x44, 0xB2, 0x22, 0xFC, 0xB1, 0x23, 0xC7, -0x2E, 0xB9, 0x05, 0x57, 0x4D, 0xF7, 0x85, 0x9E, 0x26, 0x93, -0x5E, 0x07, 0xA7, 0xCB, 0x8B, 0xBC, 0xEC, 0xC1, 0x88, 0x66, -0x47, 0xB0, 0xE6, 0x93, 0x8F, 0x71, 0xED, 0xC6, 0x55, 0xDC, -0x8E, 0xB1, 0x76, 0x9B, 0xC9, 0x56, 0xA9, 0x58, 0x70, 0x4D, -0xE2, 0xDE, 0x68, 0x34, 0xEC, 0x7C, 0x4A, 0x82, 0xD9, 0x68, -0x81, 0xCD, 0x60, 0xED, 0xDD, 0xBD, 0xB7, 0xD5, 0xF2, 0xC8, -0xCA, 0xD0, 0x6A, 0xB4, 0xBC, 0xE0, 0x72, 0x9B, 0x7C, 0x9E, -0xB4, 0x42, 0x95, 0x2A, 0xE9, 0x56, 0xB2, 0x4E, 0x43, 0x19, -0xA1, 0x81, 0x34, 0x65, 0xFC, 0x64, 0x2A, 0x1F, 0x5A, 0x43, -0x82, 0xDB, 0x43, 0x76, 0xBB, 0x95, 0xF9, 0xEF, 0x20, 0x9B, -0xCD, 0x42, 0x92, 0x24, 0x51, 0x6A, 0xAA, 0x9F, 0xD2, 0xE4, -0x74, 0xF2, 0xFB, 0x83, 0x94, 0x97, 0x9D, 0x47, 0xC5, 0x45, -0x25, 0x9F, 0x3E, 0xB6, 0xF4, 0xEE, 0x20, 0xD9, 0xEE, 0xE4, -0xA4, 0x38, 0x1F, 0xCF, 0xF3, 0x2B, 0xE3, 0x5E, 0x18, 0x8C, -0x66, 0xAA, 0x28, 0xAF, 0xA0, 0x70, 0x38, 0x44, 0x82, 0x20, -0x30, 0xFF, 0x79, 0x96, 0xF0, 0xF8, 0x28, 0x32, 0x82, 0x34, -0xF2, 0xCB, 0x7E, 0x0A, 0xB0, 0x02, 0x09, 0x85, 0x22, 0x17, -0x9F, 0x14, 0xFC, 0x2E, 0x94, 0x5A, 0xAD, 0x3A, 0x24, 0xB9, -0x45, 0x21, 0x27, 0x27, 0x1A, 0x60, 0xC9, 0x6C, 0x34, 0xE8, -0x8C, 0xC4, 0xD9, 0xB8, 0xC4, 0xE9, 0xD9, 0x45, 0x23, 0xB7, -0xDB, 0x45, 0xA2, 0xE8, 0x4D, 0x28, 0xF0, 0xC5, 0x49, 0xD2, -0x83, 0x4D, 0xE1, 0x81, 0x03, 0x4C, 0x35, 0xC3, 0x9E, 0xB5, -0x3D, 0x2D, 0x09, 0x0C, 0x7A, 0xA3, 0x9D, 0xB3, 0x99, 0xA3, -0x72, 0x6A, 0x50, 0x64, 0x4B, 0x5D, 0x4A, 0x8A, 0x94, 0xC1, -0xCA, 0x74, 0x8E, 0xD5, 0x6A, 0xFD, 0x90, 0x29, 0x59, 0x23, -0x08, 0xEE, 0xB5, 0x92, 0xE4, 0x9B, 0x1D, 0x08, 0x04, 0xF8, -0x50, 0x28, 0x2C, 0x06, 0x33, 0xB2, 0xC2, 0x4F, 0x1D, 0xFC, -0xDF, 0xB0, 0x58, 0x6D, 0xBC, 0xC7, 0x93, 0x32, 0x88, 0x59, -0x12, 0x62, 0xE5, 0xE9, 0xF0, 0x78, 0x24, 0x07, 0xB3, 0xCF, -0xCA, 0x4E, 0x6F, 0x97, 0xE5, 0x80, 0x43, 0x96, 0xE5, 0xEC, -0x60, 0x38, 0xD3, 0xFB, 0x9F, 0x82, 0x3F, 0x02, 0x5A, 0xA6, -0xC0, 0xC4, 0x71, 0x16, 0xBD, 0x20, 0x88, 0xA6, 0xB8, 0xB2, -0x47, 0x6D, 0xFA, 0x07, 0xB6, 0x5C, 0xA9, 0xA4, 0x39, 0x43, -0x02, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop new file mode 100644 index 0000000000..f201f07f22 --- /dev/null +++ b/Source/Core/DolphinWX/resources/dolphin-emu.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Dolphin Emulator +Comment=A Wii/GameCube Emulator +Icon=dolphin-emu +Exec=dolphin-emu +Categories=Game; + diff --git a/Source/Core/DolphinWX/resources/no_banner.cpp b/Source/Core/DolphinWX/resources/no_banner.cpp deleted file mode 100644 index 2b84caa430..0000000000 --- a/Source/Core/DolphinWX/resources/no_banner.cpp +++ /dev/null @@ -1,279 +0,0 @@ -static const unsigned char no_banner_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, -0x08, 0x06, 0x00, 0x00, 0x00, 0xed, 0xc0, 0x7d, 0x54, 0x00, 0x00, 0x00, -0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, -0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x0a, 0x4f, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, -0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x00, -0x00, 0x78, 0xda, 0x9d, 0x53, 0x67, 0x54, 0x53, 0xe9, 0x16, 0x3d, 0xf7, -0xde, 0xf4, 0x42, 0x4b, 0x88, 0x80, 0x94, 0x4b, 0x6f, 0x52, 0x15, 0x08, -0x20, 0x52, 0x42, 0x8b, 0x80, 0x14, 0x91, 0x26, 0x2a, 0x21, 0x09, 0x10, -0x4a, 0x88, 0x21, 0xa1, 0xd9, 0x15, 0x51, 0xc1, 0x11, 0x45, 0x45, 0x04, -0x1b, 0xc8, 0xa0, 0x88, 0x03, 0x8e, 0x8e, 0x80, 0x8c, 0x15, 0x51, 0x2c, -0x0c, 0x8a, 0x0a, 0xd8, 0x07, 0xe4, 0x21, 0xa2, 0x8e, 0x83, 0xa3, 0x88, -0x8a, 0xca, 0xfb, 0xe1, 0x7b, 0xa3, 0x6b, 0xd6, 0xbc, 0xf7, 0xe6, 0xcd, -0xfe, 0xb5, 0xd7, 0x3e, 0xe7, 0xac, 0xf3, 0x9d, 0xb3, 0xcf, 0x07, 0xc0, -0x08, 0x0c, 0x96, 0x48, 0x33, 0x51, 0x35, 0x80, 0x0c, 0xa9, 0x42, 0x1e, -0x11, 0xe0, 0x83, 0xc7, 0xc4, 0xc6, 0xe1, 0xe4, 0x2e, 0x40, 0x81, 0x0a, -0x24, 0x70, 0x00, 0x10, 0x08, 0xb3, 0x64, 0x21, 0x73, 0xfd, 0x23, 0x01, -0x00, 0xf8, 0x7e, 0x3c, 0x3c, 0x2b, 0x22, 0xc0, 0x07, 0xbe, 0x00, 0x01, -0x78, 0xd3, 0x0b, 0x08, 0x00, 0xc0, 0x4d, 0x9b, 0xc0, 0x30, 0x1c, 0x87, -0xff, 0x0f, 0xea, 0x42, 0x99, 0x5c, 0x01, 0x80, 0x84, 0x01, 0xc0, 0x74, -0x91, 0x38, 0x4b, 0x08, 0x80, 0x14, 0x00, 0x40, 0x7a, 0x8e, 0x42, 0xa6, -0x00, 0x40, 0x46, 0x01, 0x80, 0x9d, 0x98, 0x26, 0x53, 0x00, 0xa0, 0x04, -0x00, 0x60, 0xcb, 0x63, 0x62, 0xe3, 0x00, 0x50, 0x2d, 0x00, 0x60, 0x27, -0x7f, 0xe6, 0xd3, 0x00, 0x80, 0x9d, 0xf8, 0x99, 0x7b, 0x01, 0x00, 0x5b, -0x94, 0x21, 0x15, 0x01, 0xa0, 0x91, 0x00, 0x20, 0x13, 0x65, 0x88, 0x44, -0x00, 0x68, 0x3b, 0x00, 0xac, 0xcf, 0x56, 0x8a, 0x45, 0x00, 0x58, 0x30, -0x00, 0x14, 0x66, 0x4b, 0xc4, 0x39, 0x00, 0xd8, 0x2d, 0x00, 0x30, 0x49, -0x57, 0x66, 0x48, 0x00, 0xb0, 0xb7, 0x00, 0xc0, 0xce, 0x10, 0x0b, 0xb2, -0x00, 0x08, 0x0c, 0x00, 0x30, 0x51, 0x88, 0x85, 0x29, 0x00, 0x04, 0x7b, -0x00, 0x60, 0xc8, 0x23, 0x23, 0x78, 0x00, 0x84, 0x99, 0x00, 0x14, 0x46, -0xf2, 0x57, 0x3c, 0xf1, 0x2b, 0xae, 0x10, 0xe7, 0x2a, 0x00, 0x00, 0x78, -0x99, 0xb2, 0x3c, 0xb9, 0x24, 0x39, 0x45, 0x81, 0x5b, 0x08, 0x2d, 0x71, -0x07, 0x57, 0x57, 0x2e, 0x1e, 0x28, 0xce, 0x49, 0x17, 0x2b, 0x14, 0x36, -0x61, 0x02, 0x61, 0x9a, 0x40, 0x2e, 0xc2, 0x79, 0x99, 0x19, 0x32, 0x81, -0x34, 0x0f, 0xe0, 0xf3, 0xcc, 0x00, 0x00, 0xa0, 0x91, 0x15, 0x11, 0xe0, -0x83, 0xf3, 0xfd, 0x78, 0xce, 0x0e, 0xae, 0xce, 0xce, 0x36, 0x8e, 0xb6, -0x0e, 0x5f, 0x2d, 0xea, 0xbf, 0x06, 0xff, 0x22, 0x62, 0x62, 0xe3, 0xfe, -0xe5, 0xcf, 0xab, 0x70, 0x40, 0x00, 0x00, 0xe1, 0x74, 0x7e, 0xd1, 0xfe, -0x2c, 0x2f, 0xb3, 0x1a, 0x80, 0x3b, 0x06, 0x80, 0x6d, 0xfe, 0xa2, 0x25, -0xee, 0x04, 0x68, 0x5e, 0x0b, 0xa0, 0x75, 0xf7, 0x8b, 0x66, 0xb2, 0x0f, -0x40, 0xb5, 0x00, 0xa0, 0xe9, 0xda, 0x57, 0xf3, 0x70, 0xf8, 0x7e, 0x3c, -0x3c, 0x45, 0xa1, 0x90, 0xb9, 0xd9, 0xd9, 0xe5, 0xe4, 0xe4, 0xd8, 0x4a, -0xc4, 0x42, 0x5b, 0x61, 0xca, 0x57, 0x7d, 0xfe, 0x67, 0xc2, 0x5f, 0xc0, -0x57, 0xfd, 0x6c, 0xf9, 0x7e, 0x3c, 0xfc, 0xf7, 0xf5, 0xe0, 0xbe, 0xe2, -0x24, 0x81, 0x32, 0x5d, 0x81, 0x47, 0x04, 0xf8, 0xe0, 0xc2, 0xcc, 0xf4, -0x4c, 0xa5, 0x1c, 0xcf, 0x92, 0x09, 0x84, 0x62, 0xdc, 0xe6, 0x8f, 0x47, -0xfc, 0xb7, 0x0b, 0xff, 0xfc, 0x1d, 0xd3, 0x22, 0xc4, 0x49, 0x62, 0xb9, -0x58, 0x2a, 0x14, 0xe3, 0x51, 0x12, 0x71, 0x8e, 0x44, 0x9a, 0x8c, 0xf3, -0x32, 0xa5, 0x22, 0x89, 0x42, 0x92, 0x29, 0xc5, 0x25, 0xd2, 0xff, 0x64, -0xe2, 0xdf, 0x2c, 0xfb, 0x03, 0x3e, 0xdf, 0x35, 0x00, 0xb0, 0x6a, 0x3e, -0x01, 0x7b, 0x91, 0x2d, 0xa8, 0x5d, 0x63, 0x03, 0xf6, 0x4b, 0x27, 0x10, -0x58, 0x74, 0xc0, 0xe2, 0xf7, 0x00, 0x00, 0xf2, 0xbb, 0x6f, 0xc1, 0xd4, -0x28, 0x08, 0x03, 0x80, 0x68, 0x83, 0xe1, 0xcf, 0x77, 0xff, 0xef, 0x3f, -0xfd, 0x47, 0xa0, 0x25, 0x00, 0x80, 0x66, 0x49, 0x92, 0x71, 0x00, 0x00, -0x5e, 0x44, 0x24, 0x2e, 0x54, 0xca, 0xb3, 0x3f, 0xc7, 0x08, 0x00, 0x00, -0x44, 0xa0, 0x81, 0x2a, 0xb0, 0x41, 0x1b, 0xf4, 0xc1, 0x18, 0x2c, 0xc0, -0x06, 0x1c, 0xc1, 0x05, 0xdc, 0xc1, 0x0b, 0xfc, 0x60, 0x36, 0x84, 0x42, -0x24, 0xc4, 0xc2, 0x42, 0x10, 0x42, 0x0a, 0x64, 0x80, 0x1c, 0x72, 0x60, -0x29, 0xac, 0x82, 0x42, 0x28, 0x86, 0xcd, 0xb0, 0x1d, 0x2a, 0x60, 0x2f, -0xd4, 0x40, 0x1d, 0x34, 0xc0, 0x51, 0x68, 0x86, 0x93, 0x70, 0x0e, 0x2e, -0xc2, 0x55, 0xb8, 0x0e, 0x3d, 0x70, 0x0f, 0xfa, 0x61, 0x08, 0x9e, 0xc1, -0x28, 0xbc, 0x81, 0x09, 0x04, 0x41, 0xc8, 0x08, 0x13, 0x61, 0x21, 0xda, -0x88, 0x01, 0x62, 0x8a, 0x58, 0x23, 0x8e, 0x08, 0x17, 0x99, 0x85, 0xf8, -0x21, 0xc1, 0x48, 0x04, 0x12, 0x8b, 0x24, 0x20, 0xc9, 0x88, 0x14, 0x51, -0x22, 0x4b, 0x91, 0x35, 0x48, 0x31, 0x52, 0x8a, 0x54, 0x20, 0x55, 0x48, -0x1d, 0xf2, 0x3d, 0x72, 0x02, 0x39, 0x87, 0x5c, 0x46, 0xba, 0x91, 0x3b, -0xc8, 0x00, 0x32, 0x82, 0xfc, 0x86, 0xbc, 0x47, 0x31, 0x94, 0x81, 0xb2, -0x51, 0x3d, 0xd4, 0x0c, 0xb5, 0x43, 0xb9, 0xa8, 0x37, 0x1a, 0x84, 0x46, -0xa2, 0x0b, 0xd0, 0x64, 0x74, 0x31, 0x9a, 0x8f, 0x16, 0xa0, 0x9b, 0xd0, -0x72, 0xb4, 0x1a, 0x3d, 0x8c, 0x36, 0xa1, 0xe7, 0xd0, 0xab, 0x68, 0x0f, -0xda, 0x8f, 0x3e, 0x43, 0xc7, 0x30, 0xc0, 0xe8, 0x18, 0x07, 0x33, 0xc4, -0x6c, 0x30, 0x2e, 0xc6, 0xc3, 0x42, 0xb1, 0x38, 0x2c, 0x09, 0x93, 0x63, -0xcb, 0xb1, 0x22, 0xac, 0x0c, 0xab, 0xc6, 0x1a, 0xb0, 0x56, 0xac, 0x03, -0xbb, 0x89, 0xf5, 0x63, 0xcf, 0xb1, 0x77, 0x04, 0x12, 0x81, 0x45, 0xc0, -0x09, 0x36, 0x04, 0x77, 0x42, 0x20, 0x61, 0x1e, 0x41, 0x48, 0x58, 0x4c, -0x58, 0x4e, 0xd8, 0x48, 0xa8, 0x20, 0x1c, 0x24, 0x34, 0x11, 0xda, 0x09, -0x37, 0x09, 0x03, 0x84, 0x51, 0xc2, 0x27, 0x22, 0x93, 0xa8, 0x4b, 0xb4, -0x26, 0xba, 0x11, 0xf9, 0xc4, 0x18, 0x62, 0x32, 0x31, 0x87, 0x58, 0x48, -0x2c, 0x23, 0xd6, 0x12, 0x8f, 0x13, 0x2f, 0x10, 0x7b, 0x88, 0x43, 0xc4, -0x37, 0x24, 0x12, 0x89, 0x43, 0x32, 0x27, 0xb9, 0x90, 0x02, 0x49, 0xb1, -0xa4, 0x54, 0xd2, 0x12, 0xd2, 0x46, 0xd2, 0x6e, 0x52, 0x23, 0xe9, 0x2c, -0xa9, 0x9b, 0x34, 0x48, 0x1a, 0x23, 0x93, 0xc9, 0xda, 0x64, 0x6b, 0xb2, -0x07, 0x39, 0x94, 0x2c, 0x20, 0x2b, 0xc8, 0x85, 0xe4, 0x9d, 0xe4, 0xc3, -0xe4, 0x33, 0xe4, 0x1b, 0xe4, 0x21, 0xf2, 0x5b, 0x0a, 0x9d, 0x62, 0x40, -0x71, 0xa4, 0xf8, 0x53, 0xe2, 0x28, 0x52, 0xca, 0x6a, 0x4a, 0x19, 0xe5, -0x10, 0xe5, 0x34, 0xe5, 0x06, 0x65, 0x98, 0x32, 0x41, 0x55, 0xa3, 0x9a, -0x52, 0xdd, 0xa8, 0xa1, 0x54, 0x11, 0x35, 0x8f, 0x5a, 0x42, 0xad, 0xa1, -0xb6, 0x52, 0xaf, 0x51, 0x87, 0xa8, 0x13, 0x34, 0x75, 0x9a, 0x39, 0xcd, -0x83, 0x16, 0x49, 0x4b, 0xa5, 0xad, 0xa2, 0x95, 0xd3, 0x1a, 0x68, 0x17, -0x68, 0xf7, 0x69, 0xaf, 0xe8, 0x74, 0xba, 0x11, 0xdd, 0x95, 0x1e, 0x4e, -0x97, 0xd0, 0x57, 0xd2, 0xcb, 0xe9, 0x47, 0xe8, 0x97, 0xe8, 0x03, 0xf4, -0x77, 0x0c, 0x0d, 0x86, 0x15, 0x83, 0xc7, 0x88, 0x67, 0x28, 0x19, 0x9b, -0x18, 0x07, 0x18, 0x67, 0x19, 0x77, 0x18, 0xaf, 0x98, 0x4c, 0xa6, 0x19, -0xd3, 0x8b, 0x19, 0xc7, 0x54, 0x30, 0x37, 0x31, 0xeb, 0x98, 0xe7, 0x99, -0x0f, 0x99, 0x6f, 0x55, 0x58, 0x2a, 0xb6, 0x2a, 0x7c, 0x15, 0x91, 0xca, -0x0a, 0x95, 0x4a, 0x95, 0x26, 0x95, 0x1b, 0x2a, 0x2f, 0x54, 0xa9, 0xaa, -0xa6, 0xaa, 0xde, 0xaa, 0x0b, 0x55, 0xf3, 0x55, 0xcb, 0x54, 0x8f, 0xa9, -0x5e, 0x53, 0x7d, 0xae, 0x46, 0x55, 0x33, 0x53, 0xe3, 0xa9, 0x09, 0xd4, -0x96, 0xab, 0x55, 0xaa, 0x9d, 0x50, 0xeb, 0x53, 0x1b, 0x53, 0x67, 0xa9, -0x3b, 0xa8, 0x87, 0xaa, 0x67, 0xa8, 0x6f, 0x54, 0x3f, 0xa4, 0x7e, 0x59, -0xfd, 0x89, 0x06, 0x59, 0xc3, 0x4c, 0xc3, 0x4f, 0x43, 0xa4, 0x51, 0xa0, -0xb1, 0x5f, 0xe3, 0xbc, 0xc6, 0x20, 0x0b, 0x63, 0x19, 0xb3, 0x78, 0x2c, -0x21, 0x6b, 0x0d, 0xab, 0x86, 0x75, 0x81, 0x35, 0xc4, 0x26, 0xb1, 0xcd, -0xd9, 0x7c, 0x76, 0x2a, 0xbb, 0x98, 0xfd, 0x1d, 0xbb, 0x8b, 0x3d, 0xaa, -0xa9, 0xa1, 0x39, 0x43, 0x33, 0x4a, 0x33, 0x57, 0xb3, 0x52, 0xf3, 0x94, -0x66, 0x3f, 0x07, 0xe3, 0x98, 0x71, 0xf8, 0x9c, 0x74, 0x4e, 0x09, 0xe7, -0x28, 0xa7, 0x97, 0xf3, 0x7e, 0x8a, 0xde, 0x14, 0xef, 0x29, 0xe2, 0x29, -0x1b, 0xa6, 0x34, 0x4c, 0xb9, 0x31, 0x65, 0x5c, 0x6b, 0xaa, 0x96, 0x97, -0x96, 0x58, 0xab, 0x48, 0xab, 0x51, 0xab, 0x47, 0xeb, 0xbd, 0x36, 0xae, -0xed, 0xa7, 0x9d, 0xa6, 0xbd, 0x45, 0xbb, 0x59, 0xfb, 0x81, 0x0e, 0x41, -0xc7, 0x4a, 0x27, 0x5c, 0x27, 0x47, 0x67, 0x8f, 0xce, 0x05, 0x9d, 0xe7, -0x53, 0xd9, 0x53, 0xdd, 0xa7, 0x0a, 0xa7, 0x16, 0x4d, 0x3d, 0x3a, 0xf5, -0xae, 0x2e, 0xaa, 0x6b, 0xa5, 0x1b, 0xa1, 0xbb, 0x44, 0x77, 0xbf, 0x6e, -0xa7, 0xee, 0x98, 0x9e, 0xbe, 0x5e, 0x80, 0x9e, 0x4c, 0x6f, 0xa7, 0xde, -0x79, 0xbd, 0xe7, 0xfa, 0x1c, 0x7d, 0x2f, 0xfd, 0x54, 0xfd, 0x6d, 0xfa, -0xa7, 0xf5, 0x47, 0x0c, 0x58, 0x06, 0xb3, 0x0c, 0x24, 0x06, 0xdb, 0x0c, -0xce, 0x18, 0x3c, 0xc5, 0x35, 0x71, 0x6f, 0x3c, 0x1d, 0x2f, 0xc7, 0xdb, -0xf1, 0x51, 0x43, 0x5d, 0xc3, 0x40, 0x43, 0xa5, 0x61, 0x95, 0x61, 0x97, -0xe1, 0x84, 0x91, 0xb9, 0xd1, 0x3c, 0xa3, 0xd5, 0x46, 0x8d, 0x46, 0x0f, -0x8c, 0x69, 0xc6, 0x5c, 0xe3, 0x24, 0xe3, 0x6d, 0xc6, 0x6d, 0xc6, 0xa3, -0x26, 0x06, 0x26, 0x21, 0x26, 0x4b, 0x4d, 0xea, 0x4d, 0xee, 0x9a, 0x52, -0x4d, 0xb9, 0xa6, 0x29, 0xa6, 0x3b, 0x4c, 0x3b, 0x4c, 0xc7, 0xcd, 0xcc, -0xcd, 0xa2, 0xcd, 0xd6, 0x99, 0x35, 0x9b, 0x3d, 0x31, 0xd7, 0x32, 0xe7, -0x9b, 0xe7, 0x9b, 0xd7, 0x9b, 0xdf, 0xb7, 0x60, 0x5a, 0x78, 0x5a, 0x2c, -0xb6, 0xa8, 0xb6, 0xb8, 0x65, 0x49, 0xb2, 0xe4, 0x5a, 0xa6, 0x59, 0xee, -0xb6, 0xbc, 0x6e, 0x85, 0x5a, 0x39, 0x59, 0xa5, 0x58, 0x55, 0x5a, 0x5d, -0xb3, 0x46, 0xad, 0x9d, 0xad, 0x25, 0xd6, 0xbb, 0xad, 0xbb, 0xa7, 0x11, -0xa7, 0xb9, 0x4e, 0x93, 0x4e, 0xab, 0x9e, 0xd6, 0x67, 0xc3, 0xb0, 0xf1, -0xb6, 0xc9, 0xb6, 0xa9, 0xb7, 0x19, 0xb0, 0xe5, 0xd8, 0x06, 0xdb, 0xae, -0xb6, 0x6d, 0xb6, 0x7d, 0x61, 0x67, 0x62, 0x17, 0x67, 0xb7, 0xc5, 0xae, -0xc3, 0xee, 0x93, 0xbd, 0x93, 0x7d, 0xba, 0x7d, 0x8d, 0xfd, 0x3d, 0x07, -0x0d, 0x87, 0xd9, 0x0e, 0xab, 0x1d, 0x5a, 0x1d, 0x7e, 0x73, 0xb4, 0x72, -0x14, 0x3a, 0x56, 0x3a, 0xde, 0x9a, 0xce, 0x9c, 0xee, 0x3f, 0x7d, 0xc5, -0xf4, 0x96, 0xe9, 0x2f, 0x67, 0x58, 0xcf, 0x10, 0xcf, 0xd8, 0x33, 0xe3, -0xb6, 0x13, 0xcb, 0x29, 0xc4, 0x69, 0x9d, 0x53, 0x9b, 0xd3, 0x47, 0x67, -0x17, 0x67, 0xb9, 0x73, 0x83, 0xf3, 0x88, 0x8b, 0x89, 0x4b, 0x82, 0xcb, -0x2e, 0x97, 0x3e, 0x2e, 0x9b, 0x1b, 0xc6, 0xdd, 0xc8, 0xbd, 0xe4, 0x4a, -0x74, 0xf5, 0x71, 0x5d, 0xe1, 0x7a, 0xd2, 0xf5, 0x9d, 0x9b, 0xb3, 0x9b, -0xc2, 0xed, 0xa8, 0xdb, 0xaf, 0xee, 0x36, 0xee, 0x69, 0xee, 0x87, 0xdc, -0x9f, 0xcc, 0x34, 0x9f, 0x29, 0x9e, 0x59, 0x33, 0x73, 0xd0, 0xc3, 0xc8, -0x43, 0xe0, 0x51, 0xe5, 0xd1, 0x3f, 0x0b, 0x9f, 0x95, 0x30, 0x6b, 0xdf, -0xac, 0x7e, 0x4f, 0x43, 0x4f, 0x81, 0x67, 0xb5, 0xe7, 0x23, 0x2f, 0x63, -0x2f, 0x91, 0x57, 0xad, 0xd7, 0xb0, 0xb7, 0xa5, 0x77, 0xaa, 0xf7, 0x61, -0xef, 0x17, 0x3e, 0xf6, 0x3e, 0x72, 0x9f, 0xe3, 0x3e, 0xe3, 0x3c, 0x37, -0xde, 0x32, 0xde, 0x59, 0x5f, 0xcc, 0x37, 0xc0, 0xb7, 0xc8, 0xb7, 0xcb, -0x4f, 0xc3, 0x6f, 0x9e, 0x5f, 0x85, 0xdf, 0x43, 0x7f, 0x23, 0xff, 0x64, -0xff, 0x7a, 0xff, 0xd1, 0x00, 0xa7, 0x80, 0x25, 0x01, 0x67, 0x03, 0x89, -0x81, 0x41, 0x81, 0x5b, 0x02, 0xfb, 0xf8, 0x7a, 0x7c, 0x21, 0xbf, 0x8e, -0x3f, 0x3a, 0xdb, 0x65, 0xf6, 0xb2, 0xd9, 0xed, 0x41, 0x8c, 0xa0, 0xb9, -0x41, 0x15, 0x41, 0x8f, 0x82, 0xad, 0x82, 0xe5, 0xc1, 0xad, 0x21, 0x68, -0xc8, 0xec, 0x90, 0xad, 0x21, 0xf7, 0xe7, 0x98, 0xce, 0x91, 0xce, 0x69, -0x0e, 0x85, 0x50, 0x7e, 0xe8, 0xd6, 0xd0, 0x07, 0x61, 0xe6, 0x61, 0x8b, -0xc3, 0x7e, 0x0c, 0x27, 0x85, 0x87, 0x85, 0x57, 0x86, 0x3f, 0x8e, 0x70, -0x88, 0x58, 0x1a, 0xd1, 0x31, 0x97, 0x35, 0x77, 0xd1, 0xdc, 0x43, 0x73, -0xdf, 0x44, 0xfa, 0x44, 0x96, 0x44, 0xde, 0x9b, 0x67, 0x31, 0x4f, 0x39, -0xaf, 0x2d, 0x4a, 0x35, 0x2a, 0x3e, 0xaa, 0x2e, 0x6a, 0x3c, 0xda, 0x37, -0xba, 0x34, 0xba, 0x3f, 0xc6, 0x2e, 0x66, 0x59, 0xcc, 0xd5, 0x58, 0x9d, -0x58, 0x49, 0x6c, 0x4b, 0x1c, 0x39, 0x2e, 0x2a, 0xae, 0x36, 0x6e, 0x6c, -0xbe, 0xdf, 0xfc, 0xed, 0xf3, 0x87, 0xe2, 0x9d, 0xe2, 0x0b, 0xe3, 0x7b, -0x17, 0x98, 0x2f, 0xc8, 0x5d, 0x70, 0x79, 0xa1, 0xce, 0xc2, 0xf4, 0x85, -0xa7, 0x16, 0xa9, 0x2e, 0x12, 0x2c, 0x3a, 0x96, 0x40, 0x4c, 0x88, 0x4e, -0x38, 0x94, 0xf0, 0x41, 0x10, 0x2a, 0xa8, 0x16, 0x8c, 0x25, 0xf2, 0x13, -0x77, 0x25, 0x8e, 0x0a, 0x79, 0xc2, 0x1d, 0xc2, 0x67, 0x22, 0x2f, 0xd1, -0x36, 0xd1, 0x88, 0xd8, 0x43, 0x5c, 0x2a, 0x1e, 0x4e, 0xf2, 0x48, 0x2a, -0x4d, 0x7a, 0x92, 0xec, 0x91, 0xbc, 0x35, 0x79, 0x24, 0xc5, 0x33, 0xa5, -0x2c, 0xe5, 0xb9, 0x84, 0x27, 0xa9, 0x90, 0xbc, 0x4c, 0x0d, 0x4c, 0xdd, -0x9b, 0x3a, 0x9e, 0x16, 0x9a, 0x76, 0x20, 0x6d, 0x32, 0x3d, 0x3a, 0xbd, -0x31, 0x83, 0x92, 0x91, 0x90, 0x71, 0x42, 0xaa, 0x21, 0x4d, 0x93, 0xb6, -0x67, 0xea, 0x67, 0xe6, 0x66, 0x76, 0xcb, 0xac, 0x65, 0x85, 0xb2, 0xfe, -0xc5, 0x6e, 0x8b, 0xb7, 0x2f, 0x1e, 0x95, 0x07, 0xc9, 0x6b, 0xb3, 0x90, -0xac, 0x05, 0x59, 0x2d, 0x0a, 0xb6, 0x42, 0xa6, 0xe8, 0x54, 0x5a, 0x28, -0xd7, 0x2a, 0x07, 0xb2, 0x67, 0x65, 0x57, 0x66, 0xbf, 0xcd, 0x89, 0xca, -0x39, 0x96, 0xab, 0x9e, 0x2b, 0xcd, 0xed, 0xcc, 0xb3, 0xca, 0xdb, 0x90, -0x37, 0x9c, 0xef, 0x9f, 0xff, 0xed, 0x12, 0xc2, 0x12, 0xe1, 0x92, 0xb6, -0xa5, 0x86, 0x4b, 0x57, 0x2d, 0x1d, 0x58, 0xe6, 0xbd, 0xac, 0x6a, 0x39, -0xb2, 0x3c, 0x71, 0x79, 0xdb, 0x0a, 0xe3, 0x15, 0x05, 0x2b, 0x86, 0x56, -0x06, 0xac, 0x3c, 0xb8, 0x8a, 0xb6, 0x2a, 0x6d, 0xd5, 0x4f, 0xab, 0xed, -0x57, 0x97, 0xae, 0x7e, 0xbd, 0x26, 0x7a, 0x4d, 0x6b, 0x81, 0x5e, 0xc1, -0xca, 0x82, 0xc1, 0xb5, 0x01, 0x6b, 0xeb, 0x0b, 0x55, 0x0a, 0xe5, 0x85, -0x7d, 0xeb, 0xdc, 0xd7, 0xed, 0x5d, 0x4f, 0x58, 0x2f, 0x59, 0xdf, 0xb5, -0x61, 0xfa, 0x86, 0x9d, 0x1b, 0x3e, 0x15, 0x89, 0x8a, 0xae, 0x14, 0xdb, -0x17, 0x97, 0x15, 0x7f, 0xd8, 0x28, 0xdc, 0x78, 0xe5, 0x1b, 0x87, 0x6f, -0xca, 0xbf, 0x99, 0xdc, 0x94, 0xb4, 0xa9, 0xab, 0xc4, 0xb9, 0x64, 0xcf, -0x66, 0xd2, 0x66, 0xe9, 0xe6, 0xde, 0x2d, 0x9e, 0x5b, 0x0e, 0x96, 0xaa, -0x97, 0xe6, 0x97, 0x0e, 0x6e, 0x0d, 0xd9, 0xda, 0xb4, 0x0d, 0xdf, 0x56, -0xb4, 0xed, 0xf5, 0xf6, 0x45, 0xdb, 0x2f, 0x97, 0xcd, 0x28, 0xdb, 0xbb, -0x83, 0xb6, 0x43, 0xb9, 0xa3, 0xbf, 0x3c, 0xb8, 0xbc, 0x65, 0xa7, 0xc9, -0xce, 0xcd, 0x3b, 0x3f, 0x54, 0xa4, 0x54, 0xf4, 0x54, 0xfa, 0x54, 0x36, -0xee, 0xd2, 0xdd, 0xb5, 0x61, 0xd7, 0xf8, 0x6e, 0xd1, 0xee, 0x1b, 0x7b, -0xbc, 0xf6, 0x34, 0xec, 0xd5, 0xdb, 0x5b, 0xbc, 0xf7, 0xfd, 0x3e, 0xc9, -0xbe, 0xdb, 0x55, 0x01, 0x55, 0x4d, 0xd5, 0x66, 0xd5, 0x65, 0xfb, 0x49, -0xfb, 0xb3, 0xf7, 0x3f, 0xae, 0x89, 0xaa, 0xe9, 0xf8, 0x96, 0xfb, 0x6d, -0x5d, 0xad, 0x4e, 0x6d, 0x71, 0xed, 0xc7, 0x03, 0xd2, 0x03, 0xfd, 0x07, -0x23, 0x0e, 0xb6, 0xd7, 0xb9, 0xd4, 0xd5, 0x1d, 0xd2, 0x3d, 0x54, 0x52, -0x8f, 0xd6, 0x2b, 0xeb, 0x47, 0x0e, 0xc7, 0x1f, 0xbe, 0xfe, 0x9d, 0xef, -0x77, 0x2d, 0x0d, 0x36, 0x0d, 0x55, 0x8d, 0x9c, 0xc6, 0xe2, 0x23, 0x70, -0x44, 0x79, 0xe4, 0xe9, 0xf7, 0x09, 0xdf, 0xf7, 0x1e, 0x0d, 0x3a, 0xda, -0x76, 0x8c, 0x7b, 0xac, 0xe1, 0x07, 0xd3, 0x1f, 0x76, 0x1d, 0x67, 0x1d, -0x2f, 0x6a, 0x42, 0x9a, 0xf2, 0x9a, 0x46, 0x9b, 0x53, 0x9a, 0xfb, 0x5b, -0x62, 0x5b, 0xba, 0x4f, 0xcc, 0x3e, 0xd1, 0xd6, 0xea, 0xde, 0x7a, 0xfc, -0x47, 0xdb, 0x1f, 0x0f, 0x9c, 0x34, 0x3c, 0x59, 0x79, 0x4a, 0xf3, 0x54, -0xc9, 0x69, 0xda, 0xe9, 0x82, 0xd3, 0x93, 0x67, 0xf2, 0xcf, 0x8c, 0x9d, -0x95, 0x9d, 0x7d, 0x7e, 0x2e, 0xf9, 0xdc, 0x60, 0xdb, 0xa2, 0xb6, 0x7b, -0xe7, 0x63, 0xce, 0xdf, 0x6a, 0x0f, 0x6f, 0xef, 0xba, 0x10, 0x74, 0xe1, -0xd2, 0x45, 0xff, 0x8b, 0xe7, 0x3b, 0xbc, 0x3b, 0xce, 0x5c, 0xf2, 0xb8, -0x74, 0xf2, 0xb2, 0xdb, 0xe5, 0x13, 0x57, 0xb8, 0x57, 0x9a, 0xaf, 0x3a, -0x5f, 0x6d, 0xea, 0x74, 0xea, 0x3c, 0xfe, 0x93, 0xd3, 0x4f, 0xc7, 0xbb, -0x9c, 0xbb, 0x9a, 0xae, 0xb9, 0x5c, 0x6b, 0xb9, 0xee, 0x7a, 0xbd, 0xb5, -0x7b, 0x66, 0xf7, 0xe9, 0x1b, 0x9e, 0x37, 0xce, 0xdd, 0xf4, 0xbd, 0x79, -0xf1, 0x16, 0xff, 0xd6, 0xd5, 0x9e, 0x39, 0x3d, 0xdd, 0xbd, 0xf3, 0x7a, -0x6f, 0xf7, 0xc5, 0xf7, 0xf5, 0xdf, 0x16, 0xdd, 0x7e, 0x72, 0x27, 0xfd, -0xce, 0xcb, 0xbb, 0xd9, 0x77, 0x27, 0xee, 0xad, 0xbc, 0x4f, 0xbc, 0x5f, -0xf4, 0x40, 0xed, 0x41, 0xd9, 0x43, 0xdd, 0x87, 0xd5, 0x3f, 0x5b, 0xfe, -0xdc, 0xd8, 0xef, 0xdc, 0x7f, 0x6a, 0xc0, 0x77, 0xa0, 0xf3, 0xd1, 0xdc, -0x47, 0xf7, 0x06, 0x85, 0x83, 0xcf, 0xfe, 0x91, 0xf5, 0x8f, 0x0f, 0x43, -0x05, 0x8f, 0x99, 0x8f, 0xcb, 0x86, 0x0d, 0x86, 0xeb, 0x9e, 0x38, 0x3e, -0x39, 0x39, 0xe2, 0x3f, 0x72, 0xfd, 0xe9, 0xfc, 0xa7, 0x43, 0xcf, 0x64, -0xcf, 0x26, 0x9e, 0x17, 0xfe, 0xa2, 0xfe, 0xcb, 0xae, 0x17, 0x16, 0x2f, -0x7e, 0xf8, 0xd5, 0xeb, 0xd7, 0xce, 0xd1, 0x98, 0xd1, 0xa1, 0x97, 0xf2, -0x97, 0x93, 0xbf, 0x6d, 0x7c, 0xa5, 0xfd, 0xea, 0xc0, 0xeb, 0x19, 0xaf, -0xdb, 0xc6, 0xc2, 0xc6, 0x1e, 0xbe, 0xc9, 0x78, 0x33, 0x31, 0x5e, 0xf4, -0x56, 0xfb, 0xed, 0xc1, 0x77, 0xdc, 0x77, 0x1d, 0xef, 0xa3, 0xdf, 0x0f, -0x4f, 0xe4, 0x7c, 0x20, 0x7f, 0x28, 0xff, 0x68, 0xf9, 0xb1, 0xf5, 0x53, -0xd0, 0xa7, 0xfb, 0x93, 0x19, 0x93, 0x93, 0xff, 0x04, 0x03, 0x98, 0xf3, -0xfc, 0x63, 0x33, 0x2d, 0xdb, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, -0x4d, 0x00, 0x00, 0x7a, 0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xf9, -0xff, 0x00, 0x00, 0x80, 0xe9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea, -0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x6f, 0x92, 0x5f, 0xc5, -0x46, 0x00, 0x00, 0x02, 0x1c, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xec, -0x98, 0x4d, 0x4e, 0x02, 0x41, 0x10, 0x85, 0x3f, 0x8d, 0xdb, 0xb9, 0x80, -0x73, 0x01, 0x70, 0x2f, 0xee, 0x41, 0xf7, 0x72, 0x00, 0x0d, 0x7b, 0xc2, -0xde, 0xc4, 0xb5, 0x09, 0x7b, 0xc2, 0xde, 0xe0, 0x01, 0xd0, 0xbd, 0x5c, -0x00, 0x2e, 0xc0, 0x05, 0xe4, 0x00, 0xce, 0x01, 0x74, 0x53, 0x9d, 0x54, -0xda, 0xea, 0x99, 0x46, 0x51, 0x8c, 0xd6, 0x4b, 0x3a, 0x0c, 0xdd, 0x3d, -0x5d, 0x5d, 0xf5, 0xea, 0x2f, 0x73, 0x00, 0xbc, 0xe1, 0xd8, 0x1b, 0x0e, -0xdd, 0x04, 0x4e, 0x80, 0x13, 0xe0, 0x70, 0x02, 0x9c, 0x00, 0x87, 0x13, -0xe0, 0x04, 0x38, 0x9c, 0x00, 0x27, 0xc0, 0xe1, 0x04, 0x38, 0x01, 0x0e, -0x27, 0xe0, 0xdf, 0xe0, 0xc8, 0x9a, 0x6c, 0x01, 0x13, 0xa0, 0x34, 0xd6, -0x66, 0xc0, 0x58, 0x9e, 0xfb, 0xc0, 0x0d, 0x50, 0x18, 0xfb, 0x5e, 0x80, -0x11, 0xb0, 0xce, 0xb8, 0x44, 0x07, 0xb8, 0x4f, 0xac, 0x55, 0x22, 0x73, -0x9a, 0x71, 0xce, 0x50, 0x86, 0x96, 0x9d, 0xba, 0x63, 0x25, 0x7a, 0xcc, -0xe5, 0xff, 0x0d, 0x70, 0xdd, 0xa0, 0x47, 0x21, 0x76, 0xe9, 0x18, 0xfb, -0x96, 0xc0, 0x4a, 0xe4, 0x93, 0x38, 0x67, 0x0c, 0x2c, 0xa2, 0xf9, 0x03, -0xa2, 0xaf, 0xa1, 0x05, 0xf0, 0x9c, 0x30, 0x6a, 0xc0, 0x54, 0x84, 0xdd, -0x37, 0x18, 0xa4, 0x02, 0xce, 0xe5, 0xf7, 0xb3, 0x04, 0x04, 0xdc, 0x2a, -0x63, 0x59, 0xb8, 0x13, 0x63, 0x07, 0x2c, 0x80, 0x87, 0x8c, 0x73, 0x07, -0xc0, 0x69, 0x8d, 0xe1, 0xb4, 0x1e, 0x29, 0xe3, 0xe7, 0x10, 0x10, 0x70, -0x21, 0x64, 0x24, 0x53, 0x50, 0x5b, 0x8c, 0xbf, 0x06, 0x4e, 0xa2, 0x31, -0x92, 0x3d, 0xa7, 0x32, 0x42, 0x44, 0x9c, 0x18, 0x23, 0x78, 0x4c, 0x7b, -0x8b, 0x70, 0x5c, 0xd6, 0xc8, 0x3c, 0xce, 0x34, 0xfe, 0x42, 0x39, 0x52, -0xdd, 0x1d, 0x67, 0x86, 0x2e, 0xa3, 0x06, 0x3d, 0x82, 0xf1, 0xcf, 0x8c, -0x7d, 0x83, 0xc8, 0x41, 0x53, 0xf2, 0xca, 0x9c, 0x14, 0x04, 0xf0, 0x9a, -0xf0, 0x84, 0x9c, 0xb9, 0xd4, 0xfb, 0x4d, 0x68, 0x1b, 0x1e, 0x5b, 0x36, -0xc8, 0xd1, 0xc6, 0xaf, 0x12, 0x69, 0xb3, 0xfa, 0xc2, 0x9c, 0xa5, 0xc7, -0xc4, 0x98, 0x7b, 0x52, 0xcf, 0x97, 0x8a, 0x54, 0xad, 0x9b, 0x75, 0xde, -0xd1, 0x6f, 0x2a, 0x48, 0x45, 0x4d, 0x88, 0x57, 0x89, 0x9c, 0xdf, 0x8f, -0xde, 0x6f, 0xfd, 0xc0, 0x3d, 0xad, 0x3b, 0xae, 0x22, 0xa7, 0x29, 0x33, -0xf5, 0xf8, 0x55, 0x04, 0xac, 0x55, 0x81, 0x47, 0xa5, 0x88, 0x21, 0xd0, -0x8d, 0x6a, 0x40, 0x5f, 0xe5, 0xdb, 0xb1, 0x2a, 0xf6, 0x2d, 0x29, 0xa8, -0xdf, 0x89, 0x41, 0xa2, 0xc8, 0x5e, 0xca, 0xf3, 0x3c, 0x8a, 0x08, 0x80, -0x2b, 0xa0, 0x27, 0x7b, 0xa6, 0xbb, 0x20, 0x20, 0x30, 0xd9, 0xab, 0x49, -0x27, 0xdb, 0xa6, 0xa2, 0xc2, 0x08, 0x5d, 0xcb, 0xa3, 0xfb, 0x92, 0x7a, -0x72, 0x8a, 0xf3, 0x2e, 0x51, 0xc9, 0x1d, 0xbb, 0x86, 0x27, 0x6b, 0x8f, -0xdf, 0x48, 0x3d, 0x8b, 0x1d, 0xa9, 0x97, 0xdb, 0x86, 0xe6, 0x60, 0x2e, -0x6c, 0xb6, 0x6a, 0xc2, 0x7e, 0x9e, 0xd9, 0x86, 0x6a, 0x25, 0x86, 0x09, -0xc5, 0xa7, 0x7b, 0x36, 0x7e, 0x88, 0xb4, 0xbb, 0x44, 0xbb, 0xba, 0x8c, -0xd2, 0x50, 0x2e, 0x3e, 0xb4, 0xa1, 0xa5, 0x18, 0x76, 0x63, 0x28, 0x17, -0xaf, 0x15, 0x62, 0x10, 0xab, 0x65, 0xdd, 0x6c, 0x61, 0x9c, 0x52, 0x85, -0xaf, 0x85, 0x47, 0x09, 0x71, 0xbd, 0x6f, 0x6d, 0xf4, 0xd4, 0xf1, 0x1d, -0x5f, 0xc4, 0xf3, 0x56, 0x86, 0x47, 0x76, 0xd4, 0x5a, 0x29, 0x5d, 0xd6, -0x63, 0xd4, 0x22, 0x06, 0xc2, 0xf5, 0x5a, 0xc7, 0x88, 0x52, 0xb6, 0x94, -0xb7, 0xac, 0x23, 0xc0, 0xe1, 0x9f, 0x22, 0x9c, 0x00, 0x87, 0x13, 0xe0, -0x04, 0x38, 0x9c, 0x00, 0x27, 0xc0, 0xe1, 0x04, 0x38, 0x01, 0x0e, 0x27, -0xe0, 0x4f, 0xe3, 0x7d, 0x00, 0x51, 0xbe, 0x83, 0xcd, 0x57, 0x34, 0x65, -0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, -0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_browse.c b/Source/Core/DolphinWX/resources/toolbar_browse.c deleted file mode 100644 index 1f2c0368dc..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_browse.c +++ /dev/null @@ -1,303 +0,0 @@ -static const unsigned char toolbar_browse_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x37, -0x2f, 0x30, 0x34, 0x6b, 0xeb, 0x0c, 0x3b, 0x00, 0x00, 0x0d, 0x67, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x6b, 0x6c, 0x5c, 0xd7, 0x71, -0xc7, 0x7f, 0xe7, 0xdc, 0xe7, 0x3e, 0xb9, 0x94, 0x44, 0xbd, 0x2c, 0x59, -0xb4, 0x1d, 0x07, 0xae, 0x15, 0xcb, 0x8c, 0x1b, 0x07, 0x89, 0xfb, 0x30, -0x8d, 0xe6, 0x4b, 0x01, 0x07, 0x16, 0x90, 0x0f, 0xaa, 0x11, 0xb4, 0x92, -0x11, 0x34, 0xfa, 0x50, 0xa0, 0x56, 0x9a, 0xf6, 0x83, 0xe1, 0xc6, 0xa2, -0x13, 0xa4, 0x89, 0x61, 0x3b, 0xb6, 0xf3, 0x4d, 0x42, 0x52, 0x4b, 0x49, -0x1c, 0x47, 0x68, 0x0b, 0xdb, 0x40, 0xd1, 0x3a, 0x68, 0x0a, 0x33, 0x45, -0x5a, 0xa7, 0x8e, 0x1f, 0xb4, 0x1d, 0xcb, 0x0f, 0x89, 0x12, 0x25, 0x5a, -0xa4, 0x44, 0x8a, 0xe2, 0x63, 0x49, 0xee, 0xee, 0xbd, 0xf7, 0xcc, 0xf4, -0xc3, 0x5d, 0x52, 0x0f, 0x4b, 0xa2, 0x02, 0xb1, 0x2d, 0x32, 0xc0, 0xe1, -0x1e, 0xec, 0xf2, 0x9e, 0xf9, 0xff, 0xcf, 0xcc, 0x9c, 0x33, 0x33, 0xbb, -0x46, 0x55, 0xf9, 0x6d, 0x16, 0xfb, 0xff, 0x0d, 0xe0, 0x6a, 0xc5, 0xff, -0xdf, 0x58, 0xf4, 0x5f, 0xbf, 0x65, 0x6a, 0x22, 0x3c, 0x29, 0xc2, 0x76, -0x11, 0x10, 0x61, 0x40, 0x94, 0xaf, 0x7c, 0xe1, 0xeb, 0xda, 0xbf, 0xdc, -0xba, 0xcc, 0x72, 0xbb, 0xd0, 0x4f, 0x1f, 0x31, 0x35, 0x11, 0x5e, 0x12, -0xa1, 0x47, 0x04, 0x44, 0xa1, 0x4d, 0x02, 0x11, 0xee, 0x7b, 0xe7, 0x10, -0xfb, 0xfa, 0x0e, 0x2c, 0x9f, 0xce, 0x65, 0x77, 0x21, 0x03, 0x4f, 0x1b, -0xe8, 0x31, 0x06, 0xe2, 0xb2, 0x21, 0x8a, 0xcc, 0xb9, 0x1f, 0x3e, 0xfd, -0x3b, 0x1f, 0x63, 0x2b, 0xec, 0x5d, 0x3e, 0x7d, 0xcb, 0x69, 0x81, 0x9f, -0x3d, 0x6a, 0xee, 0x17, 0xe1, 0x49, 0x51, 0xe8, 0xea, 0x36, 0x74, 0xac, -0xb6, 0x64, 0x2d, 0xc3, 0x89, 0xc3, 0xca, 0xd4, 0xb8, 0x20, 0xaa, 0x88, -0x30, 0x25, 0xc2, 0x75, 0xf7, 0x7e, 0x4b, 0xa7, 0x96, 0x43, 0xe7, 0xb2, -0x59, 0xe0, 0xa5, 0xc7, 0x4d, 0x0d, 0x43, 0x1f, 0x06, 0x56, 0x6c, 0x30, -0x6c, 0xd8, 0x72, 0x17, 0xd7, 0xff, 0xe1, 0xbf, 0xd0, 0xfd, 0xfb, 0xdf, -0xe3, 0xda, 0x5b, 0x36, 0x11, 0x95, 0x3c, 0xc0, 0x00, 0xd4, 0x80, 0xfb, -0x97, 0xcb, 0x0a, 0xcb, 0x46, 0x40, 0xe1, 0x69, 0x94, 0x5a, 0x10, 0xc1, -0x35, 0xb7, 0xdc, 0xc4, 0x9a, 0x9b, 0x1f, 0xc1, 0xfa, 0x1d, 0xc4, 0x95, -0x1b, 0xd9, 0xf8, 0xbb, 0x7d, 0xac, 0xd9, 0x54, 0xc0, 0xd8, 0x45, 0x75, -0xbb, 0x86, 0x0e, 0x7e, 0xb0, 0x2c, 0x7a, 0x97, 0x85, 0x40, 0xff, 0x13, -0xa6, 0x17, 0xd8, 0x0a, 0x70, 0x6d, 0x0f, 0x74, 0xdd, 0xf8, 0x30, 0xf9, -0x01, 0xe7, 0x33, 0x7d, 0xea, 0x75, 0x8e, 0xfc, 0xea, 0x51, 0x2a, 0xab, -0x2a, 0x94, 0x3a, 0x42, 0x30, 0xb9, 0x15, 0xfe, 0x73, 0xff, 0xe3, 0xf7, -0x2c, 0x87, 0x15, 0x96, 0x85, 0x80, 0x2a, 0xbb, 0x55, 0xa1, 0xdc, 0x05, -0x6b, 0x37, 0xff, 0x05, 0x61, 0x71, 0x33, 0xe0, 0xd3, 0xac, 0x1f, 0x67, -0x68, 0xe0, 0xbb, 0x38, 0xb1, 0x88, 0xad, 0xd1, 0xb5, 0xb1, 0x82, 0x35, -0x8b, 0x27, 0xf7, 0xd6, 0xe5, 0xd0, 0x7d, 0xd5, 0x04, 0xfa, 0x9f, 0x30, -0xbd, 0x28, 0xbd, 0x00, 0x1b, 0x7b, 0xaa, 0x14, 0x57, 0x7c, 0x89, 0x85, -0xdd, 0x1f, 0x3e, 0xf8, 0x14, 0x4a, 0x08, 0xb6, 0x00, 0xb6, 0x4a, 0xa5, -0xab, 0x83, 0xb8, 0x12, 0xa2, 0x18, 0x14, 0xb6, 0x8e, 0x0d, 0x8f, 0x5c, -0xad, 0xfa, 0xab, 0x27, 0xa0, 0xca, 0x6e, 0x51, 0x08, 0x4a, 0xd0, 0x75, -0xc3, 0x97, 0x30, 0x76, 0x05, 0xe0, 0x33, 0x31, 0xfc, 0xf7, 0x34, 0x67, -0x8f, 0x81, 0x09, 0xc0, 0xc6, 0xe0, 0x95, 0xc0, 0xab, 0xd1, 0xb9, 0xb6, -0x84, 0xb5, 0x1e, 0x28, 0xb5, 0x17, 0x9f, 0x7a, 0xb8, 0xe7, 0x6a, 0xdd, -0xe8, 0xaa, 0x08, 0xbc, 0xf4, 0x1d, 0xd3, 0xab, 0x4a, 0xaf, 0x2a, 0x74, -0xdf, 0xde, 0x41, 0x50, 0xde, 0x09, 0xf8, 0x88, 0x9b, 0x67, 0xfa, 0xd4, -0x01, 0x8c, 0xb5, 0x18, 0xeb, 0x61, 0xbd, 0x00, 0xeb, 0x17, 0xb0, 0x7e, -0x95, 0x55, 0x1b, 0x6a, 0x18, 0x7f, 0xd1, 0x8d, 0x6e, 0xbd, 0x2a, 0xf4, -0xfc, 0x86, 0xa9, 0x44, 0xff, 0x77, 0x4c, 0x2f, 0x50, 0x53, 0xe8, 0x41, -0x41, 0x94, 0x3b, 0x55, 0xc1, 0x0b, 0x61, 0xfd, 0xe6, 0x3f, 0xc6, 0x98, -0x15, 0x80, 0x63, 0x7e, 0x72, 0x3f, 0xe8, 0x0c, 0xc6, 0xab, 0x61, 0x14, -0x8c, 0xb5, 0x78, 0x9e, 0x8f, 0x31, 0x05, 0x82, 0x42, 0x99, 0x4a, 0x2d, -0xe6, 0x4c, 0xa3, 0x85, 0xa2, 0x3b, 0x9e, 0xfe, 0xab, 0x9d, 0x9d, 0x22, -0x3b, 0x07, 0x44, 0x98, 0xfa, 0xf3, 0xef, 0xea, 0x00, 0x40, 0xdf, 0x36, -0x73, 0x9e, 0xde, 0xcb, 0xdd, 0xdc, 0x97, 0xbd, 0xc8, 0x7e, 0xf6, 0xa8, -0xe9, 0x31, 0x86, 0x1d, 0xc0, 0x9d, 0xc6, 0xd0, 0xb3, 0xf0, 0xfe, 0xc2, -0x23, 0xaa, 0xf9, 0xd8, 0xd0, 0x03, 0x37, 0x7d, 0xee, 0x17, 0x18, 0x7b, -0x33, 0x2a, 0x67, 0x98, 0x18, 0xba, 0x9d, 0xb9, 0x69, 0x47, 0x63, 0xbe, -0x46, 0x96, 0xae, 0xc4, 0x8f, 0x56, 0xe2, 0x07, 0x45, 0xac, 0x51, 0xc8, -0x26, 0x38, 0x3d, 0x74, 0x94, 0x0f, 0xde, 0x18, 0x27, 0x4b, 0xb3, 0x0b, -0x53, 0x8d, 0x85, 0xbc, 0xe9, 0x4d, 0x11, 0x06, 0x44, 0x78, 0xde, 0x16, -0x57, 0x0f, 0xc5, 0xc5, 0x02, 0x23, 0x47, 0x8e, 0x5d, 0x94, 0xcc, 0x45, -0x2d, 0xf0, 0xe2, 0xb7, 0xcd, 0x0e, 0x63, 0xd8, 0x6d, 0xa0, 0xdb, 0x18, -0xc0, 0x80, 0x39, 0xe7, 0x39, 0x6d, 0xff, 0x51, 0xcd, 0xe7, 0x1b, 0x7b, -0xb6, 0x60, 0xec, 0x27, 0x01, 0x47, 0x96, 0xbc, 0x08, 0xcc, 0xe0, 0xf9, -0x05, 0x7c, 0x3f, 0x03, 0x4d, 0x30, 0xb4, 0x40, 0xbd, 0xfc, 0x08, 0x35, -0x96, 0x8e, 0xae, 0x02, 0x7e, 0x18, 0x21, 0x02, 0x9a, 0xb9, 0xb3, 0x0b, -0xe5, 0xd2, 0x83, 0xd2, 0x83, 0xb2, 0x1d, 0x78, 0x22, 0x9b, 0x1d, 0x1b, -0x98, 0x99, 0x61, 0x7f, 0x31, 0x66, 0xdf, 0xa7, 0xef, 0xbe, 0x7b, 0x2a, -0x8f, 0x99, 0x2f, 0x5f, 0xdc, 0x02, 0x7d, 0xdb, 0x0c, 0xb7, 0x6f, 0xe1, -0x39, 0x63, 0xd8, 0x6a, 0x4c, 0x5b, 0x9f, 0x81, 0x6a, 0x17, 0x94, 0x56, -0x40, 0x5c, 0x85, 0x4a, 0x17, 0xc4, 0xd5, 0xdf, 0xa3, 0xb2, 0xc6, 0x60, -0x3d, 0x83, 0xb1, 0x9d, 0x60, 0xfe, 0x12, 0x63, 0xff, 0x00, 0x48, 0x69, -0x4c, 0x7c, 0x86, 0x46, 0xfd, 0x20, 0x49, 0x23, 0xa6, 0xd5, 0x28, 0x92, -0x26, 0x1d, 0x60, 0x6b, 0x18, 0x53, 0xc0, 0x5a, 0x8b, 0x71, 0x4d, 0x34, -0x9d, 0x42, 0x9a, 0x93, 0x04, 0xd1, 0x6a, 0x20, 0x60, 0xae, 0x9e, 0x31, -0x3b, 0x7e, 0x8a, 0x99, 0xf1, 0x71, 0xea, 0xb3, 0x86, 0xb9, 0xa6, 0x61, -0x6e, 0xde, 0x30, 0xdf, 0x50, 0x44, 0x14, 0x27, 0x20, 0x4e, 0xa7, 0x44, -0x78, 0xf8, 0xde, 0x07, 0xbe, 0xfa, 0x64, 0xf7, 0xcd, 0x8f, 0x7d, 0x94, -0x40, 0xdf, 0x36, 0xc3, 0x6d, 0x9f, 0x60, 0xb7, 0x31, 0xf4, 0x59, 0x03, -0x61, 0xd1, 0xb0, 0xee, 0x63, 0xb0, 0xea, 0xba, 0xf5, 0x94, 0x57, 0x7f, -0x8e, 0xb0, 0x74, 0x07, 0x41, 0xe1, 0x0e, 0x8c, 0x5d, 0xd5, 0x36, 0x5c, -0x70, 0xc1, 0x48, 0x11, 0xf7, 0x1a, 0x8d, 0xf1, 0xcf, 0x92, 0xb4, 0x2c, -0x59, 0x2b, 0x20, 0x69, 0x46, 0x64, 0x69, 0x09, 0x91, 0x32, 0x86, 0x08, -0x55, 0x83, 0x91, 0x0c, 0x49, 0xe7, 0xd1, 0x64, 0x8e, 0x35, 0x9b, 0xef, -0xa7, 0xbc, 0xf6, 0x36, 0x20, 0x5d, 0x1c, 0x73, 0xa7, 0x8f, 0x30, 0x37, -0x71, 0x9c, 0xe9, 0x91, 0xc3, 0x8c, 0x0d, 0x1e, 0x64, 0x62, 0xbc, 0xce, -0xd0, 0xf1, 0x84, 0xc6, 0x7c, 0x86, 0x88, 0x22, 0xc2, 0xbe, 0x07, 0x9f, -0xd9, 0x73, 0xdf, 0x82, 0x15, 0xce, 0x23, 0xf0, 0xc9, 0x9b, 0x99, 0x34, -0x86, 0x5a, 0x47, 0x97, 0x65, 0xe3, 0x96, 0x2a, 0xab, 0x3f, 0xfe, 0x55, -0xca, 0x5d, 0x5b, 0x2f, 0x01, 0x38, 0x40, 0xb2, 0x97, 0xdb, 0x9f, 0x19, -0x54, 0x26, 0x49, 0xe7, 0x9f, 0x22, 0x6d, 0xfc, 0x02, 0xd7, 0x32, 0x64, -0xa9, 0x47, 0x96, 0x04, 0x64, 0x49, 0x84, 0x4a, 0x84, 0x48, 0x00, 0x62, -0xd0, 0xcc, 0x21, 0x59, 0x82, 0x24, 0x2d, 0xc2, 0xd2, 0xc7, 0x29, 0x76, -0x7d, 0x8a, 0xb8, 0xba, 0x11, 0x11, 0x87, 0x8a, 0x23, 0xaa, 0x74, 0x12, -0x57, 0x2b, 0x80, 0x03, 0xe0, 0xe4, 0x7b, 0xaf, 0xf2, 0xe1, 0xab, 0x3f, -0xe5, 0xad, 0x81, 0x31, 0x4e, 0x9d, 0x6a, 0xe1, 0x9c, 0x22, 0xca, 0x5d, -0x0f, 0x3d, 0x9b, 0xd7, 0x16, 0xfe, 0x02, 0x78, 0x00, 0x51, 0x6a, 0x06, -0xc3, 0xea, 0x6e, 0x8f, 0xb5, 0x37, 0x3f, 0x42, 0xb1, 0xf3, 0x53, 0x0b, -0x1e, 0x4f, 0xd6, 0x3a, 0x41, 0x63, 0xe6, 0x3f, 0xc8, 0x5a, 0xaf, 0x90, -0xb5, 0xfe, 0x0b, 0xeb, 0x4f, 0xe3, 0x07, 0x82, 0xb5, 0x8a, 0xb1, 0xed, -0x88, 0x16, 0x50, 0x97, 0xcf, 0x0d, 0x82, 0x25, 0xc3, 0x33, 0x8a, 0xe0, -0x40, 0x3d, 0xc4, 0x81, 0x3a, 0x41, 0x52, 0x87, 0x4b, 0x1d, 0x33, 0x27, -0xdf, 0x62, 0x62, 0xe8, 0x4d, 0x92, 0x96, 0x25, 0x49, 0x7c, 0x32, 0x17, -0xa3, 0xb6, 0x8c, 0x1f, 0x95, 0xe8, 0x58, 0xbb, 0x91, 0x4a, 0xd7, 0x1a, -0x3a, 0x56, 0xaf, 0xe1, 0xc6, 0xbb, 0xfe, 0x84, 0xb4, 0xf9, 0x7d, 0xc6, -0xc6, 0x53, 0xd4, 0x39, 0x54, 0xb9, 0x13, 0x38, 0x4b, 0x00, 0x60, 0xc5, -0xda, 0xd5, 0xa8, 0x8e, 0xe5, 0xc1, 0x89, 0x47, 0xb1, 0x73, 0x0b, 0xa0, -0xb8, 0x6c, 0x96, 0x93, 0x87, 0xbe, 0xc7, 0xcc, 0xe9, 0x7f, 0xc3, 0xf3, -0x1c, 0x9e, 0x9f, 0xe1, 0x05, 0x42, 0x10, 0x14, 0xf1, 0xc3, 0x0c, 0x3f, -0x70, 0x58, 0xcf, 0x61, 0x8d, 0x00, 0x8a, 0x3a, 0xcd, 0x81, 0x8a, 0x82, -0x3a, 0x0c, 0x8a, 0xc1, 0x61, 0xc4, 0xa2, 0x19, 0x48, 0x0a, 0x59, 0x0a, -0x69, 0x4b, 0x49, 0x5b, 0x96, 0x24, 0xf5, 0xc8, 0x5c, 0x80, 0xd3, 0x18, -0xf5, 0x8b, 0x78, 0x51, 0x95, 0xa0, 0x58, 0x21, 0x73, 0x4a, 0x7d, 0x62, -0x9c, 0xb9, 0x89, 0x13, 0x68, 0x6b, 0x9a, 0x20, 0x0c, 0xf2, 0x80, 0xcc, -0xf7, 0x73, 0x31, 0x15, 0x5f, 0x24, 0xe0, 0xf9, 0x1e, 0x22, 0xf4, 0x1b, -0x43, 0x6f, 0x7d, 0x12, 0x26, 0x86, 0x5e, 0x60, 0x65, 0xf7, 0x17, 0x18, -0x7a, 0xe3, 0x51, 0x66, 0xa7, 0x0f, 0x61, 0x6d, 0x8d, 0xcc, 0x09, 0x5e, -0x96, 0x61, 0xb3, 0x94, 0x2c, 0x4b, 0x08, 0xb2, 0x84, 0x20, 0x4c, 0xf0, -0x83, 0x04, 0xcf, 0x66, 0x18, 0xe3, 0x40, 0x04, 0x71, 0x8a, 0x66, 0x8a, -0x4a, 0x7b, 0x64, 0xe0, 0x32, 0x90, 0xcc, 0x90, 0x25, 0x96, 0xac, 0x69, -0x48, 0x5a, 0x3e, 0x69, 0x16, 0x90, 0xba, 0x08, 0x31, 0x05, 0x4c, 0x5c, -0x24, 0x08, 0x2b, 0x84, 0x85, 0x32, 0x51, 0xa9, 0x4c, 0x18, 0x85, 0x18, -0x23, 0x90, 0x29, 0xae, 0xe5, 0x98, 0x98, 0x4c, 0xf3, 0x75, 0x73, 0x03, -0xf7, 0x9f, 0x47, 0xa0, 0xef, 0x80, 0xb2, 0xf7, 0x81, 0x6e, 0x44, 0x19, -0x30, 0x68, 0xef, 0xe8, 0xa0, 0xa3, 0x58, 0xdd, 0x4b, 0xd2, 0xac, 0x33, -0x37, 0x7d, 0x14, 0x6b, 0x2b, 0x60, 0x7d, 0x30, 0x06, 0x51, 0x87, 0xba, -0x14, 0x68, 0x81, 0xce, 0x63, 0xb4, 0x01, 0xda, 0x00, 0xaf, 0x99, 0x9f, -0xf3, 0xaa, 0xb9, 0x22, 0x07, 0x92, 0x81, 0x64, 0xb9, 0x45, 0x24, 0x03, -0x97, 0x1a, 0xb2, 0xd4, 0xd0, 0x4a, 0x03, 0xd2, 0x2c, 0x22, 0xd3, 0x02, -0xf8, 0x45, 0xac, 0x57, 0xc6, 0x0f, 0xcb, 0x84, 0xc5, 0x32, 0x61, 0xa1, -0x48, 0x10, 0x45, 0x58, 0x0b, 0xb8, 0x26, 0xce, 0x35, 0x69, 0xd6, 0xa7, -0x79, 0xf7, 0xdd, 0x79, 0x44, 0x04, 0x55, 0x86, 0xfa, 0x0e, 0xec, 0x79, -0xf3, 0x23, 0x16, 0x18, 0x39, 0x72, 0x8c, 0xea, 0x0d, 0x3c, 0x6f, 0x0c, -0xbb, 0x92, 0x24, 0xe3, 0xe8, 0xaf, 0xe7, 0x51, 0xfe, 0x09, 0xbf, 0xb8, -0x0a, 0xf1, 0x3c, 0xac, 0x57, 0xc0, 0xd8, 0x00, 0x63, 0x0d, 0x18, 0x87, -0xd1, 0x26, 0x4a, 0x84, 0x53, 0x1f, 0x9b, 0x81, 0xa8, 0x03, 0xe3, 0x00, -0x87, 0x64, 0x2c, 0x12, 0x50, 0x77, 0x76, 0xee, 0x32, 0x43, 0x9a, 0x7a, -0x64, 0x59, 0x80, 0xd3, 0x22, 0x78, 0x15, 0xbc, 0xa0, 0x42, 0x10, 0x57, -0x09, 0x0a, 0x25, 0xc2, 0x28, 0xc6, 0x0f, 0x03, 0xac, 0x69, 0x83, 0x6f, -0x4d, 0x31, 0x3b, 0x3e, 0xc2, 0x6b, 0xaf, 0x9e, 0x66, 0x7e, 0xae, 0x85, -0x88, 0x02, 0xec, 0xe2, 0x1c, 0x39, 0x2f, 0x17, 0x8a, 0x37, 0x7c, 0xf6, -0xe7, 0xaa, 0xf4, 0x8b, 0x53, 0x1a, 0xb3, 0x2d, 0x8e, 0x0c, 0x4c, 0xd3, -0x9c, 0x99, 0x20, 0xb0, 0x33, 0x58, 0x93, 0x60, 0x3d, 0x8b, 0x17, 0xc4, -0x04, 0x61, 0x11, 0x3f, 0x2c, 0xe3, 0x79, 0x65, 0xac, 0x29, 0xe6, 0xa7, -0x8c, 0xf3, 0x11, 0x67, 0x91, 0xd4, 0x22, 0x69, 0x7b, 0xf7, 0xdd, 0x39, -0xa3, 0x4d, 0x40, 0x9c, 0x87, 0x12, 0x83, 0x57, 0xc4, 0x8f, 0xaa, 0x44, -0xa5, 0x1a, 0x51, 0xa9, 0x42, 0x5c, 0x2c, 0x11, 0x44, 0x21, 0x16, 0x87, -0xa6, 0x75, 0xd2, 0xfa, 0x28, 0xe3, 0xc7, 0x86, 0xf8, 0xef, 0x97, 0x47, -0x99, 0x3c, 0x3d, 0x87, 0x73, 0x02, 0xca, 0xbe, 0xdd, 0x3f, 0xd9, 0xf3, -0xc2, 0x45, 0x09, 0xf4, 0x1d, 0x50, 0xd2, 0x56, 0x82, 0x08, 0xbb, 0x54, -0x99, 0x12, 0xa7, 0x34, 0x1b, 0x4d, 0x0e, 0xbf, 0x71, 0x86, 0x13, 0xef, -0x9e, 0x80, 0xd6, 0x28, 0x56, 0xcf, 0x60, 0x69, 0x60, 0x11, 0xac, 0x35, -0x58, 0x6b, 0x81, 0xbc, 0x54, 0x54, 0x97, 0x03, 0x77, 0xa9, 0xb6, 0x5d, -0xe7, 0x82, 0x21, 0x06, 0x71, 0x06, 0x55, 0x0f, 0x8c, 0x8f, 0xf5, 0x22, -0xfc, 0x30, 0x26, 0x88, 0x63, 0xc2, 0x28, 0xc4, 0xb3, 0x8a, 0x71, 0xf3, -0xb8, 0xb9, 0x31, 0xe6, 0x4e, 0x1d, 0xe1, 0x9d, 0x57, 0x07, 0x79, 0xe5, -0x97, 0xa3, 0xd4, 0xa7, 0xe7, 0x70, 0xb9, 0xeb, 0x0c, 0xe8, 0xe2, 0xee, -0x5f, 0xe2, 0x26, 0x06, 0x78, 0xe7, 0x97, 0x3b, 0x19, 0x78, 0x6e, 0xef, -0x76, 0x0c, 0xfb, 0x16, 0x52, 0x2a, 0xeb, 0x79, 0x78, 0x61, 0xc4, 0x9a, -0xee, 0x2a, 0x6b, 0xaf, 0x5b, 0x49, 0x50, 0xac, 0x60, 0x6c, 0x88, 0x41, -0x30, 0xcc, 0x62, 0x64, 0x1a, 0x64, 0x06, 0x5c, 0x03, 0x95, 0x16, 0xe2, -0xa4, 0x1d, 0xc0, 0x67, 0x5d, 0x28, 0x4b, 0x0c, 0x49, 0xe2, 0x93, 0x64, -0x25, 0x9c, 0x56, 0xc0, 0xef, 0x24, 0x2a, 0xad, 0x24, 0x88, 0x8b, 0x78, -0x56, 0x21, 0x6b, 0xd0, 0xaa, 0x4f, 0x72, 0xec, 0xc8, 0x38, 0xc7, 0x8e, -0x4c, 0xd1, 0x6a, 0x34, 0x49, 0x33, 0x97, 0x5b, 0x4f, 0x19, 0x50, 0xa1, -0xf7, 0xa1, 0x9f, 0xec, 0x99, 0x3e, 0x17, 0xfc, 0x45, 0x09, 0x00, 0xf4, -0xff, 0xc3, 0xe7, 0xf9, 0xf0, 0x57, 0xff, 0x7c, 0x4f, 0x9b, 0x44, 0x8d, -0x73, 0x89, 0x04, 0x31, 0xab, 0xae, 0x29, 0xb2, 0x62, 0x5d, 0x99, 0xda, -0x9a, 0x02, 0x46, 0x53, 0x54, 0xe6, 0x40, 0xe6, 0x91, 0xb4, 0x89, 0xb8, -0x0c, 0x75, 0x9a, 0x27, 0x7c, 0x92, 0xe7, 0x38, 0x2a, 0x8a, 0x4b, 0x21, -0x4d, 0x7c, 0x52, 0x57, 0x44, 0x4c, 0x15, 0xbc, 0x0e, 0x82, 0x62, 0x27, -0x81, 0xef, 0x31, 0x73, 0x66, 0x92, 0xb1, 0x91, 0xd3, 0x8c, 0x0c, 0xcf, -0xd0, 0x9c, 0x6f, 0x90, 0x26, 0x59, 0x7e, 0xad, 0xe4, 0x7d, 0xa5, 0x01, -0x11, 0x7a, 0x1f, 0x7a, 0xf6, 0xa3, 0xe0, 0x2f, 0x49, 0x20, 0x97, 0xbd, -0xfc, 0xe0, 0x6f, 0x76, 0x6e, 0x32, 0xb0, 0x0f, 0xf2, 0x8a, 0x0b, 0x03, -0x28, 0x58, 0xcf, 0xa7, 0x63, 0x75, 0x89, 0x2d, 0x77, 0x74, 0x21, 0xd9, -0x2c, 0x92, 0xb5, 0x70, 0x2e, 0xc5, 0xa5, 0x0e, 0x97, 0x29, 0x22, 0x06, -0xd4, 0xe4, 0x97, 0x99, 0x51, 0x10, 0x87, 0x3a, 0x21, 0x4d, 0x3c, 0x32, -0x57, 0x40, 0x28, 0x83, 0x5f, 0xc5, 0x8b, 0xaa, 0xf8, 0x1e, 0x1c, 0x7a, -0x67, 0x94, 0x91, 0xe3, 0x63, 0xb4, 0x9a, 0xad, 0x45, 0xe0, 0xed, 0xd7, -0x7d, 0xa2, 0xec, 0xfa, 0xda, 0x8f, 0x2f, 0x0e, 0x7e, 0x09, 0x02, 0x67, -0x89, 0xec, 0xff, 0xeb, 0x9d, 0x77, 0x02, 0x3b, 0xc8, 0xeb, 0xd8, 0x9a, -0xb1, 0x96, 0x5b, 0xee, 0xd8, 0xc4, 0xad, 0x77, 0xef, 0x65, 0x76, 0xec, -0x65, 0xce, 0x1c, 0xfd, 0x47, 0x66, 0x27, 0x0e, 0x93, 0x65, 0x16, 0x27, -0x3e, 0xe0, 0x61, 0x8c, 0xc5, 0x1a, 0xc1, 0x23, 0xc3, 0x68, 0x0a, 0x2e, -0x25, 0x4d, 0xc0, 0xb9, 0x10, 0x67, 0x4a, 0x60, 0x2b, 0xd8, 0xb0, 0x8c, -0xef, 0x5b, 0x26, 0xc7, 0x4e, 0xf3, 0xf6, 0xc0, 0x79, 0x04, 0x86, 0x44, -0xd9, 0xf5, 0xe0, 0x8f, 0xf6, 0xbc, 0x70, 0x29, 0xe0, 0x8b, 0x5e, 0xb1, -0x04, 0x7a, 0xe0, 0xcb, 0x6c, 0x7f, 0x4c, 0x7f, 0xbe, 0xfd, 0xb1, 0x3d, -0xf7, 0x2d, 0xe4, 0xec, 0xd6, 0x28, 0x9b, 0xb6, 0x7c, 0x1e, 0xeb, 0xc7, -0x54, 0xd7, 0xdf, 0x45, 0xd2, 0xc8, 0x68, 0x36, 0x3c, 0x9a, 0xad, 0x98, -0x56, 0x52, 0x26, 0x75, 0x1d, 0x08, 0x1d, 0x28, 0x55, 0x44, 0x4b, 0x88, -0x44, 0x88, 0xf8, 0xed, 0x98, 0x10, 0x34, 0x75, 0x48, 0x96, 0xe6, 0x43, -0xa0, 0x5a, 0x0d, 0x09, 0xa3, 0x76, 0x4e, 0x95, 0x5f, 0x25, 0x4f, 0x5e, -0x09, 0xf8, 0x2b, 0x24, 0x90, 0xcb, 0xf7, 0x77, 0xed, 0xec, 0x51, 0xa5, -0x26, 0x02, 0x6b, 0xaf, 0x29, 0xd1, 0xb1, 0xf1, 0x8f, 0x80, 0x94, 0xfa, -0xd8, 0x6b, 0x4c, 0x9e, 0x3c, 0x46, 0xab, 0x15, 0x93, 0xb9, 0x0a, 0x6a, -0x6b, 0xd8, 0x70, 0x25, 0x26, 0x5c, 0x85, 0x09, 0x3a, 0x51, 0xaf, 0x8c, -0x52, 0x40, 0x24, 0x40, 0xc5, 0xe6, 0x97, 0x9c, 0x38, 0x54, 0x04, 0x11, -0x87, 0x13, 0x30, 0x7e, 0xcc, 0xda, 0x75, 0x05, 0x8c, 0xf5, 0xf2, 0xb0, -0x51, 0x7a, 0xaf, 0xb4, 0x6f, 0x74, 0xc5, 0x04, 0x44, 0xd9, 0xee, 0xda, -0xcd, 0xda, 0x1b, 0x6e, 0xfb, 0x0c, 0x5e, 0x10, 0x03, 0x29, 0xc7, 0x5f, -0x7f, 0x86, 0x24, 0x29, 0x90, 0x69, 0x19, 0xfc, 0x1a, 0x61, 0x61, 0x15, -0x61, 0x69, 0x25, 0x51, 0xb1, 0x13, 0x2f, 0xac, 0x62, 0xfd, 0x12, 0x98, -0x18, 0xd5, 0x10, 0xc9, 0xbc, 0xfc, 0x52, 0x13, 0x45, 0x55, 0x72, 0x5f, -0xc7, 0x82, 0x5f, 0x64, 0xdd, 0xfa, 0x2a, 0x36, 0x08, 0xd0, 0x5c, 0xc7, -0xd6, 0x1f, 0x7c, 0xe3, 0xf1, 0xda, 0x95, 0x14, 0xfc, 0x4b, 0xd6, 0xc4, -0x0b, 0x99, 0xea, 0xfa, 0xd5, 0x79, 0x1f, 0xa7, 0x56, 0x83, 0x6b, 0x7a, -0xee, 0x05, 0x52, 0xa6, 0x47, 0xdf, 0xe5, 0xf4, 0x87, 0xc7, 0x50, 0xaf, -0x8a, 0x17, 0xd6, 0x08, 0x8b, 0x9d, 0x44, 0xe5, 0x6a, 0x9e, 0xc7, 0x68, -0x4a, 0x26, 0x09, 0x99, 0x5a, 0x54, 0xfd, 0xdc, 0x02, 0x78, 0x08, 0x20, -0x6a, 0x40, 0x0c, 0xa8, 0x45, 0xf1, 0xc0, 0x8b, 0x89, 0xca, 0x55, 0xd6, -0xad, 0x9b, 0x66, 0x68, 0x30, 0x41, 0x33, 0x87, 0x2a, 0xf7, 0x00, 0xfb, -0x97, 0xc2, 0x77, 0x59, 0x0b, 0x2c, 0x80, 0x5f, 0xbb, 0x8a, 0x1e, 0x11, -0xba, 0x45, 0x0d, 0x37, 0xf6, 0x6c, 0x21, 0x2c, 0x77, 0x02, 0x29, 0xc3, -0x6f, 0xff, 0x3b, 0xea, 0xd5, 0xf0, 0xe3, 0x95, 0xc4, 0xa5, 0x95, 0x14, -0x2a, 0x9d, 0xc4, 0xa5, 0x0a, 0x41, 0x14, 0x63, 0x8d, 0xa3, 0x7e, 0x66, -0x8a, 0x99, 0x89, 0x59, 0x54, 0x04, 0x35, 0x1e, 0x6a, 0x02, 0xc4, 0x84, -0x28, 0xf9, 0xab, 0xf1, 0x42, 0x8c, 0x1f, 0x63, 0xc3, 0x02, 0x36, 0xaa, -0x71, 0xed, 0xa6, 0x1a, 0xd6, 0x0f, 0x16, 0xe2, 0x60, 0xc7, 0x52, 0xe0, -0x97, 0x24, 0x00, 0x50, 0xeb, 0x5a, 0x89, 0x28, 0x77, 0x8a, 0x42, 0x18, -0x5a, 0xd6, 0x6f, 0xee, 0x05, 0x32, 0x9a, 0xf5, 0x71, 0x26, 0x46, 0x86, -0x09, 0x8a, 0xab, 0x88, 0x2b, 0x2b, 0x28, 0x54, 0x6b, 0xc4, 0xa5, 0x12, -0x41, 0xe0, 0x63, 0x24, 0x25, 0x9d, 0x3d, 0xcd, 0xd1, 0xf7, 0x47, 0x38, -0xfc, 0xde, 0x38, 0x59, 0xd2, 0xc8, 0x41, 0x99, 0x30, 0xef, 0x11, 0xf9, -0x05, 0x4c, 0x50, 0xc0, 0x86, 0x05, 0xbc, 0xa8, 0x80, 0x1f, 0x16, 0xf0, -0xe2, 0x0a, 0xd5, 0x95, 0x35, 0xaa, 0x1d, 0x31, 0xed, 0x26, 0x70, 0x6f, -0xdf, 0xb6, 0x9d, 0xdd, 0x57, 0x4d, 0x20, 0x88, 0x42, 0x44, 0xd8, 0x21, -0x6a, 0x58, 0xb7, 0xa1, 0x83, 0x35, 0x37, 0x7d, 0x1a, 0x48, 0x19, 0x79, -0xff, 0x15, 0xa2, 0xca, 0x2a, 0x0a, 0xd5, 0x1c, 0x7c, 0x54, 0x28, 0xe2, -0xf9, 0x1e, 0x2a, 0x4d, 0xd2, 0xfa, 0x28, 0x47, 0xdf, 0x1b, 0x66, 0xe2, -0xd4, 0x19, 0x66, 0xa6, 0xea, 0x0c, 0x1e, 0xaa, 0x83, 0x24, 0xa8, 0xf1, -0xc0, 0x8b, 0x30, 0x7e, 0x11, 0x2f, 0x28, 0x12, 0x44, 0x25, 0xc2, 0xb8, -0x44, 0x10, 0x17, 0x09, 0x0b, 0x45, 0xfc, 0x42, 0x95, 0xeb, 0xae, 0x2f, -0xe1, 0xf9, 0xde, 0x82, 0xfa, 0x7b, 0xae, 0x9a, 0x80, 0xab, 0x8f, 0xd6, -0x44, 0xe8, 0x51, 0x2c, 0xeb, 0xae, 0xeb, 0x06, 0x32, 0x20, 0x63, 0xf2, -0xe4, 0x71, 0xe2, 0x4a, 0x07, 0x85, 0x72, 0x89, 0x30, 0x8e, 0xf0, 0x3c, -0x20, 0x9d, 0x23, 0x9d, 0x3a, 0xc1, 0xe1, 0x5f, 0x0f, 0x72, 0xf4, 0x83, -0x31, 0x92, 0x66, 0x42, 0x9a, 0xa4, 0x8c, 0x8c, 0xce, 0x33, 0x38, 0x38, -0x8f, 0xc5, 0x61, 0xfd, 0x00, 0x2f, 0x88, 0xf0, 0xa3, 0x02, 0x7e, 0x5c, -0x20, 0x88, 0x22, 0xbc, 0x30, 0xc0, 0x7a, 0x7e, 0x7e, 0xcb, 0x77, 0x15, -0xb0, 0xde, 0x22, 0x81, 0x25, 0xfb, 0xa7, 0x4b, 0x12, 0x58, 0x70, 0x1f, -0x55, 0x43, 0x10, 0x7a, 0x40, 0x4a, 0xfd, 0xf4, 0x30, 0x7e, 0xe0, 0x11, -0xc6, 0x21, 0x7e, 0xe0, 0x61, 0x48, 0x71, 0xad, 0x19, 0x92, 0xa9, 0x61, -0x0e, 0xbd, 0x35, 0xc8, 0xe0, 0xfb, 0xa7, 0x68, 0x36, 0x9a, 0x38, 0xd1, -0x29, 0x11, 0x48, 0x93, 0x8c, 0xe1, 0xe1, 0x06, 0x47, 0x8e, 0xcc, 0xe1, -0xd1, 0xc2, 0xf7, 0x0d, 0x41, 0xe8, 0xe3, 0x07, 0x7e, 0x9e, 0x14, 0xa2, -0xa0, 0x19, 0xa0, 0xc4, 0xe1, 0x79, 0x4d, 0xad, 0xde, 0xbe, 0x6d, 0xa6, -0x76, 0x71, 0x64, 0xb9, 0x2c, 0x79, 0x0a, 0x89, 0x2c, 0xa4, 0x11, 0xca, -0xdc, 0xf4, 0x19, 0x40, 0x98, 0x3e, 0x39, 0x84, 0x67, 0x05, 0xab, 0x09, -0x9a, 0x26, 0x48, 0x3a, 0x47, 0x52, 0x1f, 0xe7, 0xe0, 0xdb, 0x27, 0x19, -0x1d, 0x9e, 0x22, 0x6d, 0x25, 0x0b, 0x95, 0xd3, 0x80, 0xb6, 0x1b, 0xbf, -0x59, 0xe6, 0x38, 0x76, 0x7c, 0x9e, 0x46, 0x0b, 0x36, 0x7f, 0xc2, 0x62, -0xc2, 0x00, 0xe3, 0x42, 0x70, 0x16, 0xc1, 0xa2, 0xae, 0x85, 0x24, 0x73, -0x34, 0xe6, 0x9b, 0xa8, 0xc8, 0xb9, 0x10, 0xee, 0x04, 0x5e, 0xe0, 0x12, -0xb2, 0x34, 0x01, 0xcd, 0x3b, 0x72, 0x2a, 0xca, 0x89, 0xa3, 0x27, 0xa9, -0x9f, 0x3a, 0x46, 0xe3, 0xcc, 0x87, 0x68, 0x73, 0x92, 0x2c, 0x31, 0xe0, -0x1a, 0x9c, 0x3e, 0x39, 0xc5, 0x7b, 0x07, 0x27, 0x99, 0xad, 0xcf, 0x23, -0x79, 0xd1, 0xbd, 0xd0, 0xbd, 0xdb, 0xa7, 0xca, 0x90, 0x2a, 0x3b, 0x54, -0x41, 0xc5, 0x31, 0x3a, 0x32, 0xc7, 0xd4, 0xb4, 0xe3, 0xa6, 0x9b, 0x12, -0xae, 0xd9, 0xd4, 0x80, 0xb4, 0x82, 0xe7, 0xf9, 0xa0, 0x29, 0xae, 0x31, -0xc9, 0xa9, 0xd1, 0x3a, 0xce, 0xb9, 0x73, 0x21, 0xf4, 0x5c, 0x1d, 0x01, -0x69, 0x67, 0xa3, 0x22, 0x0c, 0x1e, 0x69, 0x12, 0xfc, 0x70, 0x2f, 0x9d, -0x9d, 0x05, 0x9c, 0xcb, 0x98, 0x9f, 0xcf, 0x18, 0x1e, 0x6e, 0x32, 0x33, -0xd3, 0xc2, 0xa5, 0xe9, 0x42, 0xc5, 0xb4, 0x08, 0xfe, 0x81, 0x1f, 0xee, -0xd9, 0xff, 0xcd, 0x2f, 0xee, 0x7c, 0x5e, 0xa1, 0x47, 0x95, 0x1e, 0x55, -0x40, 0x85, 0xd9, 0x99, 0x06, 0xaf, 0xbf, 0x96, 0x32, 0x38, 0x38, 0xcb, -0xf5, 0xd7, 0x17, 0xa8, 0x56, 0x02, 0x54, 0x84, 0xa9, 0xa9, 0xf9, 0xc5, -0xd2, 0xf1, 0x02, 0x02, 0x97, 0x94, 0x25, 0x93, 0xb9, 0x6f, 0xff, 0x99, -0x79, 0x8e, 0x76, 0x30, 0x19, 0x63, 0xf2, 0x46, 0xad, 0xef, 0x63, 0x0c, -0x88, 0x08, 0x2e, 0x73, 0x88, 0x3b, 0xab, 0xb0, 0xdd, 0x25, 0xdc, 0xf7, -0xe0, 0x8f, 0xce, 0x36, 0x9f, 0xbe, 0x7e, 0xaf, 0xe9, 0x00, 0xfa, 0x17, -0x49, 0xb4, 0xc5, 0x5a, 0x8b, 0x17, 0xf8, 0x58, 0x6b, 0x51, 0x55, 0xc4, -0x39, 0x5c, 0xe6, 0xb8, 0x00, 0xd3, 0x8e, 0xbe, 0x03, 0x7a, 0xc9, 0x0b, -0x6d, 0x49, 0x02, 0x7f, 0xf7, 0xa7, 0xe6, 0x56, 0xa0, 0xff, 0xdc, 0xba, -0x40, 0x2f, 0x98, 0xe8, 0xd9, 0xf9, 0x90, 0xc2, 0xae, 0xbf, 0x7d, 0x46, -0x2f, 0x6a, 0xf2, 0xbe, 0x6d, 0x66, 0x37, 0x79, 0x55, 0x75, 0xd9, 0xc0, -0x3c, 0x47, 0xfa, 0xfb, 0x0e, 0xe8, 0x5d, 0x97, 0xfb, 0x87, 0x2b, 0xfa, -0x9a, 0xf5, 0x9b, 0x5f, 0x34, 0xb7, 0x02, 0x7d, 0x5c, 0x70, 0xac, 0xb5, -0x81, 0x4f, 0x01, 0xfd, 0x0a, 0xcf, 0x7f, 0xed, 0xc7, 0x97, 0xde, 0xa9, -0x05, 0xe9, 0xdb, 0x66, 0x3a, 0xc8, 0x53, 0xf3, 0x1d, 0x5c, 0xde, 0x3d, -0x9e, 0xec, 0x3b, 0xa0, 0x5f, 0x59, 0x6a, 0xbd, 0xdf, 0xe8, 0x7b, 0xe2, -0x6f, 0xe4, 0xae, 0x90, 0x07, 0x75, 0xfe, 0xd6, 0xd4, 0x43, 0xcf, 0xea, -0x9b, 0x97, 0x79, 0xe4, 0xb2, 0xd2, 0xb7, 0xcd, 0x6c, 0x6a, 0xaf, 0x77, -0x2e, 0x91, 0x01, 0xf2, 0x9d, 0x9f, 0xbe, 0x92, 0x35, 0x96, 0xfd, 0xa7, -0x06, 0xff, 0xd7, 0xf2, 0x5b, 0xff, 0x6b, 0x95, 0xff, 0x01, 0x3a, 0xbb, -0x29, 0xfe, 0x9c, 0xd4, 0x1a, 0x60, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_browse.xpm b/Source/Core/DolphinWX/resources/toolbar_browse.xpm deleted file mode 100644 index 1c4ea9fb26..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_browse.xpm +++ /dev/null @@ -1,202 +0,0 @@ -/* XPM */ -static const char *toolbar_browse_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 148 2", -" c #14100F", -". c #161211", -"X c #191614", -"o c #1C1816", -"O c #1E1C1B", -"+ c #24211F", -"@ c #252322", -"# c #292524", -"$ c #242628", -"% c #272829", -"& c #2C2D2D", -"* c #323233", -"= c #3C3E3F", -"- c #3D3F40", -"; c #414345", -": c #4A4D4F", -"> c #4B4E50", -", c #4E5153", -"< c #505456", -"1 c #50585D", -"2 c #425C69", -"3 c #4A626E", -"4 c #54636B", -"5 c #5E656A", -"6 c #4D6672", -"7 c #4F6A77", -"8 c #516A76", -"9 c #546D7B", -"0 c #596D79", -"q c #5D727D", -"w c #6A6C6E", -"e c #656E73", -"r c #6F7274", -"t c #61727C", -"y c #5D7684", -"u c #5D7E90", -"i c #617783", -"p c #617986", -"a c #647C89", -"s c #67808D", -"d c #6C828E", -"f c #738087", -"g c #778288", -"h c #628294", -"j c #698594", -"k c #6D8897", -"l c #678799", -"z c #6C8B9D", -"x c #728691", -"c c #758995", -"v c #7A8C95", -"b c #738C9A", -"n c #798E9B", -"m c #75909F", -"M c #7B909C", -"N c #6F8FA0", -"B c #708FA0", -"V c #7492A4", -"C c #7A95A6", -"Z c #7997A9", -"A c #7D9AAA", -"S c #869094", -"D c #84949D", -"F c #89969F", -"G c #8597A1", -"H c #8798A2", -"J c #8C9BA5", -"K c #829DAC", -"L c #8B9EAA", -"P c #939EA5", -"I c #839FB0", -"U c #8EA1AC", -"Y c #91A2AD", -"T c #9BA6AC", -"R c #85A1B3", -"E c #8AA4B4", -"W c #8EA8B8", -"Q c #93A5B1", -"! c #96A8B3", -"~ c #9BAAB2", -"^ c #94ACBC", -"/ c #9DAFBB", -"( c #9CB0BD", -") c #A2AEB4", -"_ c #A0AFB8", -"` c #A7B2B7", -"' c #ADB1B3", -"] c #A4B3BC", -"[ c #AAB5BC", -"{ c #AEB9BF", -"} c #B0B9BF", -"| c #BDBEBF", -" . c #9DB3C2", -".. c #A2B6C4", -"X. c #A3B9C7", -"o. c #ACBAC2", -"O. c #A6BBC9", -"+. c #AABECB", -"@. c #B3BDC3", -"#. c #B1BFC8", -"$. c #AEC2CE", -"%. c #B6C0C6", -"&. c #B9C2C6", -"*. c #B4C2CC", -"=. c #BDC5CB", -"-. c #BEC8CE", -";. c #AEC2D0", -":. c #B2C5D1", -">. c #B9C7D0", -",. c #B5C8D3", -"<. c #BBCBD5", -"1. c #B7CBD9", -"2. c #BECED8", -"3. c #C1C3C5", -"4. c #C0C7CB", -"5. c #C2CACE", -"6. c #C4CDD2", -"7. c #C8CFD3", -"8. c #C0CFD9", -"9. c #C5D1D7", -"0. c #CCD2D6", -"q. c #C4D2DB", -"w. c #CBD6DD", -"e. c #CED8DF", -"r. c #D1D6D9", -"t. c #D4D9DD", -"y. c #D8DCDF", -"u. c #C5D6E1", -"i. c #CBD7E0", -"p. c #CDD9E1", -"a. c #D3DDE3", -"s. c #DADFE2", -"d. c #D6E0E7", -"f. c #DCE2E6", -"g. c #D5E1E9", -"h. c #DBE4E9", -"j. c #E1E4E6", -"k. c #E1E6EA", -"l. c #E4E9ED", -"z. c #E9ECEE", -"x. c #E6ECF1", -"c. c #EAEEF1", -"v. c #EDF1F4", -"b. c #F2F4F6", -"n. c #F5F7F8", -"m. c #F7F8FA", -"M. c #FBFCFC", -"N. c None", -/* pixels */ -"N.N.N.N.N.N.N.N.N.N.N.N.N.N.` @.&.=.5.7.5.4.=.@.[ N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.N.N.N.N.` 7.f.k.k.j.s.r.0.6.5.5.5.6.7.0.y.j.k.k.f.0.} N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.N.} f.l.t.5.{ [ [ { %.=.5.6.6.-.*.*.o.[ _ ~ T ~ ` &.r.k.j.&.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.@.b.s.o.) @.6.f.x.n.M.M.m.n.v.c.x.h.d.a.p.i.q.<.:.O.( Q U ) 0.b.5.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.7.b.[ ] 9.h.x.c.v.b.n.M.M.n.v.v.l.k.h.a.a.p.w.q.<.,.:.;.$.O.( L T z.s.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.@.>.d.d.h.k.l.c.v.n.M.M.n.v.v.l.k.h.a.a.p.w.q.<.,.:.$.+.O.X.X.^ Q m.N.N.N.N.N.N.N.N.N.N.N.", -"N.>.M.a.w.p.a.h.k.l.c.v.b.n.n.b.v.c.l.k.h.a.a.w.q.8.<.,.$.$.+.O.X. .^ ..m.x.N.N.N.N.N.N.N.N.N.N.", -"N.N.8.M.h.i.a.d.h.l.z.c.v.v.v.v.v.x.l.h.d.a.p.w.q.2.<.,.$.$.+.O. .( +.c.v.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u +.n.m.l.d.d.h.l.l.c.v.v.c.c.x.l.h.d.a.p.i.q.2.,.:.+.O.X.O.:.d.M.l.+.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u u V $.k.m.m.b.c.x.l.l.c.l.a.9.6.6.6.-.=.*.<.2.<.<.2.i.h.v.m.c.w.+.X.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h h h B E *.a.z.b.M.M.f.6.7.0.5.=.=.4.7.0.5.6.l.M.M.M.b.l.a.q.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z z N B Z K ^ .%.r.6.@.@.-.7.0.7.&.@.&.0.0.y.b.x.h.d.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z A I K ] r.@.%.k.M.M.M.M.M.M.m.a.{ =.0.6.x.l.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z A Z [ t.[ t.M.M.M.M.M.M.M.M.M.M.m.-.{ r.5.l.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z Z ! y.[ s.M.M.M.M.M.M.M.M.M.M.M.M.M.6.@.r.6.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.h l l B V Z C r.@.w.n.M.M.M.M.M.M.M.M.M.M.M.M.M.v.@.=.6.e.a.w.<.:.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.b A V V V o.7.-.f.M.M.M.M.M.M.M.M.M.M.M.M.M.M.n.t.[ 0.-.h.g.*.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.[ b.0.c h b 0.@.s.k.m.m.m.M.M.M.M.M.M.M.m.m.n.n.b.a.-.&.=.T 5.b.%.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.5.n.T q 6 2 v 0.-.f.k.b.m.m.m.M.M.M.M.M.m.m.n.b.b.v.a.e.@.7.6 8 F z.y.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.Y 8 9 9 7 ) 6.w.f.k.b.n.m.M.M.M.M.M.M.m.m.n.b.b.l.a.a.#.0.x 8 8 v m.N.N.N.N.N.N.N.N.N.N.N.", -"N.6.M.J y d d a @.=.s.j.l.c.n.m.M.M.M.M.M.M.M.m.n.b.v.f.s.a.=.0.L a a c n.v.N.N.N.N.N.N.N.N.N.N.", -"N.N.w.b.! n M n &.=.f.k.z.v.b.m.M.M.M.M.M.M.m.m.n.b.z.j.f.s.5.7.~ c L f.b.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h -.m.f.@.Y &.=.f.l.z.b.n.m.m.M.M.M.M.M.M.m.n.v.z.k.f.s.5.6.o.0.m.x.+.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u u A >.c.z.0.=.s.l.c.b.n.m.M.M.M.M.M.M.m.m.n.v.z.k.f.f.=.5.t.n.i.+.X.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h h h V ^ o.5.0.c.c.b.n.m.m.M.M.M.M.M.m.m.n.b.z.l.f.f.%.0.<.i.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z z z C 0.=.b.c.b.n.m.M.M.M.M.M.M.m.m.n.b.z.k.j.f.%.7.q.i.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V B =.=.k.b.b.n.m.m.M.M.M.M.m.m.n.b.v.z.k.c.6.6.-.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V V U t.=.m.n.n.n.n.m.m.m.m.m.n.n.b.c.z.v.k.@.0.6.d.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z V @.7.0.M.m.m.m.m.m.m.m.n.n.n.b.b.n.v.@.0.-.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.h l z N V Z A C 7.5.0.m.M.M.M.M.M.M.M.M.m.m.m.c.%.0.=.=.h.a.w.<.:.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.z C V V Z A K K 7.7.=.z.M.M.M.M.M.m.m.m.n.t.@.0.&.t.6.w.a.g.*.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.` z.0.n j B A R W E =.t.=.6.s.z.v.v.c.k.r.=.5.y.=.@.6.f.w * ' b.@.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.=.m.) t 3 2 3 9 a k C A ! 5.r.0.5.5.5.5.6.0.0.@.[ o.n ~ r . % S v.r.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.Y 6 8 8 9 9 8 8 8 8 9 9 9 d Y { %.&.@.` H i 9 9 6 7 4 & ; - o $ g M.N.N.N.N.N.N.N.N.N.N.N.", -"N.9.M.G y a a a a a a a a a a a p y y p p p y y p a a a s 0 & : e = o & 3.M.N.N.N.N.N.N.N.N.N.N.", -"N.N.t.c.L c b n n n n n n n n n n n n n n n n n n n n n n C t @ > e = X = 5 N.N.N.N.N.N.N.N.N.N.", -"N.N.h 8.m.t.] Y L L U U Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y U U L Q f # : e = o @ N.N.N.N.N.N.N.N.N.N.", -"N.N.u u K 8.v.v.f.6.#.o.] ( ( / / / / / / / / / ( ( ( ..o.-.t.n.| # : e = O & N.N.N.N.N.N.N.N.N.", -"N.N.h h h h V ( 8.h.v.b.v.x.k.f.a.a.a.e.e.a.a.a.h.k.c.b.M.M.m.c.x.T # : e = O & N.N.N.N.N.N.N.N.", -"N.N.h h l z z z B Z E .*.2.p.h.l.x.v.b.n.m.M.M.M.M.M.M.b.x.h.d.a.g.P # : e = O & N.N.N.N.N.N.N.", -"N.N.h h l z B V C A K R E W ^ .X.+.:.8.i.a.h.c.b.M.M.n.v.x.k.h.a.w.u.F # > e = O & N.N.N.N.N.N.", -"N.u h h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.<.1.D % , e = O & N.N.N.N.N.", -"N.N.h h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.<.$.,.1 o < e = O & N.N.N.N.", -"N.N.x h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.2.:.Q N.N.+ < e = O & N.N.N.", -"N.N.N.c k z N V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.l.h.d.w.o.H N.N.N.N.@ < e = + @ N.N.", -"N.N.N.N.N.c b m C A R E ^ ^ .X.O.$.,.q.p.d.l.v.m.M.M.M.n.c.h.9.[ H N.N.N.N.N.N.N.@ < 5 * o N.N.", -"N.N.N.N.N.N.N.N.v n C K E ^ / ..O.$.<.q.a.d.l.x.c.v.k.0.@.~ F N.N.N.N.N.N.N.N.N.N.N.# ; & X N.N.", -"N.N.N.N.N.N.N.N.N.N.N.N.N.N.v D D G H J J J J J F N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.& N.N.N.N." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c b/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c deleted file mode 100644 index d2d21a30de..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c +++ /dev/null @@ -1,277 +0,0 @@ -static const unsigned char toolbar_pause_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x2e, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x4b, 0x6c, 0x5d, 0xd7, 0x75, -0x86, 0xbf, 0xbd, 0xf7, 0x79, 0xdc, 0x87, 0x28, 0x5d, 0x52, 0x22, 0x29, -0x25, 0x96, 0x2c, 0x45, 0xb0, 0x55, 0x35, 0x4e, 0xa4, 0xa2, 0xa3, 0x0c, -0x6a, 0x2b, 0x40, 0x50, 0x4f, 0x0a, 0xc8, 0xb3, 0x0e, 0x0c, 0x23, 0xca, -0xa4, 0x4a, 0x1c, 0xc0, 0x4a, 0x07, 0x1d, 0x09, 0x45, 0x64, 0x18, 0xa9, -0x03, 0x03, 0xae, 0x65, 0xb5, 0x40, 0x91, 0x64, 0xa0, 0x00, 0x0d, 0xa7, -0x85, 0xd3, 0x0e, 0xda, 0xa2, 0x69, 0xa1, 0x38, 0x9d, 0x14, 0x28, 0x50, -0x39, 0xb1, 0x91, 0x0a, 0xb2, 0x65, 0x3d, 0x28, 0x89, 0x22, 0xef, 0x25, -0xef, 0x9b, 0xf7, 0x3c, 0xf6, 0x5e, 0x1d, 0xec, 0x73, 0x1f, 0x94, 0x48, -0x89, 0xb2, 0x83, 0x1a, 0xde, 0xc0, 0xc1, 0xb9, 0x8f, 0x7d, 0xcf, 0xf9, -0xff, 0xb5, 0xfe, 0xfd, 0xaf, 0xb5, 0x0f, 0xa9, 0x44, 0x84, 0xcf, 0xf3, -0xd0, 0x9f, 0x35, 0x80, 0x4f, 0x3b, 0x82, 0xcf, 0xf2, 0xe6, 0xa7, 0x4f, -0xff, 0x58, 0x0d, 0x5f, 0xff, 0xe8, 0x47, 0x7f, 0xf6, 0x89, 0xa4, 0xa0, -0x7e, 0x57, 0x12, 0xfa, 0xe1, 0x0f, 0xff, 0xe5, 0xa0, 0x88, 0x9c, 0x10, -0x71, 0x27, 0x9c, 0x73, 0x07, 0x9d, 0x93, 0x63, 0x22, 0xae, 0xe6, 0x9c, -0xc3, 0x39, 0x87, 0x88, 0xbb, 0xee, 0x9c, 0xbb, 0xe1, 0x9c, 0xbb, 0xe4, -0x9c, 0x7b, 0xaf, 0xd5, 0xea, 0xff, 0x7c, 0x93, 0xcb, 0x08, 0x3c, 0x1e, -0x99, 0x4f, 0x45, 0xe0, 0xcd, 0x37, 0xff, 0xa3, 0x26, 0xe2, 0x5e, 0x10, -0x91, 0x33, 0x22, 0x72, 0xdc, 0x03, 0x15, 0x26, 0x40, 0x8f, 0x5e, 0x6f, -0x7c, 0x6f, 0x71, 0xce, 0x35, 0x9d, 0x73, 0xff, 0x68, 0xad, 0xfb, 0xfb, -0xf5, 0xf5, 0xfc, 0x97, 0x05, 0xf8, 0xe1, 0x01, 0x20, 0xdb, 0x21, 0xf2, -0x89, 0x09, 0xbc, 0xf5, 0xd6, 0xa5, 0x73, 0x20, 0x67, 0x9c, 0x93, 0x9a, -0x88, 0x50, 0x2a, 0xc5, 0x54, 0xab, 0x55, 0xa6, 0xa6, 0xa6, 0x50, 0x4a, -0x11, 0x45, 0xf1, 0x08, 0x6c, 0x96, 0x65, 0xf4, 0xfb, 0x5d, 0xba, 0xdd, -0x3e, 0x9d, 0x4e, 0x8b, 0x4e, 0xa7, 0x43, 0x9e, 0x67, 0x93, 0xe4, 0xde, -0xb5, 0xd6, 0xfe, 0x45, 0x9a, 0x72, 0xb9, 0x20, 0xe0, 0x86, 0x64, 0x1e, -0x45, 0xe2, 0xb1, 0xd7, 0xc0, 0xdb, 0x6f, 0xbf, 0x7b, 0x42, 0x29, 0x75, -0x51, 0x6b, 0x7d, 0x50, 0x6b, 0xcd, 0xcc, 0xcc, 0x0c, 0x4f, 0x3e, 0xb9, -0x97, 0xdd, 0xbb, 0xcb, 0x54, 0x2a, 0x01, 0x41, 0xa0, 0x09, 0x02, 0x83, -0xb5, 0xe0, 0x1c, 0xf4, 0x7a, 0x29, 0xdd, 0x6e, 0x42, 0xab, 0xd5, 0xa7, -0xd1, 0x68, 0x33, 0x33, 0x33, 0x4d, 0x9a, 0xa6, 0xb4, 0x5a, 0x6b, 0xdc, -0xbd, 0xbb, 0x44, 0x92, 0x24, 0x00, 0xcf, 0x2a, 0xa5, 0xfe, 0x2b, 0x0c, -0xed, 0x5f, 0x65, 0x99, 0x7e, 0x0d, 0x50, 0x05, 0x89, 0x21, 0x91, 0x2d, -0xc7, 0x63, 0x65, 0xe0, 0xc2, 0x85, 0xff, 0x3c, 0xa7, 0x94, 0xfa, 0x3e, -0xc0, 0xdc, 0xdc, 0x2c, 0xcf, 0x3c, 0xb3, 0x9f, 0xb9, 0xb9, 0x98, 0x38, -0xd6, 0x38, 0xc7, 0x08, 0xf4, 0xc3, 0x5e, 0x2f, 0x2f, 0x37, 0x59, 0x5c, -0x5c, 0xa2, 0xdf, 0x5f, 0xc7, 0xb9, 0x9c, 0x95, 0x95, 0x15, 0x96, 0x97, -0x97, 0x47, 0x19, 0x11, 0x71, 0xbf, 0xb2, 0x56, 0xfe, 0x54, 0x24, 0x68, -0x00, 0x16, 0x70, 0x0f, 0xcb, 0xc2, 0xb6, 0x33, 0x70, 0xe1, 0xc2, 0xaf, -0x2e, 0x6a, 0xad, 0x4f, 0xc5, 0x71, 0xcc, 0x57, 0xbf, 0x7a, 0x84, 0xa7, -0x9f, 0xde, 0x41, 0xa9, 0xa4, 0x46, 0xe0, 0xd6, 0xd7, 0x2d, 0xab, 0xab, -0x29, 0xed, 0x76, 0xc6, 0x60, 0xe0, 0x0f, 0x6b, 0x2d, 0xce, 0x59, 0xa2, -0xc8, 0x10, 0xc7, 0x21, 0xe5, 0x72, 0x4c, 0xad, 0x36, 0xc5, 0xf4, 0x74, -0x8d, 0xbb, 0x77, 0x97, 0xf9, 0xf8, 0xe3, 0x1b, 0x4c, 0x4f, 0xcf, 0x50, -0x2e, 0x97, 0x59, 0x5c, 0xbc, 0xc5, 0xfa, 0xfa, 0x3a, 0xc0, 0x1f, 0x29, -0x25, 0xff, 0x2a, 0x92, 0x3f, 0x0f, 0x41, 0x83, 0x8d, 0xeb, 0xe2, 0x81, -0xb1, 0xad, 0x0c, 0xbc, 0xfd, 0xf6, 0xbb, 0x17, 0xb5, 0xd6, 0xa7, 0xaa, -0xd5, 0x2a, 0xcf, 0x3e, 0xfb, 0x0c, 0x07, 0x0e, 0x84, 0xa3, 0x88, 0x36, -0x1a, 0x96, 0xa5, 0xa5, 0x94, 0x7e, 0x3f, 0xc7, 0x39, 0x8b, 0xb5, 0xae, -0x38, 0xdb, 0x89, 0xb3, 0xc3, 0x5a, 0x8b, 0xb5, 0x39, 0x79, 0xee, 0xa8, -0xd5, 0x76, 0x30, 0x3f, 0x3f, 0x4f, 0x9a, 0xe6, 0xbc, 0xff, 0xfe, 0x07, -0x64, 0x59, 0x82, 0xb5, 0x96, 0xbb, 0x77, 0xef, 0xd0, 0x6a, 0x35, 0x87, -0xeb, 0xe2, 0x37, 0x22, 0xea, 0x8f, 0x95, 0x8a, 0xea, 0x80, 0xdd, 0x2a, -0x0b, 0x8f, 0x2c, 0x64, 0x6f, 0xbd, 0x75, 0xe9, 0x22, 0x70, 0x6a, 0xd7, -0xae, 0x1a, 0xcf, 0x3f, 0xff, 0x15, 0xf6, 0xef, 0x0f, 0x8b, 0x88, 0xc3, -0xd5, 0xab, 0x39, 0x8b, 0x8b, 0x39, 0x49, 0x22, 0x28, 0xa5, 0x00, 0x85, -0x2a, 0x9c, 0xdd, 0x9f, 0x55, 0x71, 0x8c, 0xe2, 0x05, 0x40, 0xa3, 0xb1, -0xc6, 0xaf, 0x7f, 0xfd, 0x3e, 0x6b, 0x6b, 0x6b, 0x1c, 0x3d, 0xfa, 0xfb, -0x68, 0x6d, 0x70, 0x4e, 0x98, 0x9b, 0x9b, 0xa7, 0x54, 0xaa, 0x0c, 0x7f, -0xf7, 0x15, 0x11, 0xfb, 0x13, 0xc0, 0xdc, 0x77, 0x91, 0xed, 0x13, 0x78, -0xf3, 0xcd, 0x7f, 0x3f, 0x23, 0x22, 0xa7, 0x4a, 0xa5, 0x12, 0x5f, 0xff, -0xfa, 0x11, 0x66, 0x66, 0x02, 0x9c, 0x83, 0x7a, 0x5d, 0xf8, 0xe8, 0x23, -0x61, 0x30, 0x78, 0x14, 0x7d, 0x46, 0x84, 0xfc, 0xeb, 0xf1, 0x1b, 0x11, -0xb8, 0x7d, 0x7b, 0x91, 0x0f, 0x3f, 0xfc, 0x90, 0xc3, 0x87, 0x9f, 0x1e, -0xd9, 0xef, 0xfc, 0xfc, 0x3c, 0x41, 0x30, 0x52, 0xf6, 0x9f, 0xe4, 0x79, -0xef, 0x15, 0x40, 0x4f, 0x16, 0xbd, 0x6d, 0x11, 0x78, 0xe3, 0x8d, 0x7f, -0x3b, 0x2e, 0x22, 0xe7, 0x8d, 0x31, 0x7c, 0xed, 0x6b, 0xcf, 0x30, 0x33, -0xe3, 0x23, 0x7f, 0xf3, 0xa6, 0xe5, 0xce, 0x1d, 0x6f, 0x7f, 0x20, 0x0c, -0x15, 0xb8, 0xb9, 0x14, 0xc7, 0xdf, 0x0f, 0xdf, 0x8f, 0x39, 0xf8, 0xef, -0xfa, 0xfd, 0x0e, 0x37, 0x6f, 0x5e, 0x67, 0xdf, 0xbe, 0x2f, 0x22, 0x22, -0x28, 0xa5, 0x99, 0x9d, 0x9d, 0x65, 0x42, 0xf6, 0x67, 0xb3, 0xac, 0x7b, -0x68, 0x2b, 0x9c, 0x0f, 0xc9, 0x80, 0x5c, 0x14, 0x81, 0xa3, 0x47, 0x9f, -0x62, 0xff, 0xfe, 0x32, 0xce, 0xc1, 0x8d, 0x1b, 0x29, 0xab, 0xab, 0x79, -0x51, 0x88, 0xec, 0xa8, 0x38, 0x79, 0xf0, 0x82, 0x88, 0x8c, 0x88, 0x8c, -0x81, 0x8f, 0x19, 0xf8, 0xcf, 0x64, 0xc3, 0x77, 0x22, 0xd0, 0xe9, 0xb4, -0x69, 0x36, 0xd7, 0x08, 0xc3, 0x12, 0x22, 0x8e, 0x38, 0x2e, 0xb1, 0x63, -0xc7, 0xd4, 0x70, 0xd2, 0x2e, 0x11, 0xf7, 0x97, 0x6c, 0x21, 0xa3, 0x4d, -0x5d, 0xe8, 0xf5, 0xd7, 0xff, 0xf9, 0x9b, 0x5a, 0xeb, 0xe3, 0xbb, 0x76, -0xed, 0xe4, 0xa9, 0xa7, 0x76, 0xa3, 0x94, 0xa2, 0x5e, 0xcf, 0x68, 0x34, -0x32, 0x94, 0xd2, 0x13, 0x52, 0x10, 0x3e, 0xf8, 0xe0, 0x32, 0x8d, 0x46, -0x9d, 0x6e, 0xb7, 0x43, 0xb3, 0xd9, 0xe0, 0xcb, 0x5f, 0x3e, 0xce, 0xe1, -0xc3, 0x47, 0x0a, 0x32, 0x7e, 0xd6, 0xb5, 0x6b, 0x57, 0x69, 0xb7, 0xd7, -0xe8, 0xf7, 0xfb, 0x74, 0x3a, 0x6d, 0x0e, 0x1c, 0x38, 0xc4, 0xfc, 0xfc, -0xbe, 0x11, 0x71, 0xf0, 0x24, 0x94, 0x52, 0x38, 0xe7, 0x3f, 0xab, 0xd5, -0xa6, 0x69, 0xb5, 0x5a, 0xc3, 0x80, 0xbc, 0x94, 0x24, 0xcd, 0x57, 0x81, -0x8f, 0xb6, 0x45, 0x40, 0x44, 0xce, 0x89, 0x08, 0x47, 0x8f, 0x7e, 0x89, -0x9d, 0x3b, 0x23, 0x06, 0x03, 0xc7, 0xe2, 0xe2, 0x3a, 0xce, 0x29, 0x94, -0x92, 0x11, 0x81, 0xf7, 0xde, 0xfb, 0x6f, 0xae, 0x5e, 0xfd, 0x0d, 0xdf, -0xf8, 0xc6, 0x1f, 0x02, 0x7b, 0x80, 0x43, 0x54, 0xab, 0xf3, 0xa4, 0xa9, -0x1b, 0x65, 0xe3, 0xca, 0x95, 0x0f, 0x58, 0x5c, 0xfc, 0xa8, 0x98, 0x33, -0x1c, 0x55, 0x96, 0x97, 0x53, 0x44, 0xc0, 0x39, 0x29, 0xf4, 0x2f, 0x38, -0x97, 0xe3, 0x9c, 0x43, 0x29, 0x30, 0xc6, 0x50, 0xad, 0x56, 0xe9, 0x76, -0xdb, 0x43, 0xc7, 0x7b, 0x05, 0x38, 0xf3, 0x48, 0x02, 0xaf, 0xbd, 0xf6, -0x4f, 0x27, 0xb5, 0xd6, 0x07, 0xa7, 0xa7, 0x6b, 0xcc, 0xce, 0x56, 0x71, -0x0e, 0x6e, 0xdd, 0xea, 0x93, 0x65, 0x76, 0x14, 0xfd, 0x61, 0x02, 0x96, -0x96, 0x6e, 0xf3, 0xf2, 0xcb, 0x27, 0x39, 0x72, 0x64, 0xff, 0xe8, 0xf7, -0x69, 0x6a, 0xf9, 0xc5, 0x2f, 0x96, 0x0b, 0x02, 0x8e, 0x46, 0x63, 0xe5, -0x81, 0x39, 0x49, 0x92, 0xf3, 0xb3, 0x9f, 0xfd, 0xcf, 0x28, 0x43, 0x9e, -0x84, 0xbb, 0x6f, 0x3d, 0x29, 0x2a, 0x95, 0x2a, 0xbd, 0x6e, 0xbb, 0xc8, -0x92, 0x3b, 0x79, 0xfa, 0xf4, 0x8f, 0xbf, 0x77, 0xbf, 0x9d, 0x3e, 0xb0, -0x06, 0x44, 0xe4, 0x94, 0x88, 0x63, 0xcf, 0x9e, 0xdd, 0x4c, 0x4f, 0x97, -0x69, 0xb7, 0x53, 0xd6, 0xd6, 0xd6, 0x27, 0x9a, 0x30, 0xef, 0xf5, 0xd6, -0x3a, 0xd6, 0xd6, 0x1a, 0x1b, 0x80, 0x81, 0x77, 0x9a, 0x21, 0x78, 0x11, -0xa1, 0xdd, 0x6e, 0x3e, 0x74, 0xce, 0x70, 0x1d, 0xf9, 0x9b, 0x3b, 0x10, -0x41, 0x2b, 0x85, 0x42, 0xa8, 0x56, 0xca, 0x80, 0x1a, 0x8a, 0xff, 0xc9, -0x5e, 0xaf, 0x7e, 0xfc, 0x7e, 0xbc, 0x1b, 0x08, 0x9c, 0x3b, 0xf7, 0x0f, -0x35, 0x11, 0xf7, 0x42, 0x10, 0x84, 0xcc, 0xce, 0xce, 0x14, 0x96, 0x39, -0x04, 0xef, 0x8a, 0x82, 0xe4, 0x89, 0x74, 0x3a, 0x2d, 0xe6, 0xe7, 0x6b, -0x88, 0x50, 0x48, 0xc1, 0x1f, 0xad, 0xd6, 0xb0, 0x25, 0x10, 0xfa, 0xfd, -0x1e, 0x7b, 0xf7, 0x4e, 0x3f, 0x30, 0xa7, 0x5e, 0xef, 0x8f, 0xa4, 0x33, -0x5e, 0xf4, 0x5e, 0xfb, 0x4a, 0x15, 0x55, 0xa0, 0x90, 0x51, 0x1c, 0x97, -0x40, 0xa9, 0xe2, 0x1a, 0x72, 0xf2, 0x7e, 0x02, 0x1b, 0x24, 0xe4, 0x9c, -0x3c, 0xa7, 0xb5, 0x50, 0xad, 0x56, 0xa8, 0x56, 0x23, 0xb2, 0xcc, 0x51, -0xaf, 0xf7, 0x0a, 0xcd, 0x7b, 0x8b, 0x1b, 0x46, 0xb0, 0xdb, 0xed, 0xf0, -0xc4, 0x13, 0xb3, 0x38, 0x1f, 0xb4, 0x51, 0xfa, 0x93, 0x64, 0xdc, 0x36, -0xf7, 0x7a, 0xdd, 0x4d, 0xe7, 0x0c, 0x06, 0x76, 0x43, 0xab, 0x2d, 0x4e, -0x0a, 0xd0, 0x0a, 0xa5, 0x14, 0x5a, 0x29, 0x9c, 0x38, 0x9c, 0x40, 0x10, -0x18, 0xd4, 0xd8, 0xc9, 0x8e, 0x3d, 0x34, 0x03, 0x22, 0x72, 0x5c, 0xc4, -0x51, 0xa9, 0x54, 0x28, 0x95, 0x42, 0xda, 0xed, 0x64, 0x43, 0xe4, 0x27, -0xdb, 0x82, 0x7b, 0xf7, 0xee, 0x32, 0x33, 0xb3, 0x13, 0x6b, 0xd9, 0x70, -0x34, 0x9b, 0xe9, 0x48, 0x16, 0x8d, 0xc6, 0xca, 0xa6, 0x73, 0xea, 0xf5, -0xde, 0xc4, 0xe2, 0x1d, 0xdb, 0xb0, 0x42, 0x11, 0x68, 0x4d, 0x60, 0x34, -0x46, 0x1b, 0xb4, 0x86, 0x52, 0x29, 0x9e, 0xc8, 0x10, 0xb5, 0x87, 0x66, -0xc0, 0xef, 0xa6, 0x34, 0x41, 0x10, 0x50, 0xa9, 0x94, 0xb8, 0x73, 0x67, -0x15, 0xe7, 0x6c, 0x11, 0x99, 0x8d, 0x0b, 0x38, 0x4d, 0x13, 0x0e, 0x1f, -0xfe, 0x3d, 0xac, 0x9d, 0xf4, 0x7c, 0x0a, 0x37, 0xf1, 0x04, 0xb2, 0x2c, -0xe5, 0xf0, 0xe1, 0xfd, 0x5b, 0xce, 0x19, 0x06, 0x04, 0xf1, 0xe0, 0x8d, -0x06, 0xa3, 0x15, 0x46, 0x6b, 0x10, 0x87, 0x28, 0x8d, 0x56, 0x3e, 0xfe, -0xc5, 0xef, 0x4f, 0x3c, 0x82, 0x80, 0xd4, 0xc0, 0x11, 0xc7, 0x71, 0xd1, -0xcb, 0x0f, 0x0a, 0x5b, 0xdb, 0x68, 0x9f, 0xa0, 0x68, 0x36, 0xd7, 0x28, -0x95, 0xe2, 0x07, 0xe4, 0xe1, 0xf5, 0x3d, 0x5c, 0xc0, 0xad, 0x4d, 0xe7, -0xdc, 0xb9, 0xd3, 0x2a, 0x9a, 0x3b, 0x87, 0x73, 0x82, 0xc2, 0x61, 0x94, -0xf2, 0xe0, 0x8d, 0xc6, 0x68, 0x8d, 0x20, 0x38, 0xbc, 0xa4, 0xfc, 0x5d, -0x37, 0x6f, 0x3a, 0xef, 0x5b, 0x03, 0xee, 0xf8, 0x50, 0x87, 0xce, 0x41, -0xbb, 0xdd, 0x9b, 0x88, 0xbc, 0xbf, 0xcc, 0xf0, 0xdc, 0xef, 0x77, 0xd9, -0xbb, 0x77, 0x6e, 0x14, 0xdd, 0xb1, 0x25, 0x8e, 0x9d, 0x65, 0x7d, 0xbd, -0xbf, 0xc5, 0x9c, 0x71, 0xb7, 0x2a, 0x62, 0xd1, 0x4a, 0xa1, 0x15, 0x18, -0x6d, 0x08, 0x4d, 0x80, 0x56, 0x3e, 0x4b, 0x5a, 0xb9, 0x91, 0x63, 0x6d, -0x8b, 0x80, 0xb7, 0x33, 0x5d, 0x80, 0xa0, 0x88, 0xfe, 0x64, 0xa7, 0x39, -0x26, 0x51, 0x2e, 0x07, 0x23, 0x57, 0xd9, 0x4a, 0x42, 0x95, 0x4a, 0xb8, -0xe9, 0x9c, 0x3c, 0x9f, 0x94, 0x8f, 0xbf, 0x9e, 0x29, 0xb4, 0x1f, 0x18, -0x8d, 0x02, 0x8c, 0x76, 0xe4, 0x4e, 0x91, 0x65, 0xe9, 0x16, 0x7d, 0xd6, -0xa6, 0x19, 0x10, 0x94, 0x72, 0x63, 0x02, 0xd6, 0x47, 0x80, 0x22, 0x03, -0xe3, 0x16, 0x19, 0x6a, 0xb5, 0x9d, 0xa3, 0xc8, 0x3a, 0x37, 0xbe, 0x46, -0xb7, 0x9b, 0x14, 0x91, 0x95, 0x2d, 0xe7, 0xb4, 0x5a, 0x5d, 0xf2, 0xdc, -0x4b, 0xc8, 0x28, 0xaf, 0xfb, 0xd0, 0x18, 0xa2, 0x30, 0x20, 0x0c, 0x8c, -0x6f, 0xea, 0xac, 0xb7, 0xd2, 0x2c, 0xcb, 0x70, 0x63, 0x02, 0x97, 0x1f, -0x99, 0x01, 0x85, 0x22, 0x49, 0x12, 0xda, 0xed, 0x5e, 0x91, 0x91, 0x71, -0x4f, 0xef, 0x5b, 0x09, 0x3f, 0x37, 0x0c, 0xcb, 0x1b, 0xa2, 0x3b, 0xbc, -0x47, 0x1c, 0x07, 0xf4, 0x7a, 0xeb, 0x88, 0x08, 0xc6, 0xc4, 0x9b, 0xce, -0xf1, 0xeb, 0xa2, 0x85, 0xc2, 0xa1, 0x95, 0xf6, 0xe0, 0x83, 0x80, 0x28, -0x30, 0x04, 0xc6, 0x90, 0xd9, 0x1c, 0xa5, 0x15, 0x0a, 0x45, 0xaf, 0xd7, -0x9d, 0xcc, 0x40, 0xf3, 0x7e, 0x02, 0x1b, 0x6c, 0xd4, 0x39, 0x77, 0x49, -0x44, 0x48, 0x93, 0x01, 0xfd, 0xde, 0x3a, 0xc3, 0xdd, 0x9c, 0x12, 0xc1, -0x15, 0x05, 0x2c, 0xcf, 0xf3, 0xc2, 0x46, 0x1b, 0x0f, 0xd8, 0xa3, 0x73, -0x3e, 0x6a, 0xd6, 0x5a, 0xf2, 0x7c, 0xeb, 0x39, 0xc6, 0x78, 0x97, 0x31, -0x4a, 0x11, 0x05, 0x86, 0x52, 0x14, 0x50, 0x8a, 0x43, 0xe2, 0x30, 0xc0, -0x14, 0xc0, 0x15, 0x8a, 0x24, 0x4d, 0x8a, 0xe8, 0x8f, 0x08, 0x5c, 0x7a, -0x14, 0x81, 0xa6, 0x73, 0x42, 0xaf, 0xd7, 0x61, 0xb5, 0xb1, 0x4a, 0xb9, -0x14, 0xa3, 0x47, 0x99, 0x11, 0x10, 0x8b, 0x38, 0x87, 0xcd, 0x73, 0x8c, -0x31, 0x9b, 0x6e, 0xda, 0x2b, 0x95, 0x88, 0x3c, 0xcf, 0xc8, 0xf3, 0x14, -0xad, 0xf5, 0xa6, 0x73, 0xa6, 0xa7, 0xa7, 0x30, 0x4a, 0x13, 0x87, 0x21, -0x95, 0x38, 0xa6, 0x1c, 0x45, 0x94, 0xc2, 0x80, 0x30, 0x08, 0x50, 0xba, -0xf0, 0x1c, 0x11, 0xd6, 0x9a, 0x4d, 0xac, 0x95, 0xc9, 0x0c, 0x3c, 0x20, -0xa1, 0xfb, 0x0b, 0xd9, 0x65, 0x41, 0xe8, 0x75, 0x7b, 0x0c, 0x06, 0x7d, -0xcf, 0x5c, 0x1c, 0x81, 0x02, 0x8d, 0xa0, 0x44, 0xa1, 0xf0, 0x99, 0x78, -0xe2, 0x89, 0x27, 0xe9, 0xf7, 0x93, 0x11, 0xb0, 0xe1, 0x39, 0x49, 0x52, -0xb2, 0x2c, 0x23, 0xcb, 0x32, 0xe6, 0xe6, 0xf6, 0x6d, 0x3a, 0x27, 0x4f, -0x73, 0xe2, 0x30, 0xa0, 0x1c, 0x45, 0x54, 0xe2, 0x88, 0x72, 0x1c, 0x11, -0x47, 0x61, 0xe1, 0xff, 0xe0, 0x10, 0xac, 0x38, 0x9a, 0xcd, 0xb5, 0x0d, -0x4d, 0xde, 0x76, 0x32, 0xf0, 0x8e, 0x6f, 0x01, 0x7a, 0xd8, 0x3c, 0x27, -0x4b, 0x32, 0x8c, 0x02, 0xad, 0x14, 0x81, 0x56, 0x04, 0x5a, 0xd0, 0x80, -0x12, 0xa8, 0x96, 0xab, 0x5c, 0xb9, 0x72, 0x9b, 0x5e, 0x6f, 0x0c, 0x70, -0x65, 0xa5, 0xc5, 0xb5, 0x6b, 0x77, 0xc9, 0xb2, 0x9c, 0x34, 0xcd, 0x30, -0x26, 0xe2, 0xf2, 0xe5, 0x0f, 0xe9, 0x74, 0xd6, 0x47, 0x73, 0xee, 0x2d, -0xad, 0xb2, 0xb4, 0x78, 0x8f, 0x6a, 0x29, 0x62, 0xaa, 0x12, 0xb3, 0xa3, -0x1c, 0x53, 0x8a, 0x42, 0x02, 0xe3, 0xbd, 0xdf, 0x8a, 0x23, 0xb7, 0x8e, -0xc6, 0xea, 0x1a, 0x49, 0x9a, 0x61, 0x9d, 0x1d, 0xc2, 0x7b, 0x67, 0x61, -0xe1, 0x6c, 0xeb, 0x7e, 0x02, 0x0f, 0x3c, 0x95, 0x38, 0xf3, 0xca, 0x4f, -0x3e, 0x0e, 0xc3, 0xe0, 0xe0, 0x17, 0xf7, 0xed, 0x63, 0xdf, 0xfc, 0x3c, -0x51, 0x18, 0x10, 0x68, 0x0d, 0x78, 0x3f, 0xce, 0xad, 0x25, 0xcd, 0x2d, -0xb9, 0xf5, 0x87, 0xb5, 0x0e, 0xeb, 0x7c, 0x41, 0xb2, 0x85, 0xfb, 0x88, -0x13, 0x9c, 0xf8, 0x1e, 0x87, 0xa2, 0xeb, 0xd4, 0x28, 0x02, 0xa3, 0x08, -0x03, 0x53, 0x48, 0x27, 0xa2, 0x1c, 0x85, 0x44, 0x61, 0x80, 0x56, 0x8a, -0xdc, 0x39, 0x06, 0x69, 0x46, 0x77, 0x30, 0xa0, 0xb3, 0x3e, 0xe0, 0xb7, -0x57, 0xfe, 0x97, 0x6e, 0xbf, 0x47, 0x96, 0xdb, 0xa1, 0x84, 0x5e, 0x58, -0x58, 0x38, 0xfb, 0xc0, 0xf3, 0xd4, 0x4d, 0x36, 0x34, 0xf2, 0x73, 0x67, -0xdd, 0x99, 0x7a, 0xbd, 0xce, 0x9e, 0x99, 0x3d, 0x44, 0x81, 0x46, 0xa1, -0x09, 0xb4, 0x77, 0x23, 0xa3, 0x7c, 0xda, 0xb2, 0x22, 0x7d, 0xf9, 0xf0, -0x2c, 0x16, 0xa5, 0x7d, 0x01, 0x14, 0x05, 0x1a, 0x05, 0xc6, 0xb7, 0xc5, -0x46, 0x19, 0x8c, 0xd6, 0x44, 0x81, 0x21, 0x0e, 0x03, 0x4a, 0x51, 0x48, -0x1c, 0x86, 0x44, 0xa1, 0x41, 0x29, 0x45, 0x5e, 0x04, 0x21, 0xcd, 0x73, -0xd2, 0xdc, 0x72, 0xfb, 0xce, 0x22, 0x83, 0x24, 0xc1, 0x8e, 0xfa, 0x24, -0xae, 0x6f, 0x06, 0x7e, 0x53, 0x02, 0x22, 0x72, 0xde, 0x3a, 0x7b, 0x26, -0xcd, 0x52, 0x56, 0xea, 0xf7, 0x88, 0xbf, 0xf0, 0x05, 0x02, 0xed, 0xdb, -0xdc, 0xc0, 0x28, 0x42, 0x09, 0x08, 0x8d, 0x26, 0x37, 0x9a, 0xcc, 0x6a, -0xd2, 0x5c, 0x79, 0x4f, 0xd7, 0xca, 0x67, 0x62, 0x18, 0x79, 0x0c, 0x1a, -0x30, 0x46, 0x11, 0x68, 0x43, 0x18, 0x68, 0x6f, 0x95, 0x61, 0x40, 0x14, -0x04, 0x04, 0xc6, 0x67, 0x35, 0x77, 0x96, 0xdc, 0x59, 0x06, 0x69, 0xc6, -0x20, 0xcb, 0x58, 0x69, 0xd4, 0x69, 0xac, 0x36, 0xc9, 0xf2, 0xbc, 0xd8, -0x5e, 0x02, 0x70, 0x6e, 0x33, 0xf0, 0x9b, 0x4a, 0x08, 0xe0, 0xbb, 0xdf, -0xfd, 0xbb, 0x9f, 0x86, 0x41, 0xf0, 0xcd, 0x52, 0x14, 0xf2, 0xd4, 0x97, -0x0e, 0x31, 0xbd, 0xab, 0x46, 0x29, 0x0c, 0x88, 0xc3, 0x80, 0xa0, 0xb0, -0x39, 0x27, 0xe2, 0xed, 0xd2, 0xba, 0x09, 0x39, 0x15, 0x1b, 0x19, 0x7c, -0xe5, 0xd0, 0xca, 0xf7, 0x36, 0xa1, 0xd1, 0x04, 0xc6, 0x14, 0x47, 0xd1, -0xa0, 0x89, 0x90, 0x59, 0x4b, 0x92, 0x65, 0xf4, 0x93, 0x8c, 0x5e, 0x92, -0x70, 0xaf, 0x5e, 0xe7, 0xe3, 0x1b, 0xd7, 0x59, 0x4f, 0x92, 0x49, 0x02, -0x97, 0x17, 0x16, 0xce, 0xfe, 0xc1, 0x56, 0x04, 0x36, 0xdd, 0x13, 0x87, -0x46, 0xbf, 0x9a, 0xe7, 0xd9, 0xc9, 0x14, 0x6a, 0xd7, 0x6f, 0xde, 0x22, -0x38, 0x14, 0xa0, 0xa7, 0x76, 0xf8, 0xaa, 0x19, 0x86, 0x18, 0xa3, 0x09, -0x14, 0x50, 0x54, 0x4d, 0xe7, 0x1c, 0xae, 0xd8, 0xd7, 0x4e, 0x5a, 0x86, -0x2e, 0xaa, 0xb7, 0xd6, 0x1a, 0x53, 0x54, 0x73, 0x41, 0xb0, 0xce, 0x15, -0xe0, 0x73, 0xfa, 0x49, 0x46, 0x3f, 0x49, 0x58, 0x69, 0x34, 0xb8, 0x71, -0xeb, 0x26, 0x49, 0x9a, 0x93, 0x5b, 0x3b, 0x69, 0x9d, 0xa7, 0xb6, 0x02, -0xbf, 0x65, 0x06, 0x00, 0x5e, 0xfe, 0xce, 0xdf, 0xfe, 0xb9, 0x52, 0xfa, -0xaf, 0x4b, 0x51, 0x44, 0xb5, 0x5c, 0xe2, 0xf0, 0xa1, 0x83, 0xd4, 0xa6, -0xa6, 0x28, 0x47, 0x61, 0x91, 0x09, 0xdf, 0x35, 0x6a, 0xad, 0x46, 0x75, -0xc6, 0xc3, 0x2b, 0x46, 0x91, 0x86, 0xd1, 0xf3, 0x0b, 0xf1, 0xc0, 0x73, -0xeb, 0xb5, 0xee, 0x23, 0x9f, 0xd2, 0x4f, 0x52, 0x16, 0xef, 0xdc, 0xe5, -0xee, 0xf2, 0x12, 0x83, 0x24, 0x25, 0xcd, 0xb2, 0x49, 0xed, 0x7f, 0x6f, -0x61, 0xe1, 0xec, 0xdb, 0x9f, 0x88, 0x00, 0xc0, 0xb7, 0x4f, 0x5f, 0x78, -0x27, 0x30, 0xe6, 0x64, 0x5c, 0x90, 0x38, 0x78, 0xe0, 0x00, 0xd3, 0x3b, -0xc7, 0x24, 0xa2, 0x20, 0xc0, 0x14, 0x44, 0x86, 0x3b, 0xaa, 0x91, 0x7e, -0xc4, 0x93, 0x71, 0xe2, 0x1d, 0xca, 0x4b, 0xcd, 0x2f, 0xd2, 0x41, 0x9a, -0xb1, 0x9e, 0xa6, 0xb4, 0xbb, 0x5d, 0x6e, 0x2c, 0x2e, 0xd2, 0x6c, 0xb7, -0x19, 0x24, 0x29, 0xb9, 0xcd, 0xc9, 0xed, 0x08, 0xfc, 0x4f, 0x17, 0x16, -0xce, 0x7e, 0xeb, 0x61, 0xe0, 0xe1, 0x11, 0x4f, 0xa7, 0x03, 0x63, 0x4e, -0x25, 0x59, 0x76, 0x49, 0x44, 0x8e, 0x39, 0x67, 0xb9, 0x7a, 0xed, 0x1a, -0xf3, 0x7b, 0x66, 0xd9, 0x3b, 0x37, 0x4b, 0x25, 0x8e, 0x89, 0x42, 0x4b, -0x14, 0x18, 0x42, 0x63, 0x30, 0x5a, 0xa1, 0x95, 0x46, 0xa9, 0xa2, 0xef, -0xa1, 0xb0, 0x56, 0xeb, 0xc8, 0x9d, 0x23, 0xcd, 0xf2, 0xc2, 0x65, 0x72, -0xba, 0xfd, 0x75, 0x96, 0x56, 0x96, 0x59, 0xa9, 0xd7, 0xe9, 0x0f, 0x52, -0xd2, 0x2c, 0xf5, 0x6b, 0xc8, 0x3d, 0x1e, 0xf8, 0x47, 0x66, 0x00, 0xe0, -0xe5, 0x6f, 0xff, 0x4d, 0x2d, 0xcd, 0xf3, 0x4b, 0x81, 0x31, 0xc7, 0x46, -0x1e, 0x5e, 0x2e, 0x31, 0xb7, 0x7b, 0x0f, 0x33, 0xb5, 0x1a, 0xe5, 0x52, -0x4c, 0x38, 0x5a, 0x9c, 0x9e, 0x00, 0x82, 0x5f, 0x13, 0xe2, 0xb7, 0xa2, -0x99, 0xb5, 0xa4, 0x59, 0x4e, 0xab, 0xd3, 0x61, 0xad, 0xd5, 0xa4, 0xbe, -0xba, 0xca, 0x7a, 0xe2, 0x81, 0x67, 0x79, 0xb1, 0x37, 0x18, 0x57, 0xdc, -0x6d, 0x83, 0xdf, 0x16, 0x01, 0x80, 0xef, 0x9c, 0xbe, 0x50, 0x4b, 0xd2, -0xf4, 0x1d, 0xad, 0xf5, 0x73, 0x51, 0x68, 0x08, 0x03, 0xdf, 0xb7, 0x44, -0x61, 0xc8, 0xce, 0x1d, 0x3b, 0xa8, 0x56, 0xaa, 0xec, 0xa8, 0x56, 0x88, -0xc2, 0x08, 0x63, 0x0c, 0x00, 0xd6, 0xe6, 0x24, 0x69, 0xc6, 0x60, 0x30, -0xa0, 0xdb, 0xeb, 0xd2, 0xea, 0x74, 0x48, 0xd2, 0x94, 0x41, 0x9a, 0x91, -0xe5, 0x99, 0xb7, 0x5e, 0x67, 0x47, 0x45, 0xb0, 0x18, 0xe7, 0x16, 0x16, -0xce, 0xbe, 0xba, 0x5d, 0xf0, 0xdb, 0x26, 0x30, 0x1c, 0xdf, 0x3a, 0xf5, -0xc6, 0x39, 0xa5, 0xd4, 0xf7, 0x8d, 0xd6, 0x18, 0xe3, 0x8b, 0x53, 0x50, -0x78, 0xba, 0xdf, 0x88, 0x98, 0x91, 0x84, 0xc0, 0x2f, 0x58, 0xe7, 0x86, -0x36, 0x9b, 0x8f, 0xec, 0xd6, 0x39, 0x37, 0x92, 0x4b, 0x71, 0xfb, 0xeb, -0xc0, 0xa9, 0x85, 0x85, 0xb3, 0xbf, 0x7c, 0x1c, 0xf0, 0x8f, 0x4d, 0x00, -0xe0, 0xa5, 0x97, 0x5e, 0x3f, 0xa6, 0x94, 0x3a, 0xaf, 0x95, 0x3a, 0xa1, -0x0a, 0xdd, 0x6b, 0xa5, 0xbc, 0x1b, 0xe1, 0xb7, 0x86, 0x30, 0xec, 0xff, -0x0b, 0x19, 0x15, 0x51, 0x76, 0x32, 0x7e, 0xe4, 0x58, 0xdc, 0xb6, 0x09, -0x9c, 0x7f, 0xdc, 0xa8, 0x7f, 0x2a, 0x02, 0xc3, 0xf1, 0xe2, 0x8b, 0x3f, -0x78, 0x4e, 0x29, 0x4e, 0x69, 0xa5, 0x5f, 0x50, 0x4a, 0xd5, 0xb4, 0x1e, -0x6e, 0xc0, 0xc7, 0x0f, 0x91, 0x87, 0x80, 0x9d, 0x13, 0x84, 0x0d, 0xc0, -0x2f, 0x03, 0xe7, 0xd9, 0xa2, 0x41, 0xfb, 0x7f, 0x21, 0x30, 0x39, 0x5e, -0x7c, 0xf1, 0x07, 0x27, 0x81, 0xe3, 0xf8, 0xc7, 0x1e, 0x07, 0x8b, 0x63, -0x38, 0x9a, 0x78, 0xc0, 0xd7, 0xf1, 0xed, 0xf0, 0xa5, 0x85, 0x85, 0xb3, -0x37, 0x3e, 0xf5, 0x4d, 0x8b, 0xf1, 0x3b, 0xfb, 0x4b, 0xfd, 0x67, 0x35, -0x3e, 0xf7, 0xff, 0xec, 0xf1, 0xb9, 0x27, 0xf0, 0x7f, 0xca, 0x8f, 0x08, -0x2e, 0x45, 0xb6, 0x8c, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_play.c b/Source/Core/DolphinWX/resources/toolbar_debugger_play.c deleted file mode 100644 index c77e26af54..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_debugger_play.c +++ /dev/null @@ -1,278 +0,0 @@ -static const unsigned char toolbar_play_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x3b, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5b, 0x8c, 0x5d, 0xd5, 0x79, -0xc7, 0x7f, 0x6b, 0xad, 0xbd, 0xf7, 0x39, 0x67, 0x8e, 0xc7, 0x3e, 0x33, -0xe3, 0xb1, 0x31, 0xc1, 0xc6, 0xc4, 0x02, 0xcb, 0x15, 0xc1, 0x6e, 0x22, -0x45, 0xb2, 0xaa, 0x82, 0x93, 0x87, 0xf8, 0x05, 0xc5, 0x48, 0x3c, 0x54, -0x02, 0xa1, 0x38, 0x8a, 0x5a, 0x72, 0x91, 0xb8, 0x3c, 0xf0, 0xe4, 0x54, -0x71, 0x84, 0x52, 0x22, 0x24, 0x0a, 0x76, 0x2b, 0x55, 0x69, 0x1f, 0x8c, -0x54, 0xcd, 0x6b, 0x45, 0xda, 0x07, 0xd2, 0x44, 0x45, 0xb6, 0xd3, 0x48, -0xb4, 0x02, 0xc9, 0x24, 0x10, 0xf0, 0x05, 0x18, 0xdb, 0x83, 0x2f, 0x33, -0x73, 0xe6, 0x7e, 0x2e, 0xfb, 0xb2, 0xbe, 0xaf, 0x0f, 0x7b, 0x9f, 0xcb, -0xd8, 0x33, 0xe3, 0x31, 0x44, 0x45, 0x2c, 0x69, 0xe9, 0xdc, 0xf7, 0xfe, -0xff, 0xbf, 0xff, 0xb7, 0xfe, 0xdf, 0xb7, 0xd6, 0x8c, 0x51, 0x55, 0xbe, -0xc8, 0xc3, 0x7e, 0xde, 0x00, 0x3e, 0xeb, 0x08, 0x3e, 0xcf, 0x9b, 0x3f, -0xf9, 0xe4, 0x3f, 0x9b, 0xce, 0xf3, 0x5f, 0xfc, 0xe2, 0x6f, 0x3e, 0x55, -0x2a, 0x98, 0x3f, 0x55, 0x0a, 0xfd, 0xfc, 0xe7, 0xbf, 0xda, 0xa9, 0xaa, -0x07, 0x54, 0xe5, 0x80, 0x88, 0xec, 0x14, 0xd1, 0xbd, 0xaa, 0x52, 0x13, -0x11, 0x44, 0x04, 0x55, 0x19, 0x17, 0x91, 0x8b, 0x22, 0x72, 0x52, 0x44, -0xde, 0x99, 0x9f, 0x6f, 0xfe, 0x72, 0x85, 0xcb, 0x28, 0xdc, 0x1e, 0x99, -0xcf, 0x44, 0xe0, 0xa5, 0x97, 0xde, 0xa8, 0xa9, 0xca, 0x23, 0xaa, 0xfa, -0xb4, 0xaa, 0xee, 0xcb, 0x81, 0x2a, 0x7d, 0xa0, 0xbb, 0xcf, 0x97, 0xbf, -0xf6, 0x88, 0xc8, 0x9c, 0x88, 0xfc, 0xbb, 0xf7, 0xf2, 0xaf, 0xad, 0x56, -0x76, 0xaa, 0x00, 0xdf, 0x99, 0x00, 0xba, 0x1e, 0x22, 0x9f, 0x9a, 0xc0, -0xcb, 0x2f, 0x9f, 0x3c, 0x0a, 0xfa, 0xb4, 0x88, 0xd6, 0x54, 0x95, 0x72, -0xb9, 0x44, 0xb5, 0x5a, 0x65, 0x70, 0x70, 0x10, 0x63, 0x0c, 0x51, 0x54, -0xea, 0x82, 0x4d, 0xd3, 0x94, 0x66, 0x73, 0x89, 0xa5, 0xa5, 0x26, 0x8b, -0x8b, 0xf3, 0x2c, 0x2e, 0x2e, 0x92, 0x65, 0x69, 0x3f, 0xb9, 0xd3, 0xde, -0xfb, 0xe7, 0x92, 0x84, 0x33, 0x05, 0x01, 0xe9, 0x90, 0xb9, 0x15, 0x89, -0xdb, 0x5e, 0x03, 0xc7, 0x8e, 0x9d, 0x3e, 0x60, 0x8c, 0x39, 0x61, 0xad, -0xdd, 0x69, 0xad, 0x65, 0x78, 0x78, 0x98, 0xbb, 0xef, 0xbe, 0x83, 0x91, -0x91, 0x0a, 0x03, 0x03, 0x01, 0x41, 0x60, 0x09, 0x02, 0x87, 0xf7, 0x20, -0x02, 0x8d, 0x46, 0xc2, 0xd2, 0x52, 0xcc, 0xfc, 0x7c, 0x93, 0x7a, 0x7d, -0x81, 0xe1, 0xe1, 0x21, 0x92, 0x24, 0x61, 0x7e, 0x7e, 0x96, 0xab, 0x57, -0xaf, 0x11, 0xc7, 0x31, 0xc0, 0x83, 0xc6, 0x98, 0xff, 0x09, 0x43, 0xff, -0x77, 0x69, 0x6a, 0x9f, 0x07, 0x4c, 0x41, 0xa2, 0x43, 0x64, 0xd5, 0x71, -0x5b, 0x0a, 0x1c, 0x3f, 0xfe, 0xdf, 0x47, 0x8d, 0x31, 0x3f, 0x01, 0xd8, -0xb2, 0x65, 0x94, 0xfb, 0xef, 0xdf, 0xce, 0x96, 0x2d, 0x25, 0x4a, 0x25, -0x8b, 0x08, 0x5d, 0xd0, 0x6b, 0x3d, 0x9f, 0x9c, 0x9c, 0x63, 0x62, 0xe2, -0x1a, 0xcd, 0x66, 0x0b, 0x91, 0x8c, 0xa9, 0xa9, 0x29, 0x26, 0x27, 0x27, -0xbb, 0x8a, 0xa8, 0xca, 0x6f, 0xbd, 0xd7, 0xbf, 0x52, 0x0d, 0xea, 0x80, -0x07, 0x64, 0x2d, 0x15, 0xd6, 0xad, 0xc0, 0xf1, 0xe3, 0xbf, 0x3d, 0x61, -0xad, 0x3d, 0x5c, 0x2a, 0x95, 0x78, 0xe0, 0x81, 0xdd, 0xdc, 0x77, 0xdf, -0x06, 0xca, 0x65, 0xd3, 0x05, 0xd7, 0x6a, 0x79, 0x66, 0x66, 0x12, 0x16, -0x16, 0x52, 0xda, 0xed, 0x7c, 0x7a, 0xef, 0x11, 0xf1, 0x44, 0x91, 0xa3, -0x54, 0x0a, 0xa9, 0x54, 0x4a, 0xd4, 0x6a, 0x83, 0x0c, 0x0d, 0xd5, 0xb8, -0x7a, 0x75, 0x92, 0x8f, 0x3f, 0xbe, 0xc8, 0xd0, 0xd0, 0x30, 0x95, 0x4a, -0x85, 0x89, 0x89, 0xcb, 0xb4, 0x5a, 0x2d, 0x80, 0xbf, 0x34, 0x46, 0xff, -0x53, 0x35, 0x3b, 0x08, 0x41, 0x9d, 0xe5, 0xeb, 0xe2, 0xa6, 0xb1, 0x2e, -0x05, 0x8e, 0x1d, 0x3b, 0x7d, 0xc2, 0x5a, 0x7b, 0xb8, 0x5a, 0xad, 0xf2, -0xe0, 0x83, 0xf7, 0xb3, 0x63, 0x47, 0xd8, 0x8d, 0x68, 0xbd, 0xee, 0xb9, -0x76, 0x2d, 0xa1, 0xd9, 0xcc, 0x10, 0xf1, 0x78, 0x2f, 0xc5, 0xa3, 0xef, -0x7b, 0x14, 0xbc, 0xf7, 0x78, 0x9f, 0x91, 0x65, 0x42, 0xad, 0xb6, 0x81, -0xad, 0x5b, 0xb7, 0x92, 0x24, 0x19, 0xef, 0xbe, 0xfb, 0x1e, 0x69, 0x1a, -0xe3, 0xbd, 0xe7, 0xea, 0xd5, 0x2b, 0xcc, 0xcf, 0xcf, 0x75, 0xd6, 0xc5, -0x1f, 0x54, 0xcd, 0xb7, 0x8c, 0x89, 0xa6, 0x01, 0xbf, 0x9a, 0x0a, 0xb7, -0x2c, 0x64, 0x2f, 0xbf, 0x7c, 0xf2, 0x04, 0x70, 0x78, 0xd3, 0xa6, 0x1a, -0x07, 0x0f, 0x7e, 0x85, 0xed, 0xdb, 0xc3, 0x22, 0xe2, 0x70, 0xfe, 0x7c, -0xc6, 0xc4, 0x44, 0x46, 0x1c, 0x2b, 0xc6, 0x18, 0xc0, 0x60, 0x0a, 0x67, -0xcf, 0x1f, 0x4d, 0x31, 0xbb, 0xf1, 0x02, 0xa0, 0x5e, 0x9f, 0xe5, 0xf7, -0xbf, 0x7f, 0x97, 0xd9, 0xd9, 0x59, 0xf6, 0xec, 0xf9, 0x33, 0xac, 0x75, -0x88, 0x28, 0x5b, 0xb6, 0x6c, 0xa5, 0x5c, 0x1e, 0xe8, 0xfc, 0xee, 0x2b, -0xaa, 0xfe, 0x5f, 0x00, 0x77, 0xc3, 0x45, 0xd6, 0x4f, 0xe0, 0xa5, 0x97, -0xfe, 0xeb, 0x69, 0x55, 0x3d, 0x5c, 0x2e, 0x97, 0xf9, 0xc6, 0x37, 0x76, -0x33, 0x3c, 0x1c, 0x20, 0x02, 0xd3, 0xd3, 0xca, 0x87, 0x1f, 0x2a, 0xed, -0xf6, 0xad, 0xe8, 0xd3, 0x25, 0x94, 0x3f, 0xef, 0xbd, 0x50, 0x85, 0x4f, -0x3e, 0x99, 0xe0, 0xc2, 0x85, 0x0b, 0xec, 0xda, 0x75, 0x5f, 0xd7, 0x7e, -0xb7, 0x6e, 0xdd, 0x4a, 0x10, 0x74, 0x33, 0xfb, 0xe1, 0x2c, 0x6b, 0x3c, -0x05, 0xd8, 0xfe, 0xa2, 0xb7, 0x2e, 0x02, 0x2f, 0xbe, 0xf8, 0x9b, 0x7d, -0xaa, 0xfa, 0x8a, 0x73, 0x8e, 0xfd, 0xfb, 0xef, 0x67, 0x78, 0x38, 0x8f, -0xfc, 0xa5, 0x4b, 0x9e, 0x2b, 0x57, 0x72, 0xfb, 0x03, 0xa5, 0x93, 0x81, -0x2b, 0xa7, 0x62, 0xef, 0xf3, 0xce, 0xeb, 0x1e, 0x87, 0xfc, 0xb3, 0x66, -0x73, 0x91, 0x4b, 0x97, 0xc6, 0xd9, 0xb6, 0xed, 0x4b, 0xa8, 0x2a, 0xc6, -0x58, 0x46, 0x47, 0x47, 0xe9, 0x4b, 0xfb, 0x23, 0x69, 0xba, 0x74, 0xcf, -0x6a, 0x38, 0xd7, 0x50, 0x40, 0x4f, 0xa8, 0xc2, 0x9e, 0x3d, 0xf7, 0xb2, -0x7d, 0x7b, 0x05, 0x11, 0xb8, 0x78, 0x31, 0x61, 0x66, 0x26, 0x2b, 0x0a, -0x91, 0xef, 0x16, 0xa7, 0x5f, 0xff, 0xfa, 0x37, 0x34, 0x1a, 0x4b, 0xa8, -0x6a, 0x97, 0x48, 0x0f, 0x78, 0x8f, 0x41, 0xfe, 0x9e, 0x2e, 0xfb, 0x4c, -0x15, 0x16, 0x17, 0x17, 0x98, 0x9b, 0x9b, 0x25, 0x0c, 0xcb, 0xa8, 0x0a, -0xa5, 0x52, 0x99, 0x0d, 0x1b, 0x06, 0x3b, 0x5f, 0xda, 0xa4, 0x2a, 0x7f, -0xcb, 0x2a, 0x69, 0xb4, 0x22, 0x81, 0x17, 0x5e, 0x78, 0xfd, 0x3b, 0xaa, -0xba, 0x6f, 0xe3, 0xc6, 0x8d, 0xdc, 0x7b, 0xef, 0x08, 0xc6, 0x18, 0xa6, -0xa7, 0x53, 0xea, 0xf5, 0x14, 0xef, 0xa5, 0x3b, 0x3b, 0x85, 0xe8, 0xfa, -0xf5, 0xeb, 0xbc, 0xfe, 0xfa, 0xaf, 0x38, 0x7b, 0xf6, 0x5c, 0x97, 0x44, -0x3e, 0x3b, 0xc0, 0x6f, 0x34, 0x12, 0x2d, 0xc0, 0xf7, 0xde, 0x5f, 0x5c, -0x5c, 0x20, 0x4d, 0x63, 0x44, 0xf2, 0xf7, 0x6b, 0xb5, 0x21, 0x54, 0xbb, -0xca, 0x3e, 0x11, 0xc7, 0x73, 0x2b, 0xaa, 0xb0, 0x22, 0x01, 0x55, 0x3d, -0xaa, 0xaa, 0xec, 0xd9, 0xf3, 0x65, 0x36, 0x6e, 0x8c, 0x68, 0xb7, 0x85, -0x89, 0x89, 0x56, 0x5f, 0x1b, 0xd0, 0x53, 0x20, 0x4f, 0x25, 0x38, 0x78, -0xf0, 0x01, 0xce, 0x9d, 0xfb, 0x23, 0xa7, 0x4e, 0x9d, 0x5e, 0xa6, 0xc6, -0x72, 0x32, 0x5a, 0xa4, 0x89, 0x29, 0xc0, 0xd1, 0x05, 0x2c, 0xa2, 0xa4, -0x69, 0xa7, 0x16, 0x28, 0xce, 0x39, 0xaa, 0xd5, 0x2a, 0xc6, 0x74, 0xbe, -0xc7, 0x53, 0xeb, 0x22, 0xf0, 0xfc, 0xf3, 0xff, 0x71, 0x48, 0x55, 0x77, -0x0e, 0x0d, 0xd5, 0x18, 0x1d, 0xad, 0x22, 0x02, 0x97, 0x2f, 0x37, 0x49, -0xd3, 0x1e, 0xe0, 0x0e, 0x81, 0x8e, 0x45, 0x02, 0x3c, 0xfc, 0xf0, 0xd7, -0xf8, 0xf1, 0x8f, 0x1f, 0x65, 0x68, 0x28, 0xe2, 0x8d, 0x37, 0x4e, 0xf1, -0xe1, 0x87, 0x1f, 0xa1, 0x2a, 0x37, 0x11, 0xe9, 0x57, 0xa4, 0xa3, 0x50, -0x4e, 0x42, 0x6e, 0x50, 0xcc, 0x30, 0x30, 0x50, 0x2d, 0xf2, 0x46, 0x01, -0x39, 0xb4, 0xd2, 0x42, 0xbe, 0x89, 0x80, 0xaa, 0x1e, 0x56, 0x15, 0x36, -0x6f, 0x1e, 0x61, 0x68, 0xa8, 0xc2, 0xc2, 0x42, 0xc2, 0xec, 0x6c, 0xeb, -0x06, 0xe0, 0xd2, 0xf5, 0xfb, 0x99, 0x99, 0x3a, 0x77, 0xdd, 0x35, 0x82, -0x08, 0x0c, 0x0d, 0x0d, 0xf2, 0xec, 0xb3, 0x0f, 0xf3, 0xd8, 0x63, 0x7f, -0xc1, 0x47, 0x1f, 0x5d, 0xe0, 0xcd, 0x37, 0xff, 0x97, 0x66, 0xb3, 0xd9, -0x8d, 0x7c, 0x47, 0x89, 0x4e, 0xd4, 0x3b, 0xcd, 0x9d, 0xaa, 0x14, 0x37, -0x17, 0x50, 0xc5, 0x1a, 0x83, 0x41, 0xa9, 0x0e, 0x54, 0x00, 0xd3, 0x49, -0xfe, 0xbb, 0x1b, 0x8d, 0xe9, 0x7d, 0x6b, 0x12, 0x38, 0x7a, 0xf4, 0xdf, -0x6a, 0xaa, 0xf2, 0x48, 0x10, 0x84, 0x8c, 0x8e, 0x0e, 0x17, 0x96, 0xd9, -0xa2, 0xbf, 0xa3, 0xec, 0x00, 0xef, 0xa4, 0x50, 0x1c, 0x27, 0x54, 0x2a, -0x51, 0xb7, 0xb0, 0x89, 0xc0, 0xd7, 0xbf, 0x7e, 0x1f, 0xcf, 0x3f, 0xff, -0x18, 0x77, 0xdd, 0xb5, 0x91, 0xdf, 0xfd, 0xee, 0x4d, 0xc6, 0xc7, 0x2f, -0xf5, 0xa9, 0xd1, 0xe9, 0x4a, 0x57, 0x56, 0xc5, 0x98, 0xa2, 0x0a, 0x18, -0x70, 0xce, 0x51, 0x2a, 0x95, 0xa1, 0x9b, 0x72, 0x7a, 0xe8, 0x46, 0x02, -0xcb, 0x5a, 0x09, 0x11, 0x7d, 0xc8, 0x5a, 0xa5, 0x5a, 0x1d, 0xa0, 0x5a, -0x8d, 0x48, 0x53, 0x61, 0x7a, 0xba, 0x51, 0xf8, 0x77, 0x6e, 0x71, 0xd0, -0xf3, 0xf3, 0x1e, 0xa0, 0xbc, 0xdf, 0xe9, 0x1f, 0x51, 0x14, 0xf1, 0xbd, -0xef, 0x7d, 0x8b, 0xf3, 0xe7, 0xaf, 0x30, 0x36, 0x76, 0x8a, 0xc9, 0xc9, -0x29, 0x76, 0xef, 0xbe, 0x97, 0x30, 0x74, 0xcb, 0xa2, 0x2f, 0x22, 0xa8, -0x68, 0x01, 0xda, 0x60, 0x8c, 0xc1, 0x1a, 0x83, 0xa8, 0x20, 0x0a, 0x41, -0xe0, 0x30, 0x3d, 0x03, 0xd8, 0xbb, 0xa6, 0x02, 0xaa, 0xba, 0x4f, 0x55, -0x18, 0x18, 0x18, 0xa0, 0x5c, 0x0e, 0x59, 0x58, 0x88, 0x97, 0x45, 0x7e, -0x79, 0x5b, 0xe0, 0xbb, 0xef, 0xe7, 0xe4, 0x57, 0x9e, 0xbb, 0x76, 0xdd, -0xc9, 0x73, 0xcf, 0x3d, 0xca, 0xde, 0xbd, 0x3b, 0x78, 0xfb, 0xed, 0x33, -0x4c, 0x4c, 0x5c, 0x2d, 0xae, 0xd9, 0x59, 0xbc, 0xd2, 0x8b, 0x3e, 0x86, -0xc0, 0x5a, 0x02, 0x67, 0x71, 0xd6, 0x61, 0x2d, 0x94, 0xcb, 0xa5, 0x3e, -0x85, 0xa8, 0xdd, 0x82, 0x80, 0x1c, 0x10, 0x51, 0x82, 0x20, 0x60, 0x60, -0xa0, 0xcc, 0xc2, 0x42, 0xeb, 0x26, 0xc7, 0x59, 0xee, 0x42, 0x9e, 0x46, -0xa3, 0x41, 0xb9, 0x5c, 0xc2, 0x7b, 0x56, 0x9d, 0x51, 0x14, 0xf1, 0xed, -0x6f, 0xef, 0xe7, 0xa9, 0xa7, 0x0e, 0x91, 0xa6, 0x0d, 0x3e, 0xf8, 0xe0, -0x3c, 0xed, 0x76, 0xdc, 0x33, 0x01, 0xcd, 0xc1, 0x3b, 0x9b, 0xcf, 0xc0, -0x5a, 0x9c, 0x31, 0x58, 0x63, 0xb1, 0x26, 0x8f, 0x7f, 0x91, 0x69, 0x07, -0x6e, 0xa5, 0x40, 0x2d, 0x2f, 0x24, 0xa5, 0xa2, 0x97, 0x6f, 0xaf, 0xe8, -0x3c, 0xbd, 0x5a, 0xe0, 0x69, 0x36, 0x1b, 0x6c, 0xdb, 0x36, 0xb2, 0xaa, -0x02, 0xfd, 0x73, 0xdb, 0xb6, 0x11, 0x9e, 0x79, 0xe6, 0x51, 0xf6, 0xef, -0xdf, 0xcd, 0xc4, 0xc4, 0x65, 0xea, 0xf5, 0xd9, 0x5c, 0x09, 0x04, 0x6b, -0xc8, 0x09, 0x38, 0x5b, 0x4c, 0x83, 0xb5, 0x79, 0x4a, 0xf5, 0x9c, 0xe8, -0xe6, 0x71, 0xc3, 0x1a, 0x90, 0x7d, 0x9d, 0x3c, 0x14, 0x81, 0x85, 0x85, -0x06, 0xc6, 0xd8, 0x6e, 0x6e, 0xc2, 0xf2, 0x7e, 0x26, 0xff, 0x8d, 0xae, -0xb8, 0x06, 0xd6, 0x1a, 0xdf, 0xfc, 0xe6, 0xd7, 0xf8, 0xea, 0x57, 0x77, -0xf3, 0xc6, 0x1b, 0xef, 0x30, 0x39, 0x39, 0x87, 0x35, 0xa6, 0x20, 0xe0, -0x08, 0x5d, 0x80, 0x35, 0xf9, 0x75, 0xad, 0x91, 0xa2, 0x66, 0xac, 0xde, -0x51, 0x2f, 0x23, 0x90, 0xdb, 0x99, 0x2d, 0x22, 0x0e, 0x22, 0x82, 0x31, -0xfd, 0x9d, 0xe6, 0x72, 0x12, 0xcb, 0xad, 0x71, 0xfd, 0x04, 0x00, 0xca, -0xe5, 0x32, 0x43, 0x43, 0x83, 0x4c, 0x5e, 0x9f, 0xc3, 0x18, 0x83, 0x2b, -0x72, 0x3f, 0x70, 0x16, 0x03, 0x38, 0x2b, 0x64, 0x62, 0x48, 0xd3, 0x64, -0x95, 0x3e, 0x6b, 0x05, 0x02, 0x22, 0x8a, 0x31, 0xd2, 0x23, 0xe0, 0xf3, -0x08, 0x50, 0x28, 0xd0, 0x6b, 0x91, 0x7b, 0xa3, 0xd5, 0x6a, 0x22, 0x32, -0x74, 0x5b, 0x0a, 0xbc, 0xff, 0xfe, 0x25, 0xde, 0x7e, 0xfb, 0x1c, 0xad, -0x56, 0x8c, 0x2b, 0x52, 0x27, 0x74, 0x8e, 0x28, 0x0c, 0x08, 0x83, 0xdc, -0xa5, 0x8c, 0xcf, 0xad, 0x34, 0x4d, 0x53, 0xa4, 0x47, 0xe0, 0xcc, 0x9a, -0x04, 0x54, 0x05, 0x83, 0x21, 0x8e, 0x63, 0x16, 0x16, 0x1a, 0x85, 0x22, -0xbd, 0x9e, 0x5e, 0xc4, 0x70, 0x43, 0x06, 0xd1, 0x6c, 0xb6, 0xb9, 0xe3, -0x8e, 0x91, 0x75, 0x29, 0x30, 0x35, 0x35, 0xc7, 0x5b, 0x6f, 0x9d, 0x63, -0x6a, 0x6a, 0x96, 0x2c, 0xcb, 0x30, 0x08, 0xd6, 0xd8, 0x1c, 0x7c, 0x10, -0x10, 0x05, 0x8e, 0xc0, 0x39, 0x52, 0x9f, 0x61, 0xac, 0xc1, 0x60, 0xba, -0x6d, 0x49, 0x31, 0xe6, 0xd6, 0x24, 0x20, 0x22, 0x27, 0x8d, 0xb5, 0x07, -0x92, 0xb8, 0x4d, 0xb3, 0xd1, 0xa2, 0x93, 0x77, 0xa6, 0x53, 0x3d, 0xa1, -0xdb, 0xcb, 0x40, 0xaf, 0xf8, 0x84, 0x61, 0xb4, 0xa6, 0x02, 0xcd, 0x66, -0xcc, 0x3b, 0xef, 0x5c, 0xe0, 0xf2, 0xe5, 0xeb, 0xa4, 0x69, 0x4a, 0x96, -0x79, 0x50, 0xc1, 0x19, 0x43, 0x14, 0x38, 0xca, 0x51, 0x40, 0xb9, 0x14, -0x12, 0x05, 0x0e, 0x80, 0xcc, 0xe7, 0xe0, 0xe3, 0x24, 0x2e, 0xa2, 0xdf, -0x25, 0x70, 0xf2, 0x56, 0x04, 0xe6, 0x72, 0xd6, 0x8b, 0xcc, 0xd4, 0x67, -0xa8, 0x94, 0x4b, 0x24, 0x71, 0x82, 0xa8, 0x60, 0xc8, 0x15, 0x52, 0x01, -0x51, 0xed, 0x1d, 0xde, 0xdc, 0x62, 0x0d, 0x9c, 0x3d, 0x7b, 0x89, 0xf3, -0xe7, 0x2f, 0xd3, 0x6a, 0xb5, 0xc9, 0xb2, 0x0c, 0xdf, 0x05, 0x6f, 0x29, -0x85, 0x01, 0x03, 0xa5, 0x88, 0x4a, 0x14, 0x51, 0x0e, 0x03, 0x9c, 0x73, -0x64, 0xe2, 0xbb, 0xd7, 0x9d, 0x9d, 0x9b, 0xc3, 0x7b, 0xed, 0x57, 0xe0, -0x56, 0x29, 0xa4, 0x67, 0x14, 0x7d, 0xa4, 0xb1, 0xd4, 0xa0, 0xdd, 0x6e, -0x52, 0xad, 0x0e, 0x80, 0x0a, 0x81, 0x31, 0x39, 0x68, 0x35, 0x18, 0x3c, -0x5e, 0xa4, 0x78, 0xdd, 0xe9, 0x20, 0x6f, 0x76, 0xa1, 0x7a, 0x7d, 0x9e, -0x33, 0x67, 0xce, 0xb2, 0xb8, 0xd8, 0xe8, 0x15, 0x3e, 0xef, 0x31, 0x28, -0xce, 0x5a, 0xa2, 0xc0, 0x51, 0x89, 0xa2, 0x9c, 0x40, 0x29, 0x22, 0x0a, -0x1d, 0xaa, 0x90, 0x79, 0x8f, 0xa0, 0x78, 0x15, 0xe6, 0xe6, 0x66, 0x97, -0x35, 0x79, 0xeb, 0x51, 0xe0, 0x35, 0x63, 0xcc, 0xd1, 0x46, 0xa3, 0x81, -0xcf, 0x32, 0xd2, 0x38, 0xc5, 0x19, 0x8a, 0xf2, 0x0e, 0x06, 0x21, 0xf3, -0x79, 0x4a, 0x21, 0x79, 0x15, 0x6d, 0x36, 0x5b, 0xc5, 0x21, 0x56, 0x7e, -0x8d, 0x56, 0xab, 0xcd, 0x7b, 0xef, 0x7d, 0xc8, 0x95, 0x2b, 0x93, 0x85, -0xc5, 0x7a, 0xb4, 0x28, 0x56, 0xce, 0x1a, 0x9c, 0xc9, 0xc1, 0x97, 0xc2, -0x80, 0x6a, 0xb9, 0xc4, 0x40, 0x29, 0x22, 0x0c, 0x02, 0xac, 0x85, 0x24, -0xf3, 0x78, 0x15, 0x32, 0x2f, 0xd4, 0x67, 0x66, 0x89, 0x93, 0x14, 0x2f, -0xdd, 0xc8, 0xbc, 0x36, 0x36, 0x76, 0x64, 0xfe, 0x46, 0x02, 0xcb, 0x0a, -0xd9, 0xf1, 0xe3, 0x7f, 0xfd, 0x8e, 0x78, 0x3f, 0xee, 0xc5, 0x53, 0xaf, -0x4f, 0xe3, 0xb3, 0x04, 0x63, 0x20, 0xb0, 0x10, 0x58, 0x4b, 0xe4, 0x1c, -0x91, 0xb3, 0x84, 0xce, 0x10, 0x58, 0x70, 0x46, 0xd9, 0xba, 0x65, 0x33, -0x23, 0x23, 0x23, 0x78, 0x0f, 0x67, 0xcf, 0x8e, 0x73, 0xfa, 0xd4, 0x5b, -0x5c, 0xbb, 0x32, 0x09, 0x2a, 0x18, 0x15, 0xac, 0xe6, 0x37, 0x89, 0xac, -0xa5, 0x12, 0x06, 0x54, 0xcb, 0x11, 0x1b, 0x2a, 0x65, 0x36, 0x55, 0x07, -0x18, 0xac, 0x94, 0xf3, 0xe8, 0x07, 0xf9, 0xbe, 0x5d, 0x44, 0x49, 0x33, -0x4f, 0x9c, 0xa6, 0x5c, 0x9f, 0xbc, 0x8e, 0x97, 0xac, 0x3f, 0xfa, 0xaf, -0xde, 0x08, 0xfe, 0x26, 0x05, 0x8a, 0x44, 0xfa, 0xa5, 0x78, 0x79, 0x7a, -0x7a, 0x7a, 0x9a, 0xcd, 0xc3, 0x9b, 0x89, 0x02, 0x8b, 0xc1, 0x12, 0xd8, -0xdc, 0x8d, 0x9c, 0xc9, 0x01, 0xa5, 0x05, 0xfb, 0x5d, 0x77, 0x7f, 0x89, -0xb9, 0xd9, 0x05, 0xde, 0x7f, 0xf7, 0x2c, 0xcd, 0x56, 0x0b, 0x15, 0xcd, -0xdb, 0x00, 0x0c, 0xb8, 0xbc, 0x2d, 0x76, 0xc6, 0x75, 0xd3, 0xa6, 0x14, -0x06, 0x94, 0xa3, 0x90, 0x52, 0x18, 0x12, 0x85, 0x0e, 0x63, 0x0c, 0x99, -0x17, 0xbc, 0x08, 0x49, 0x96, 0x91, 0x64, 0x9e, 0x4f, 0xae, 0x4c, 0xd0, -0x8e, 0x63, 0x7c, 0xb7, 0x4f, 0x62, 0x7c, 0x6c, 0xec, 0xc8, 0x4a, 0x87, -0xc1, 0x37, 0x13, 0x50, 0xd5, 0x57, 0xbc, 0xf8, 0xa7, 0x93, 0x34, 0x61, -0x6a, 0xfa, 0x3a, 0xa5, 0x3b, 0xef, 0x24, 0xb0, 0x79, 0x9b, 0x1b, 0x38, -0x43, 0xa8, 0x01, 0xa1, 0xb3, 0x64, 0xce, 0x92, 0x7a, 0x4b, 0x92, 0x19, -0xce, 0xbf, 0xfb, 0x01, 0xc6, 0x0b, 0xe5, 0x20, 0x40, 0x34, 0xef, 0x2e, -0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x81, 0x75, 0x84, 0x81, 0xcd, 0xad, 0x32, -0x0c, 0x88, 0x82, 0x80, 0xc0, 0x59, 0xc0, 0x90, 0x89, 0x27, 0x13, 0x4f, -0x3b, 0x49, 0x69, 0xa7, 0x29, 0x53, 0xf5, 0x69, 0xea, 0x33, 0x73, 0xa4, -0x59, 0x86, 0x48, 0x37, 0xfc, 0x47, 0x57, 0x02, 0x0f, 0xab, 0x1c, 0x6c, -0xfd, 0xe8, 0x47, 0xff, 0xf4, 0x6a, 0x18, 0x04, 0xdf, 0x29, 0x47, 0x21, -0xf7, 0x7e, 0xf9, 0x1e, 0x86, 0x36, 0xd5, 0x28, 0x87, 0x01, 0xa5, 0x30, -0x20, 0x28, 0xfc, 0x59, 0x54, 0xf1, 0xde, 0x93, 0x79, 0x21, 0xf3, 0x9e, -0xcc, 0xfb, 0xc2, 0x31, 0x84, 0x7c, 0x3f, 0x05, 0xd6, 0xe4, 0xbd, 0x4d, -0xe8, 0x2c, 0x81, 0x73, 0xc5, 0x2c, 0x1a, 0x34, 0x55, 0x52, 0x9f, 0xa7, -0x4b, 0x33, 0x4e, 0x69, 0xc4, 0x31, 0xd7, 0xa7, 0xa7, 0xf9, 0xf8, 0xe2, -0x38, 0xad, 0x38, 0xee, 0x27, 0x70, 0x66, 0x6c, 0xec, 0xc8, 0x9f, 0xaf, -0x46, 0x60, 0xc5, 0xa3, 0xc5, 0xd0, 0xd9, 0x9f, 0x66, 0x59, 0x7a, 0x28, -0x81, 0xda, 0xf8, 0xa5, 0xcb, 0x04, 0xf7, 0x04, 0xd8, 0xc1, 0x0d, 0x79, -0xd5, 0x0c, 0x43, 0x9c, 0xb3, 0x04, 0x06, 0x28, 0xaa, 0xa6, 0x14, 0xae, -0x24, 0xa2, 0xfd, 0xc7, 0x11, 0xf9, 0xce, 0xca, 0x80, 0x2d, 0xba, 0x4b, -0x63, 0x0c, 0x8a, 0xe2, 0x45, 0x0a, 0xf0, 0x19, 0xcd, 0x38, 0xa5, 0x19, -0xc7, 0x4c, 0xd5, 0xeb, 0x5c, 0xbc, 0x7c, 0x89, 0x38, 0xc9, 0xc8, 0xbc, -0xef, 0xb7, 0xce, 0xc3, 0xab, 0x81, 0x5f, 0x55, 0x01, 0x80, 0x1f, 0xfe, -0xe0, 0x1f, 0x9f, 0x35, 0xc6, 0xfe, 0x7d, 0x39, 0x8a, 0xa8, 0x56, 0xca, -0xec, 0xba, 0x67, 0x27, 0xb5, 0xc1, 0x41, 0x2a, 0x51, 0x58, 0x28, 0x61, -0x71, 0xd6, 0x62, 0xad, 0xe9, 0xd6, 0x99, 0x1c, 0x5e, 0x31, 0x0a, 0x19, -0x3a, 0x85, 0x5b, 0x35, 0x07, 0x9e, 0xf9, 0x3c, 0xd7, 0xf3, 0xc8, 0x27, -0x34, 0xe3, 0x84, 0x89, 0x2b, 0x57, 0xb9, 0x3a, 0x79, 0x8d, 0x76, 0x9c, -0x90, 0xa4, 0x69, 0x7f, 0xee, 0x3f, 0x33, 0x36, 0x76, 0xe4, 0xd8, 0xa7, -0x22, 0x00, 0xf0, 0xfd, 0x27, 0x8f, 0xbf, 0x16, 0x38, 0x77, 0xa8, 0x54, -0x90, 0xd8, 0xb9, 0x63, 0x07, 0x43, 0x1b, 0x7b, 0x24, 0xa2, 0x20, 0xc0, -0x15, 0x44, 0x3a, 0x3b, 0xaa, 0x6e, 0xfe, 0x14, 0xc5, 0x4e, 0x8a, 0xed, -0x63, 0x9e, 0x6a, 0xf9, 0x22, 0x6d, 0x27, 0x29, 0xad, 0x24, 0x61, 0x61, -0x69, 0x89, 0x8b, 0x13, 0x13, 0xcc, 0x2d, 0x2c, 0xd0, 0x8e, 0x13, 0x32, -0x9f, 0x91, 0xf9, 0x2e, 0xf8, 0x57, 0xc7, 0xc6, 0x8e, 0x7c, 0x77, 0x2d, -0xf0, 0x70, 0x8b, 0xd3, 0xe9, 0xc0, 0xb9, 0xc3, 0x71, 0x9a, 0x9e, 0x54, -0xd5, 0xbd, 0x22, 0x9e, 0xf3, 0x1f, 0x7d, 0xc4, 0xd6, 0xcd, 0xa3, 0xdc, -0xb1, 0x65, 0x94, 0x81, 0x52, 0x89, 0x28, 0xf4, 0x44, 0x81, 0x23, 0x74, -0x0e, 0x67, 0xf3, 0x0d, 0x48, 0xe7, 0x18, 0x44, 0xc9, 0x81, 0x7b, 0x2f, -0x64, 0x22, 0x24, 0x69, 0x56, 0xb8, 0x4c, 0xc6, 0x52, 0xb3, 0xc5, 0xb5, -0xa9, 0x49, 0xa6, 0xa6, 0xa7, 0x69, 0xb6, 0x13, 0x92, 0x34, 0xc9, 0xd7, -0x90, 0xdc, 0x1e, 0xf8, 0x5b, 0x2a, 0x00, 0xf0, 0xc3, 0xef, 0xff, 0x43, -0x2d, 0xc9, 0xb2, 0x93, 0x81, 0x73, 0x7b, 0xc3, 0xc0, 0x51, 0x0a, 0x43, -0x06, 0x2a, 0x65, 0xb6, 0x8c, 0x6c, 0x66, 0xb8, 0x56, 0xa3, 0x52, 0x2e, -0x11, 0x76, 0x17, 0x67, 0x4e, 0x00, 0xcd, 0xdb, 0x0d, 0xd1, 0x7c, 0xe3, -0x93, 0x7a, 0x4f, 0x92, 0x66, 0xcc, 0x2f, 0x2e, 0x32, 0x3b, 0x3f, 0xc7, -0xf4, 0xcc, 0x0c, 0xad, 0x38, 0x07, 0x9e, 0x66, 0x45, 0x95, 0xee, 0x55, -0xdc, 0x75, 0x83, 0x5f, 0x17, 0x01, 0x80, 0x1f, 0x3c, 0x79, 0xbc, 0x16, -0x27, 0xc9, 0x6b, 0xd6, 0xda, 0x87, 0xa2, 0xd0, 0x11, 0x06, 0x01, 0x61, -0x10, 0x10, 0x85, 0x21, 0x1b, 0x37, 0x6c, 0xa0, 0x3a, 0x50, 0x65, 0x43, -0x75, 0x80, 0x28, 0x8c, 0x70, 0x2e, 0x6f, 0xc8, 0xbc, 0xcf, 0x88, 0x93, -0x94, 0x76, 0xbb, 0xcd, 0x52, 0x63, 0x89, 0xf9, 0xc5, 0x45, 0xe2, 0x24, -0xa1, 0x9d, 0xa4, 0xa4, 0x59, 0xde, 0xd0, 0x79, 0x29, 0xda, 0x92, 0x3e, -0xbb, 0x1c, 0x1b, 0x3b, 0xf2, 0xd3, 0xf5, 0x82, 0x5f, 0x37, 0x81, 0xce, -0xf8, 0xee, 0xe1, 0x17, 0x8f, 0x1a, 0x63, 0x7e, 0xe2, 0xac, 0xc5, 0xb9, -0xbc, 0x38, 0x05, 0x85, 0xa7, 0xe7, 0x1b, 0x11, 0xd7, 0x4d, 0x21, 0xc8, -0x17, 0xac, 0x48, 0xc7, 0x66, 0xb3, 0xae, 0xdd, 0x8a, 0x48, 0x37, 0x5d, -0x8a, 0xdb, 0x8f, 0x03, 0x87, 0xc7, 0xc6, 0x8e, 0x9c, 0xba, 0x1d, 0xf0, -0xb7, 0x4d, 0x00, 0xe0, 0x89, 0x27, 0x5e, 0xd8, 0x6b, 0x8c, 0x79, 0xc5, -0x1a, 0x73, 0xc0, 0xd8, 0xde, 0xc6, 0xdb, 0x16, 0x95, 0xda, 0x16, 0xb6, -0xd3, 0x39, 0xd7, 0x14, 0x95, 0x6e, 0x94, 0x65, 0xd9, 0x49, 0x1d, 0x90, -0xf7, 0xf7, 0xaf, 0xdc, 0x6e, 0xd4, 0x3f, 0x13, 0x81, 0xce, 0x78, 0xfc, -0xf1, 0x9f, 0x3d, 0x64, 0x0c, 0x87, 0xad, 0xb1, 0x8f, 0x18, 0x63, 0x6a, -0xbd, 0x0d, 0x78, 0x6f, 0xc7, 0xd3, 0x01, 0x9c, 0xef, 0x25, 0x96, 0x01, -0x3f, 0x03, 0xbc, 0xc2, 0x2a, 0x0d, 0xda, 0xff, 0x0b, 0x81, 0xfe, 0xf1, -0xf8, 0xe3, 0x3f, 0x3b, 0x04, 0xec, 0x23, 0x3f, 0xf6, 0xd8, 0x59, 0xcc, -0xce, 0x98, 0x23, 0x07, 0x3c, 0x4e, 0xde, 0x0e, 0x9f, 0x1c, 0x1b, 0x3b, -0x72, 0xf1, 0x33, 0xdf, 0xb4, 0x18, 0x7f, 0xb2, 0xbf, 0xd4, 0x7f, 0x5e, -0xe3, 0x0b, 0xff, 0xcf, 0x1e, 0x5f, 0x78, 0x02, 0xff, 0x07, 0xe2, 0x1a, -0xeb, 0x6e, 0x4b, 0x67, 0x61, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_file_open.c b/Source/Core/DolphinWX/resources/toolbar_file_open.c deleted file mode 100644 index d2f8741931..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_file_open.c +++ /dev/null @@ -1,214 +0,0 @@ -static const unsigned char toolbar_file_open_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x09, 0x40, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x99, 0x6b, 0x6c, 0x5b, 0xe5, 0x19, -0xc7, 0x7f, 0xc7, 0x97, 0x24, 0x4d, 0xda, 0x24, 0xae, 0xe3, 0xd8, 0x0d, -0x2d, 0x71, 0xc5, 0x56, 0x21, 0x40, 0x34, 0xd0, 0x31, 0x09, 0x6d, 0x12, -0x01, 0xa1, 0x49, 0x9b, 0x18, 0xec, 0xc3, 0x24, 0x3e, 0x82, 0x98, 0x60, -0x1b, 0x91, 0xa6, 0xa1, 0x49, 0x1b, 0xbb, 0x68, 0x21, 0x9a, 0xa6, 0x4d, -0x1a, 0xdb, 0x90, 0x36, 0x36, 0xb4, 0x0f, 0x5b, 0x87, 0xd8, 0x97, 0x7d, -0x21, 0x6c, 0x93, 0x26, 0x31, 0x09, 0x8a, 0xd6, 0x01, 0x83, 0x96, 0xa6, -0xd5, 0x68, 0x97, 0x40, 0x49, 0xda, 0x38, 0x8d, 0x6f, 0xc7, 0xb1, 0x8f, -0xe3, 0xbb, 0xfd, 0xbe, 0xfb, 0xf0, 0x9e, 0x9b, 0xed, 0xe3, 0xd4, 0xe5, -0x22, 0x86, 0xc4, 0x23, 0xbd, 0x3a, 0xc7, 0xc7, 0xf6, 0xf1, 0xff, 0xff, -0x7f, 0x6e, 0xef, 0x73, 0xac, 0x49, 0x29, 0xf9, 0x28, 0x9b, 0xef, 0xc3, -0x06, 0xf0, 0x5e, 0xed, 0x63, 0x02, 0x1f, 0xb6, 0x7d, 0x4c, 0xe0, 0xc3, -0xb6, 0x40, 0x3f, 0x1f, 0xfa, 0xd7, 0xaf, 0xb5, 0xb8, 0x90, 0xc4, 0x85, -0x20, 0x2e, 0x25, 0xea, 0x5c, 0x12, 0x97, 0x92, 0xc3, 0x42, 0x30, 0x2e, -0x25, 0x4b, 0x42, 0xb2, 0xf0, 0x85, 0xef, 0xc8, 0xc5, 0x0f, 0x1a, 0x70, -0xa7, 0x69, 0x9d, 0x65, 0xf4, 0xf5, 0xa7, 0xb4, 0xfb, 0x25, 0xcc, 0x4a, -0x05, 0x70, 0xda, 0x04, 0x8a, 0x90, 0x20, 0x04, 0xd8, 0xe7, 0x12, 0xa4, -0x70, 0x9d, 0xab, 0xe3, 0xed, 0x77, 0x3d, 0x2a, 0x8f, 0xf5, 0xf3, 0xc3, -0x4f, 0x7f, 0x4f, 0x9b, 0x11, 0x92, 0x19, 0x21, 0x89, 0x9b, 0xf7, 0x39, -0xf6, 0xe0, 0xcf, 0xfa, 0xfb, 0x6e, 0x4f, 0x02, 0xff, 0xfe, 0xad, 0x76, -0x0a, 0x98, 0x01, 0x07, 0xa8, 0x34, 0xd7, 0x68, 0x6c, 0x9a, 0x91, 0xd0, -0x04, 0x23, 0xa1, 0x30, 0x43, 0x23, 0xc3, 0x8c, 0x47, 0x23, 0x20, 0xea, -0xa4, 0xd7, 0xde, 0xe1, 0xcc, 0x3f, 0x5f, 0xa5, 0x56, 0x6b, 0x20, 0x05, -0x4f, 0xdc, 0xf5, 0x5d, 0xf9, 0x48, 0xe7, 0x8f, 0xfc, 0xf9, 0x31, 0x6d, -0xd6, 0x14, 0x62, 0x46, 0x08, 0x66, 0x84, 0xe4, 0x36, 0x17, 0x69, 0xb7, -0x30, 0x0b, 0x5f, 0x7d, 0x5c, 0x3e, 0xf6, 0xae, 0x08, 0xbc, 0xfc, 0xa4, -0x76, 0x1f, 0x70, 0x54, 0x03, 0x24, 0xb0, 0xef, 0xc6, 0x59, 0xc6, 0xf6, -0x1d, 0x64, 0x38, 0x34, 0xc9, 0xd0, 0xc8, 0x08, 0x88, 0xba, 0x5a, 0xb2, -0xe1, 0x9c, 0x8b, 0x3a, 0x88, 0x06, 0x6f, 0xbd, 0xb1, 0xc4, 0xca, 0xa9, -0xb3, 0x08, 0xc9, 0x92, 0x94, 0x3c, 0x22, 0x4c, 0xa0, 0x52, 0x72, 0x58, -0x48, 0x66, 0xdc, 0x40, 0x2d, 0xe0, 0xe3, 0x63, 0x3e, 0xa2, 0x11, 0x08, -0xfa, 0x05, 0x2b, 0xab, 0x60, 0x6c, 0xdb, 0x9f, 0x39, 0xf8, 0xf5, 0x5f, -0xc8, 0x35, 0x4e, 0x6a, 0xdd, 0x68, 0x8f, 0x74, 0x37, 0x5d, 0x3b, 0x07, -0x84, 0x20, 0x8e, 0x06, 0x1a, 0x70, 0xed, 0xe7, 0x1f, 0x22, 0x1c, 0xbf, -0xde, 0x04, 0x6b, 0x2e, 0xcb, 0x3c, 0x3a, 0xf7, 0xde, 0x58, 0x04, 0xf3, -0xea, 0x8c, 0x94, 0xbc, 0x68, 0x7d, 0x44, 0xba, 0xbe, 0x32, 0x3c, 0x1c, -0x60, 0x72, 0x72, 0x80, 0xc9, 0x89, 0x00, 0xfb, 0xa7, 0x34, 0x06, 0xfc, -0xa6, 0x10, 0x52, 0x70, 0xd3, 0xf5, 0xf0, 0xb7, 0x17, 0x60, 0x23, 0x09, -0xc0, 0x7d, 0x9c, 0xd4, 0x16, 0x3c, 0xe5, 0x76, 0x93, 0x32, 0xc9, 0x38, -0x04, 0xa4, 0xfa, 0xc5, 0xe0, 0xe0, 0x2e, 0xc2, 0xd3, 0xd7, 0x2a, 0xf0, -0xb2, 0xe5, 0x2c, 0x84, 0xb9, 0x5c, 0x71, 0x65, 0xc2, 0x0c, 0xc7, 0x26, -0xec, 0x4b, 0xd6, 0xd5, 0xc0, 0x80, 0x9f, 0x89, 0xc8, 0x6e, 0xa6, 0xf6, -0xef, 0x21, 0x12, 0x09, 0x32, 0xb2, 0x4b, 0x9a, 0x62, 0xd4, 0xcd, 0x63, -0x3b, 0xb6, 0x1b, 0x0e, 0x41, 0x42, 0x11, 0x88, 0x7b, 0x61, 0xff, 0xf9, -0xef, 0x19, 0x37, 0xbd, 0xba, 0xf4, 0xed, 0x07, 0xc9, 0x73, 0x52, 0x83, -0x23, 0xb2, 0xcd, 0x03, 0x79, 0x34, 0xa8, 0x55, 0x2b, 0xea, 0x47, 0x10, -0x2a, 0x4b, 0x65, 0xd3, 0x45, 0xc4, 0xbc, 0x66, 0x91, 0x91, 0xc2, 0x26, -0x33, 0x1a, 0x1a, 0x65, 0xd7, 0xc8, 0x10, 0xe1, 0xe8, 0x18, 0x13, 0x91, -0xdd, 0x8c, 0x8d, 0x07, 0x5d, 0x80, 0xcd, 0xd0, 0x43, 0x76, 0x2c, 0xc7, -0xa6, 0x26, 0x6d, 0xaf, 0xc5, 0x01, 0x7e, 0xf5, 0x34, 0xb3, 0x66, 0xf8, -0xcd, 0x06, 0x02, 0x1c, 0x09, 0x8f, 0xb2, 0xbf, 0x56, 0x87, 0x7c, 0x89, -0xfc, 0x4f, 0x7f, 0xc7, 0xed, 0x8f, 0x3e, 0xc4, 0x52, 0xa7, 0x07, 0x96, -0xec, 0x7b, 0x8a, 0x9a, 0xa9, 0xb4, 0x30, 0x81, 0x37, 0x41, 0x34, 0xbd, -0xc9, 0x98, 0xde, 0xb9, 0xed, 0xee, 0xcf, 0x3a, 0xe1, 0x66, 0x03, 0xf6, -0xf0, 0x9a, 0x74, 0x13, 0x70, 0xdc, 0x30, 0x30, 0x60, 0xbf, 0x35, 0xfb, -0x9b, 0x67, 0x90, 0x7b, 0x86, 0x61, 0x78, 0x10, 0x76, 0x8f, 0x40, 0xd0, -0x0f, 0x43, 0xbb, 0x86, 0x08, 0x85, 0xc6, 0xb8, 0xb0, 0xb1, 0x3d, 0x7e, -0x66, 0xb9, 0xf4, 0x2c, 0x70, 0xb0, 0x9d, 0x80, 0xcb, 0xa5, 0x5b, 0x89, -0x15, 0x42, 0x53, 0xd3, 0x2e, 0x90, 0x6e, 0xf0, 0x1d, 0x47, 0x2c, 0x92, -0xb2, 0xa7, 0x77, 0x1c, 0xb0, 0x5e, 0x64, 0x94, 0x19, 0x45, 0x18, 0x1b, -0x81, 0x91, 0x5d, 0x30, 0x32, 0x04, 0x03, 0x83, 0x03, 0x84, 0x26, 0x22, -0x84, 0xc2, 0x21, 0xc2, 0x93, 0x61, 0x76, 0x0d, 0x05, 0xa8, 0x94, 0x8b, -0xb4, 0xb8, 0xc8, 0x99, 0xe5, 0x52, 0xfc, 0xc7, 0x4f, 0x71, 0xcf, 0xf7, -0xbf, 0xa6, 0x3d, 0x67, 0x13, 0xb8, 0xf3, 0x5b, 0xf2, 0xa5, 0xe7, 0x1f, -0x57, 0x49, 0x22, 0x5b, 0x0d, 0x68, 0xd5, 0x4c, 0x20, 0xd2, 0xa5, 0x7a, -0xd3, 0xe5, 0x0d, 0xf3, 0x9a, 0xfb, 0xbc, 0x87, 0x77, 0x9c, 0x6b, 0x0e, -0xc9, 0x46, 0x43, 0x90, 0x4c, 0x49, 0xf4, 0x1c, 0xa4, 0x33, 0xd0, 0x12, -0x70, 0x30, 0x1e, 0x25, 0x1c, 0xbd, 0x8a, 0xc9, 0xa9, 0x29, 0xc6, 0x43, -0x63, 0x20, 0xca, 0x14, 0x72, 0x9b, 0x5c, 0xba, 0xb0, 0x4a, 0x7a, 0x33, -0x4d, 0xb9, 0x54, 0xa5, 0xde, 0xb4, 0x83, 0x6f, 0x16, 0x78, 0xae, 0xad, -0x13, 0x5b, 0x5e, 0xc8, 0x25, 0xd6, 0xd8, 0x1b, 0x8b, 0x7a, 0x10, 0xe8, -0x24, 0xd1, 0xf0, 0x00, 0xdf, 0x91, 0xf8, 0x2e, 0xef, 0xe8, 0x7a, 0x8d, -0xe4, 0x66, 0x05, 0x5d, 0x6f, 0x62, 0x18, 0x82, 0xe0, 0xe0, 0x08, 0xb1, -0xe9, 0x9b, 0xb9, 0xfe, 0x93, 0xd3, 0x4c, 0x1e, 0xb8, 0x86, 0xa0, 0xaf, -0x4e, 0xa5, 0x78, 0x89, 0x42, 0xf6, 0x3c, 0xe7, 0xde, 0x39, 0x45, 0x31, -0x9f, 0xa6, 0xd5, 0x6c, 0x20, 0x24, 0xb4, 0x5a, 0xe0, 0xf3, 0x81, 0x51, -0xb2, 0x9d, 0x37, 0xd3, 0x16, 0x42, 0x76, 0x1e, 0xc0, 0x4c, 0xbd, 0x5a, -0xee, 0xc8, 0x03, 0xe1, 0x01, 0xb0, 0xe1, 0xe4, 0x45, 0x57, 0x7e, 0xa8, -0x55, 0x2e, 0x55, 0x49, 0x25, 0x0c, 0xf4, 0x4c, 0x19, 0x5d, 0xaf, 0xd2, -0x68, 0x48, 0xc2, 0x57, 0xdd, 0xc4, 0x81, 0x1b, 0x6f, 0x25, 0x3c, 0x75, -0x88, 0xd1, 0xbd, 0x53, 0x20, 0x4a, 0xe4, 0x36, 0x4e, 0x71, 0xfe, 0xf4, -0x3f, 0x30, 0xb2, 0x6f, 0x53, 0x29, 0xa6, 0x09, 0x04, 0xc0, 0xef, 0x57, -0x80, 0xfd, 0x7e, 0x47, 0x47, 0x21, 0x60, 0x33, 0x67, 0x27, 0x3b, 0xdd, -0x04, 0x04, 0x79, 0x80, 0x42, 0x26, 0xa3, 0x08, 0x58, 0xf1, 0x6b, 0xc5, -0x76, 0x57, 0xd8, 0x58, 0x1e, 0x50, 0x04, 0x1a, 0xb5, 0x1a, 0x7a, 0x7a, -0x0b, 0x3d, 0x65, 0x90, 0xda, 0x28, 0x50, 0x2e, 0x37, 0x18, 0x1e, 0x3b, -0x40, 0xf4, 0x9a, 0xbb, 0x39, 0xfc, 0xe9, 0x9b, 0x09, 0x4f, 0xdd, 0x40, -0x30, 0x18, 0xa0, 0x5c, 0x58, 0x43, 0x5f, 0x7f, 0x9d, 0x95, 0xd7, 0x9e, -0x41, 0xdf, 0x7c, 0x13, 0xd9, 0xaa, 0x10, 0xf0, 0x43, 0x20, 0x80, 0x0d, -0xde, 0xef, 0x53, 0x04, 0xac, 0x54, 0x11, 0x1a, 0x54, 0x6b, 0x50, 0xae, -0xda, 0xd7, 0x16, 0xbd, 0x3c, 0xb0, 0x06, 0x50, 0xab, 0xd5, 0xcc, 0x1c, -0xa0, 0x3d, 0x8c, 0x3c, 0x48, 0x18, 0xb9, 0x3c, 0x7a, 0x32, 0x47, 0x32, -0xa1, 0xa3, 0xa7, 0x0d, 0x82, 0x83, 0x63, 0x84, 0xa7, 0x6f, 0xe7, 0xe0, -0xad, 0x9f, 0x21, 0x7a, 0xcd, 0x9d, 0x0c, 0x8f, 0x46, 0x40, 0x54, 0x30, -0x52, 0xa7, 0x58, 0x3d, 0xf5, 0x27, 0x92, 0xe7, 0x5f, 0xc4, 0xc8, 0x9e, -0x07, 0x40, 0xd3, 0xd4, 0x0a, 0x98, 0x6a, 0xfb, 0x7c, 0x0a, 0xb8, 0xdf, -0x54, 0x5e, 0xd3, 0x1c, 0xe5, 0x01, 0x2e, 0xe9, 0xb8, 0x7b, 0xcd, 0xb1, -0x2e, 0x02, 0x2d, 0xa1, 0x08, 0x6c, 0x65, 0xf2, 0x66, 0x2f, 0xb0, 0x3c, -0xd0, 0x4d, 0x60, 0xfd, 0xed, 0x0d, 0x4e, 0xbf, 0x72, 0x0e, 0x80, 0xd1, -0xc8, 0x75, 0x84, 0xaf, 0xbe, 0x97, 0x43, 0x77, 0x7c, 0x91, 0xf0, 0xd5, -0xb3, 0xa0, 0x69, 0x34, 0xaa, 0x59, 0x92, 0xcb, 0x8b, 0xac, 0x5c, 0x3c, -0x4e, 0xf2, 0xfc, 0xf3, 0x34, 0x6b, 0x45, 0xbc, 0xcc, 0xa7, 0x81, 0xe6, -0x73, 0x08, 0xb8, 0x17, 0x38, 0x85, 0xaa, 0xd9, 0x82, 0x4c, 0xde, 0x56, -0x7f, 0xed, 0x87, 0x0f, 0x73, 0xda, 0xcb, 0x03, 0x79, 0xeb, 0xbc, 0x51, -0xdd, 0x26, 0x38, 0x10, 0xf0, 0x0c, 0x23, 0x23, 0x67, 0x70, 0xfa, 0x95, -0x73, 0x1c, 0xb8, 0xee, 0x2e, 0x0e, 0x7f, 0xee, 0x27, 0xe0, 0x1b, 0x04, -0x6d, 0x10, 0x23, 0xb3, 0xcc, 0xca, 0xf1, 0x05, 0x92, 0x6f, 0xfd, 0x1d, -0x23, 0x73, 0xd6, 0x13, 0xb0, 0x65, 0x96, 0xfa, 0x9a, 0x66, 0x92, 0xd0, -0xda, 0xc1, 0x5b, 0xea, 0x5b, 0x2b, 0x67, 0x28, 0x12, 0x12, 0xc0, 0x0c, -0x9f, 0xb6, 0x4e, 0x0c, 0x20, 0x84, 0xea, 0x6e, 0x00, 0xf9, 0x8c, 0x4e, -0x64, 0x5f, 0xc8, 0x24, 0x20, 0x5c, 0xc7, 0x16, 0xc9, 0xf5, 0x34, 0xa3, -0x91, 0x4f, 0x70, 0xf8, 0xce, 0x1f, 0x80, 0x6c, 0xd0, 0xa8, 0x6c, 0x73, -0xe2, 0xaf, 0xdf, 0x40, 0x4f, 0xbc, 0xbe, 0x23, 0x68, 0x4f, 0x12, 0xbe, -0xf6, 0xf0, 0xb1, 0xc0, 0x5b, 0x66, 0x6d, 0x04, 0xd7, 0x93, 0x2e, 0x42, -0x70, 0xd4, 0x7a, 0xdf, 0xb3, 0x8c, 0x02, 0xd4, 0xab, 0xd5, 0xee, 0x3c, -0xb0, 0x09, 0xe8, 0xc4, 0x0e, 0x7d, 0x19, 0xa4, 0x0a, 0xb3, 0x13, 0x7f, -0x99, 0x43, 0xdf, 0x78, 0xe3, 0xca, 0xc1, 0x9b, 0xea, 0x5b, 0xe0, 0x35, -0x9f, 0xe3, 0x0d, 0xc0, 0x9e, 0x37, 0xb6, 0xcb, 0x60, 0x94, 0x6d, 0x02, -0xf9, 0xf9, 0x39, 0x15, 0x3e, 0xd0, 0x31, 0x52, 0xde, 0xbb, 0x20, 0x5f, -0xb2, 0x06, 0x94, 0x9c, 0x95, 0x07, 0xa2, 0xe6, 0x1c, 0x5b, 0x35, 0xca, -0xc5, 0x6d, 0x8c, 0x7c, 0x99, 0x58, 0xfc, 0x16, 0x10, 0x55, 0xd6, 0xdf, -0x7c, 0xf6, 0xdd, 0x81, 0xc7, 0x01, 0xef, 0x73, 0x85, 0x8f, 0xe6, 0x8a, -0x7d, 0x6b, 0x68, 0xda, 0xd4, 0xcd, 0x6c, 0x54, 0xf9, 0x60, 0x87, 0x0f, -0x78, 0x8c, 0x94, 0x96, 0x17, 0xea, 0xd5, 0xba, 0xab, 0x17, 0x38, 0x79, -0x90, 0x4a, 0xe4, 0x18, 0xde, 0x13, 0x61, 0x74, 0xef, 0x3e, 0x10, 0x65, -0x56, 0x5e, 0x3b, 0x7a, 0xe5, 0xe0, 0x5d, 0xa1, 0xe3, 0xf7, 0x3b, 0x35, -0xbf, 0x4d, 0x7d, 0xb3, 0xfa, 0xb4, 0x04, 0x6c, 0x64, 0xda, 0xaa, 0x4f, -0xdb, 0xd8, 0xda, 0x35, 0xd4, 0x0b, 0x35, 0xdf, 0x92, 0xd5, 0x4b, 0x2e, -0xf5, 0x1d, 0x4f, 0xac, 0xaf, 0xe5, 0x89, 0x4e, 0xcf, 0x80, 0xac, 0xa0, -0x27, 0x4e, 0x50, 0x29, 0xa6, 0xfb, 0x03, 0xac, 0xb5, 0xc7, 0xba, 0x55, -0xf7, 0x2d, 0x02, 0x16, 0x09, 0x0d, 0x47, 0x33, 0x21, 0x20, 0xa5, 0x43, -0xa3, 0xe9, 0x54, 0xa3, 0xf9, 0x39, 0x9e, 0x73, 0xdf, 0xdf, 0xcb, 0x03, -0x79, 0x80, 0x5a, 0xb5, 0x69, 0xee, 0x2a, 0x9d, 0xdd, 0x63, 0xb9, 0xd4, -0xc0, 0x28, 0xd4, 0x98, 0xb9, 0xe3, 0x16, 0x10, 0x65, 0xd6, 0x97, 0x5f, -0xe8, 0x09, 0xba, 0x8b, 0x80, 0xeb, 0xdc, 0xe7, 0x77, 0x6a, 0x7d, 0xa7, -0xfa, 0x12, 0xd7, 0xf4, 0x26, 0x20, 0x91, 0x75, 0xc0, 0xd3, 0x11, 0x3e, -0xde, 0x04, 0x24, 0x6b, 0x12, 0xc8, 0xea, 0xf5, 0xae, 0x24, 0x4e, 0x5d, -0x2a, 0x31, 0xbc, 0x3b, 0xc4, 0x68, 0x68, 0x2f, 0x8d, 0x4a, 0x96, 0xc4, -0xca, 0xcb, 0x3b, 0x83, 0x76, 0x03, 0xf7, 0x75, 0x24, 0xad, 0x5f, 0x79, -0xc1, 0x56, 0xde, 0x1d, 0xfb, 0x42, 0xed, 0x7d, 0xca, 0x55, 0xc8, 0x15, -0xda, 0xe0, 0x75, 0x3d, 0xf5, 0xe8, 0x22, 0x60, 0x35, 0x33, 0x80, 0xa2, -0x51, 0x61, 0xcf, 0x6e, 0x1f, 0x96, 0x4f, 0xf5, 0x6c, 0x85, 0xe8, 0x81, -0x9b, 0x41, 0x94, 0x48, 0xac, 0xbc, 0x7a, 0x45, 0xa0, 0xbd, 0xc2, 0xc8, -0xef, 0xea, 0xc0, 0x16, 0x78, 0x29, 0x9c, 0xd8, 0xbf, 0x98, 0xea, 0x44, -0xc7, 0x62, 0xe7, 0x5c, 0xdc, 0x33, 0x84, 0x14, 0x81, 0x2a, 0x7b, 0x86, -0xfd, 0x20, 0x25, 0x8d, 0x86, 0x24, 0x99, 0x6c, 0xf0, 0xa9, 0x6b, 0x63, -0x20, 0xb6, 0x59, 0x3d, 0xfb, 0x72, 0x5f, 0xa0, 0xad, 0xba, 0xde, 0x59, -0x36, 0xed, 0xe5, 0x4a, 0x5a, 0xa4, 0x02, 0xde, 0x32, 0x49, 0xe4, 0xda, -0x9b, 0xf7, 0xe2, 0xfc, 0x1c, 0xed, 0xfe, 0xf0, 0x24, 0x20, 0x9d, 0x66, -0x56, 0x2c, 0xd6, 0x61, 0x52, 0x11, 0x48, 0x25, 0x5b, 0x0c, 0x0c, 0x0e, -0x10, 0x9b, 0x8a, 0x92, 0xbb, 0xf4, 0x5f, 0xea, 0xd5, 0x82, 0xda, 0xaf, -0xd0, 0x5b, 0xe9, 0xce, 0x4e, 0xdb, 0xf6, 0x9e, 0x0b, 0x3c, 0x66, 0x85, -0xb1, 0x42, 0xa7, 0xd5, 0x84, 0xcd, 0xac, 0xaa, 0xff, 0x6d, 0xea, 0x7b, -0x58, 0xcf, 0x32, 0x0a, 0x60, 0x18, 0x4d, 0x75, 0x37, 0x24, 0xa9, 0x34, -0xc4, 0xf6, 0x1f, 0x04, 0x61, 0x70, 0x69, 0xed, 0x3f, 0xf6, 0x66, 0xab, -0x5f, 0xd0, 0xee, 0x65, 0x3d, 0xfd, 0xb0, 0x92, 0xd3, 0x9d, 0xb4, 0xad, -0x16, 0xac, 0xa7, 0x60, 0x79, 0xbd, 0x0d, 0xd6, 0xda, 0xfc, 0x1c, 0x7f, -0xf4, 0x7a, 0xac, 0xd2, 0x55, 0x46, 0x1f, 0xfe, 0xa5, 0xd3, 0xcc, 0x0a, -0xdb, 0xca, 0xaf, 0x8d, 0x26, 0x64, 0xb2, 0x10, 0xdb, 0x17, 0xa6, 0x51, -0xdb, 0x22, 0x99, 0x58, 0xb5, 0x4b, 0xa1, 0xbf, 0x63, 0x1b, 0x1c, 0x70, -0x25, 0x67, 0x57, 0x89, 0x74, 0x77, 0x58, 0x13, 0x6c, 0xb3, 0xa9, 0xca, -0x64, 0xa9, 0xac, 0xea, 0xfd, 0xf1, 0x33, 0x5d, 0xe0, 0x01, 0x1e, 0xf3, -0x52, 0xdf, 0xd3, 0x03, 0x96, 0x17, 0x24, 0x90, 0x37, 0xd4, 0xeb, 0x54, -0x1a, 0x82, 0x03, 0x01, 0x26, 0xa3, 0xbb, 0x59, 0x5f, 0x7d, 0xdb, 0xde, -0xb3, 0xb8, 0x37, 0x5e, 0x9d, 0x8a, 0x43, 0x7b, 0x53, 0xb2, 0x8e, 0x56, -0x43, 0x6a, 0x36, 0x21, 0xb3, 0x05, 0xa9, 0x1c, 0xa4, 0xb6, 0x7a, 0xc1, -0x03, 0xe0, 0x58, 0x2f, 0xf5, 0x7b, 0x13, 0x90, 0x2c, 0x49, 0x98, 0x29, -0x6c, 0xab, 0xd7, 0xe9, 0x2c, 0x44, 0x63, 0x63, 0x20, 0x8a, 0x24, 0x2e, -0xac, 0xb7, 0x55, 0x0f, 0x37, 0x81, 0x4e, 0x73, 0xef, 0x26, 0xa5, 0x84, -0x46, 0x0b, 0xf4, 0xbc, 0x09, 0x3a, 0xe7, 0x4c, 0x55, 0x3b, 0xd8, 0x12, -0xf0, 0xa5, 0x9d, 0x3e, 0xe0, 0x49, 0xa0, 0x65, 0x56, 0x22, 0xcb, 0x03, -0x19, 0x1d, 0x6e, 0x3a, 0x32, 0x4c, 0x3e, 0x9b, 0xa1, 0x5e, 0xab, 0xb7, -0x4d, 0x4c, 0x6e, 0xc5, 0xc1, 0xde, 0xee, 0x3a, 0x93, 0x94, 0x84, 0x74, -0x0e, 0xd2, 0x5b, 0x0e, 0xe8, 0x3e, 0xff, 0x96, 0x3b, 0x0a, 0x7c, 0x73, -0x7e, 0x8e, 0x42, 0x2f, 0xf5, 0x7b, 0x12, 0x10, 0xae, 0x5e, 0x70, 0x71, -0x43, 0x25, 0xdc, 0xe4, 0x84, 0xc6, 0xb9, 0x73, 0xba, 0xb3, 0x5f, 0xe9, -0xd8, 0xf2, 0xba, 0x81, 0x0b, 0x09, 0x7a, 0xc1, 0x0c, 0x91, 0x2d, 0x15, -0xe3, 0x56, 0xa5, 0xb9, 0x8c, 0xad, 0xa1, 0xaa, 0xcd, 0x13, 0xf3, 0x73, -0x5c, 0x00, 0x3c, 0x9f, 0x87, 0x5e, 0x9e, 0x80, 0x74, 0x08, 0x54, 0xeb, -0x10, 0x0a, 0x05, 0x41, 0x94, 0x49, 0x6e, 0x96, 0xf0, 0xfb, 0x5d, 0x0d, -0xc7, 0x45, 0x44, 0x4a, 0x15, 0x1e, 0x99, 0xbc, 0x02, 0xdd, 0x6c, 0xf6, -0xad, 0xf6, 0x12, 0x6a, 0x3c, 0x3c, 0x6a, 0x6f, 0x93, 0x2f, 0x03, 0xfa, -0xf2, 0x04, 0x5c, 0x1e, 0x38, 0xb3, 0x02, 0xf1, 0x58, 0x8b, 0x2d, 0xbd, -0x68, 0x97, 0x58, 0x29, 0x41, 0x9a, 0xe0, 0xb7, 0x0c, 0xc8, 0x16, 0xda, -0x41, 0xf7, 0xa1, 0xf6, 0x12, 0x2a, 0x44, 0x16, 0xfb, 0x55, 0xfa, 0xca, -0x08, 0xa8, 0x91, 0x2d, 0x0f, 0x8c, 0x2f, 0xaf, 0x42, 0x36, 0x2b, 0x88, -0x4d, 0xd6, 0xd4, 0x03, 0x60, 0x01, 0x5b, 0x45, 0xd0, 0x0d, 0xa5, 0x76, -0xb3, 0xd5, 0x17, 0x60, 0x50, 0xa1, 0xb1, 0x88, 0xaa, 0x2a, 0xef, 0x09, -0xb4, 0xdb, 0xba, 0xfe, 0xa1, 0xb1, 0xec, 0x47, 0x5f, 0xd1, 0xee, 0x91, -0x5e, 0xdd, 0xaf, 0x3f, 0xb0, 0xa0, 0x04, 0x58, 0x44, 0x85, 0x87, 0xb3, -0x0d, 0x78, 0x1f, 0x40, 0xbb, 0xad, 0x27, 0x01, 0x80, 0x85, 0x07, 0xb4, -0x79, 0x76, 0x68, 0x22, 0x1e, 0x66, 0x81, 0x5e, 0x6c, 0xdb, 0xb7, 0xbf, -0xcf, 0xa0, 0xdd, 0xb6, 0x23, 0x01, 0x4e, 0x6a, 0x2c, 0x3c, 0xc9, 0x1f, -0x80, 0xfb, 0x77, 0xb8, 0xc7, 0x1a, 0x0a, 0xf4, 0x51, 0xf7, 0xac, 0xfa, -0x41, 0x82, 0x76, 0xdb, 0xce, 0x04, 0x4c, 0x5b, 0x78, 0x40, 0xbb, 0x8f, -0xf6, 0x3f, 0x1e, 0xf2, 0xa8, 0x44, 0xcc, 0xbf, 0x9b, 0xca, 0xf1, 0x7e, -0x5a, 0x5f, 0x04, 0xfe, 0x9f, 0xed, 0x23, 0xff, 0x47, 0xf7, 0x47, 0x9e, -0xc0, 0xff, 0x00, 0x3b, 0x1c, 0x36, 0x87, 0xb9, 0x4b, 0x27, 0xd9, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_file_open.xpm b/Source/Core/DolphinWX/resources/toolbar_file_open.xpm deleted file mode 100644 index 74ed5a17e3..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_file_open.xpm +++ /dev/null @@ -1,141 +0,0 @@ -/* XPM */ -static const char *toolbar_file_open_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 87 1", -" c #B09454", -". c #B69B5C", -"X c #BA9F5E", -"o c #BFA45D", -"O c #B59A65", -"+ c #BEA263", -"@ c #BDA269", -"# c #C2A551", -"$ c #C5A955", -"% c #C9AE57", -"& c #C2A65D", -"* c #C5A95E", -"= c #C8AC5B", -"- c #CDB25C", -"; c #D1B45F", -": c #C6AB60", -"> c #CBAF64", -", c #C4A96A", -"< c #CBB165", -"1 c #CDB36D", -"2 c #D2B661", -"3 c #D6B962", -"4 c #DABD65", -"5 c #D4B86F", -"6 c #C4AF79", -"7 c #D0B971", -"8 c #D2B978", -"9 c #DEC167", -"0 c #DFC272", -"q c #DEC37A", -"w c #E6C265", -"e c #E3C46A", -"r c #E7C86C", -"t c #EACC6E", -"y c #FBD465", -"u c #FAD56C", -"i c #FDD96F", -"p c #E5C772", -"a c #E6C975", -"s c #EECF70", -"d c #E6CB7A", -"f c #E9CE7D", -"g c #EFD071", -"h c #F4D474", -"j c #FAD771", -"k c #FAD976", -"l c #F6D778", -"z c #F7DA7B", -"x c #FADB7B", -"c c #FEE07D", -"v c #DCCC8E", -"b c #DECE91", -"n c #DFD099", -"m c #E7CD81", -"M c #EAD284", -"N c #EAD48B", -"B c #F7DB83", -"V c #FBDE83", -"C c #F4DD8E", -"Z c #E1D395", -"A c #EBD791", -"S c #EBD995", -"D c #E6D89C", -"F c #ECDC9C", -"G c #F6DF90", -"H c #FBE086", -"J c #FBE28B", -"K c #FFE98E", -"L c #F7E091", -"P c #FCE592", -"I c #FFE995", -"U c #FCEA9B", -"Y c #ECDFA2", -"T c #ECE0A5", -"R c #ECE1A8", -"E c #FDEEA3", -"W c #FDEFA8", -"Q c #FFF1A5", -"! c #FEF2AC", -"~ c #F6EEB9", -"^ c #FEF4B2", -"/ c #FFF9B7", -"( c #FFF6BA", -") c #FFF8BD", -"_ c #FFFBC3", -"` c #FFFEC9", -"' c None", -/* pixels */ -"'''''''''''''''''''''''''''''''''''''. 6''''''''", -"'''''''''''''''''''''''''''''.Xo&&=$#*b_`'''''''", -"'''''''''''''''''''''+:><2222----%$fHJJJJJJJJJ'''''''", -"''''''''CPJJHVVVxxxkhhtree432;&fHHHHHHHHH'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*dHVVVVVVVV'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*dHVVVVVVVV'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*aHxxxxxxxx'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*axxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pxxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pxxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pkkkkkkkkk'''''''", -"'''''''OGPJJJHVVxxxkhhtrre9432*rkkkkkkkkk'''''''", -"'''''''OGPJJJHVVxxxkhhtrre9432*ekjjjjjjj''''''''", -"'''''''OGPJJJHVVxxxkhhttre9432*ejjjjjjjj''''''''", -"'''''''OGPJJJHVVxxxkhhttre9432*eiuuuuuu'''''''''", -"''''''''CPJJJHVVxxxkhhttee4''''eiuuuuu''''''''''", -"''''''''NIJJJHVVxxxkhht''''''''wuuuu''''''''''''", -"'''''''''CPJJHVVzzl''''''''''''wyyy'''''''''''''", -"'''''''''''MJBB''''''''''''''''wyy''''''''''''''", -"'''''''''''''''''''''''''''''''wy'''''''''''''''", -"'''''''''''''''''''''''''''''''3''''''''''''''''" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_fullscreen.c b/Source/Core/DolphinWX/resources/toolbar_fullscreen.c deleted file mode 100644 index d810c8c884..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_fullscreen.c +++ /dev/null @@ -1,209 +0,0 @@ -static const unsigned char toolbar_fullscreen_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x32, 0x2f, 0x30, 0x34, 0x1c, 0xf3, 0x42, 0xbb, 0x00, 0x00, 0x08, 0xfd, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x99, 0x6d, 0x8c, 0x5c, 0x55, -0x19, 0xc7, 0x7f, 0xe7, 0xdc, 0x3b, 0xb3, 0xd3, 0x7d, 0x9d, 0xdd, 0xae, -0xdb, 0x97, 0xa5, 0x20, 0x45, 0x5b, 0x88, 0x06, 0x96, 0xa2, 0x89, 0x01, -0x02, 0x09, 0x24, 0x46, 0x43, 0xd0, 0xf2, 0x45, 0xa3, 0x92, 0x40, 0x62, -0xf4, 0x03, 0x31, 0xa1, 0x26, 0x4a, 0x8c, 0x7e, 0x32, 0xc6, 0x17, 0x34, -0xc4, 0x7e, 0xd2, 0x4f, 0x06, 0x05, 0x85, 0xc4, 0x48, 0x42, 0x69, 0x08, -0x46, 0x01, 0x13, 0x10, 0x50, 0x69, 0xa5, 0xa5, 0x4b, 0xb1, 0x2d, 0x76, -0xdf, 0xcb, 0xbe, 0xbf, 0xce, 0xce, 0xdc, 0x3b, 0x33, 0xe7, 0x3c, 0x7e, -0x38, 0x77, 0x66, 0xee, 0xbd, 0x3b, 0xb3, 0x2d, 0x12, 0x68, 0x9a, 0xf4, -0x49, 0xce, 0x3e, 0xe7, 0x9e, 0x73, 0x77, 0xef, 0xf3, 0x3c, 0xff, 0xe7, -0xed, 0x9c, 0x55, 0x22, 0xc2, 0xa5, 0x4c, 0xfa, 0x62, 0x0b, 0xf0, 0x7e, -0xe9, 0xb2, 0x02, 0x17, 0x9b, 0x2e, 0x2b, 0x70, 0xb1, 0xe9, 0x92, 0x57, -0xc0, 0x6f, 0xb5, 0xf1, 0xb7, 0x47, 0x54, 0xde, 0x0a, 0x07, 0xc4, 0xf2, -0x45, 0x2b, 0x0c, 0x89, 0x80, 0xb5, 0x90, 0xe0, 0x02, 0x62, 0x23, 0x9e, -0x5e, 0xdf, 0x6c, 0xef, 0xc2, 0xd7, 0x8f, 0x59, 0xe1, 0x90, 0x58, 0x0e, -0x7e, 0xf7, 0x31, 0x59, 0x6e, 0x26, 0xa7, 0x6a, 0x56, 0x07, 0x5e, 0x7c, -0x44, 0xdd, 0x8f, 0xf0, 0x4b, 0x11, 0xf2, 0xff, 0xb7, 0x30, 0xb1, 0xe7, -0xf7, 0xa1, 0x40, 0x6d, 0x7d, 0x59, 0x84, 0x6f, 0x3f, 0xf4, 0xb8, 0xfc, -0x36, 0x2d, 0xeb, 0x06, 0x17, 0x7a, 0xfe, 0x17, 0xea, 0x7e, 0xb1, 0x3c, -0x6a, 0x85, 0x7c, 0xed, 0xe3, 0x22, 0x20, 0x00, 0xd1, 0x3c, 0x9a, 0x46, -0x3f, 0x5a, 0x50, 0x6c, 0xaf, 0xe5, 0xef, 0x5c, 0x78, 0x0d, 0xcd, 0x0b, -0x3c, 0xfa, 0xb3, 0x7b, 0xd5, 0xfd, 0xe9, 0x8d, 0x04, 0x02, 0x7f, 0x79, -0x58, 0xe5, 0x15, 0x8c, 0x00, 0xf9, 0xda, 0xdf, 0xcf, 0xe5, 0xe0, 0xca, -0x2b, 0x60, 0x6b, 0x3f, 0x64, 0x33, 0xce, 0x32, 0xd6, 0x82, 0x31, 0x49, -0xbe, 0x61, 0x6e, 0xc1, 0x9a, 0x88, 0xbf, 0xc7, 0x79, 0x18, 0xc2, 0xf2, -0x2a, 0xcc, 0x2f, 0xb9, 0x79, 0x1c, 0x09, 0x2b, 0x5c, 0xfd, 0xfd, 0x27, -0x1a, 0xee, 0x94, 0x88, 0x01, 0xb1, 0x3c, 0x28, 0xca, 0x09, 0x0f, 0xd0, -0xd5, 0x09, 0x37, 0xed, 0x83, 0x4c, 0xef, 0x6d, 0xb0, 0xed, 0x01, 0x74, -0xfe, 0x4e, 0xc4, 0x96, 0x40, 0x4a, 0x20, 0x01, 0x62, 0x4b, 0x88, 0x04, -0x60, 0x43, 0x44, 0x4a, 0x88, 0x0d, 0x62, 0xa3, 0x8c, 0x98, 0x10, 0x6b, -0x03, 0xc4, 0x86, 0x58, 0x13, 0x52, 0x5a, 0x1c, 0x41, 0x6c, 0x85, 0x6a, -0xb8, 0x4e, 0xb0, 0x3a, 0x87, 0xb5, 0x42, 0xa5, 0x58, 0x20, 0x2c, 0xae, -0x63, 0x05, 0xd6, 0xe7, 0x67, 0x00, 0xc8, 0x64, 0x60, 0x6b, 0xde, 0x7d, -0x7f, 0x74, 0x02, 0x4a, 0x41, 0x03, 0x09, 0xe0, 0x41, 0xe0, 0x87, 0x4d, -0x15, 0xb0, 0xc2, 0xfe, 0x1a, 0xac, 0xb9, 0x1c, 0x0c, 0xdd, 0x00, 0xde, -0xb6, 0x7b, 0xd1, 0xd7, 0x3c, 0x0e, 0x52, 0x74, 0x43, 0x69, 0x10, 0xe5, -0x14, 0x36, 0x05, 0xaa, 0x6b, 0xc3, 0x4e, 0xa8, 0xe2, 0x04, 0xd5, 0xe2, -0x39, 0xc4, 0x56, 0xa9, 0xac, 0x4f, 0x53, 0x29, 0xcd, 0x63, 0xad, 0x25, -0x5c, 0x39, 0x47, 0xb5, 0x1c, 0x24, 0x50, 0x69, 0x35, 0x4f, 0x93, 0xa7, -0xe1, 0xca, 0x41, 0xf8, 0xef, 0x18, 0x94, 0x2b, 0x75, 0x8f, 0xdb, 0xdf, -0x5a, 0x01, 0xcb, 0x90, 0x72, 0xb2, 0x31, 0xb8, 0x13, 0xfc, 0xfc, 0x2d, -0xf8, 0xbb, 0x7f, 0x0d, 0x12, 0x10, 0x14, 0x97, 0x78, 0xfd, 0xd0, 0x77, -0x78, 0xeb, 0xb5, 0x43, 0xac, 0xad, 0x94, 0x50, 0x8a, 0xc4, 0x80, 0x26, -0x73, 0x00, 0x15, 0x9b, 0xd7, 0x9e, 0x23, 0x1e, 0x63, 0xa0, 0x9c, 0xe5, -0xbb, 0x3b, 0xa1, 0xa7, 0xb3, 0x21, 0x93, 0x56, 0xd0, 0xdb, 0x03, 0xd3, -0x73, 0xf5, 0xa5, 0xa1, 0xb8, 0xcc, 0x49, 0x17, 0x8a, 0x05, 0x69, 0x5f, -0x2f, 0xe8, 0x6d, 0x5f, 0x8f, 0x84, 0x5f, 0xe3, 0x89, 0x1f, 0xdd, 0xc6, -0xfc, 0xbb, 0x93, 0x4e, 0x18, 0xed, 0x3e, 0xdc, 0x4a, 0x81, 0xda, 0x5e, -0x5c, 0xd8, 0xa6, 0x3c, 0x35, 0x37, 0x55, 0x58, 0x5a, 0x86, 0xf5, 0x22, -0x6c, 0xef, 0xa7, 0x6e, 0xf2, 0xae, 0x8e, 0x86, 0x02, 0xe9, 0xa4, 0x99, -0x46, 0x20, 0x61, 0x0d, 0xaf, 0xef, 0x0e, 0xc4, 0x86, 0xbc, 0x7e, 0xe8, -0x7b, 0x75, 0xe1, 0x3f, 0x7e, 0xd3, 0x0d, 0xdc, 0xbc, 0xff, 0x6e, 0x06, -0xae, 0x18, 0xac, 0xe3, 0x2f, 0x36, 0x16, 0xbd, 0x31, 0x9f, 0x90, 0xfa, -0x3c, 0x16, 0xa5, 0xd6, 0x22, 0xe9, 0x35, 0x63, 0x59, 0x98, 0x9b, 0xe5, -0x8d, 0xa3, 0xff, 0x62, 0x7c, 0x7c, 0x84, 0x6a, 0x15, 0xd6, 0xd6, 0xa1, -0xab, 0x43, 0xa1, 0xb4, 0x26, 0xe3, 0xbb, 0x9c, 0xda, 0xac, 0xf3, 0x4f, -0xc7, 0x40, 0xa4, 0x66, 0xa4, 0x8c, 0x84, 0x40, 0x95, 0xe1, 0xd7, 0x0e, -0x3b, 0xe1, 0xf7, 0x5d, 0xcf, 0xfe, 0x07, 0xbe, 0x09, 0x7a, 0x1f, 0xe8, -0x1b, 0x5d, 0x12, 0xf6, 0x03, 0x94, 0x94, 0x81, 0x30, 0x7a, 0x3f, 0x04, -0x29, 0x83, 0x84, 0x6e, 0x5d, 0xca, 0x48, 0xc4, 0xb1, 0x65, 0x90, 0x0a, -0x2a, 0xe2, 0x58, 0x37, 0xa4, 0x52, 0xa2, 0xbf, 0xbd, 0x83, 0x3b, 0x7b, -0xfb, 0x78, 0xf1, 0x85, 0xe7, 0x18, 0x1f, 0x1f, 0xa5, 0x58, 0x82, 0xee, -0x2e, 0x1f, 0x4f, 0x67, 0xb0, 0x52, 0x41, 0xa8, 0x6c, 0x94, 0xbe, 0x15, -0x02, 0x0a, 0x97, 0x12, 0xc5, 0x06, 0xa0, 0x7c, 0x0a, 0x6b, 0xce, 0xe7, -0x6f, 0xbe, 0xeb, 0xf3, 0xa0, 0x3e, 0x01, 0xfa, 0x93, 0x80, 0x05, 0x0c, -0x88, 0x71, 0x1c, 0x1b, 0x61, 0x2e, 0x14, 0x96, 0xa6, 0x38, 0xf2, 0xcc, -0xcf, 0x19, 0x7f, 0xeb, 0x25, 0xfc, 0x5c, 0x27, 0xd7, 0xdd, 0xfc, 0x05, -0x86, 0xee, 0xf8, 0x52, 0xea, 0xd3, 0x8d, 0x22, 0xa3, 0x3c, 0x0f, 0xe9, -0xea, 0x46, 0x99, 0x2a, 0x43, 0xd7, 0xdf, 0xc4, 0xe4, 0xc4, 0x28, 0xd6, -0x82, 0xf6, 0xb3, 0x78, 0xd9, 0x0e, 0x8c, 0x59, 0x07, 0x2a, 0xe7, 0x47, -0x20, 0x5e, 0x70, 0xea, 0x08, 0x48, 0xa5, 0xee, 0xdb, 0x1f, 0xd9, 0xb9, -0x1d, 0xf4, 0x6e, 0x90, 0x00, 0x50, 0x48, 0xf5, 0x38, 0x54, 0x4e, 0x3a, -0xcb, 0x46, 0x2e, 0x51, 0x2e, 0x16, 0x79, 0xf6, 0x57, 0x0f, 0x13, 0x06, -0x01, 0x22, 0x50, 0x2e, 0x16, 0x38, 0xf6, 0xd7, 0x27, 0x58, 0x9b, 0x1a, -0xe6, 0xd6, 0xcf, 0xde, 0x95, 0x72, 0x9f, 0x86, 0x0b, 0x49, 0x54, 0x7a, -0xfb, 0xfa, 0xb6, 0xa2, 0xa2, 0xf2, 0xaa, 0x74, 0x06, 0xaf, 0xad, 0x1d, -0x1d, 0x94, 0x9b, 0x0a, 0x0f, 0xa9, 0x4a, 0x9c, 0x70, 0x63, 0x03, 0x62, -0x43, 0x2a, 0xab, 0xc3, 0x8d, 0x2c, 0x62, 0x23, 0xab, 0x53, 0x42, 0xca, -0x47, 0x20, 0x3c, 0x06, 0x26, 0x8c, 0xf9, 0xb9, 0x70, 0xf4, 0xf9, 0xc3, -0x94, 0x23, 0xe1, 0x85, 0xc6, 0x38, 0x33, 0xfc, 0x26, 0x8b, 0xb3, 0xd3, -0x8d, 0x95, 0x44, 0x89, 0x8f, 0x59, 0x50, 0x04, 0xad, 0x5c, 0xf6, 0x51, -0x5e, 0x96, 0x4c, 0x5b, 0x27, 0xda, 0xcb, 0x36, 0x97, 0x3e, 0x8d, 0x80, -0xb5, 0xd4, 0x53, 0x82, 0x31, 0x20, 0x12, 0x62, 0xca, 0x0b, 0x8d, 0xac, -0x62, 0x0c, 0x48, 0x40, 0x25, 0x28, 0x70, 0xe2, 0xcf, 0x3f, 0x65, 0x69, -0x7a, 0x82, 0x81, 0x5d, 0xbb, 0xd9, 0xf3, 0xa9, 0x5b, 0xc8, 0xb6, 0xe5, -0xc0, 0x0a, 0xd3, 0x63, 0x23, 0xce, 0x5a, 0x71, 0x19, 0x23, 0x39, 0x47, -0xcf, 0x9c, 0xa1, 0xb7, 0xaf, 0x1f, 0xac, 0xb0, 0xb6, 0xb2, 0xc2, 0x91, -0x7f, 0xbc, 0xca, 0xda, 0xca, 0x2a, 0x7b, 0xf6, 0x5e, 0xcb, 0xde, 0x3d, -0x7b, 0xea, 0x2e, 0xa0, 0x23, 0xb3, 0x6a, 0x2f, 0x83, 0x97, 0xed, 0x44, -0xf9, 0x4b, 0x2d, 0x11, 0xd8, 0x18, 0xc4, 0x12, 0x53, 0xc0, 0x06, 0x04, -0x0b, 0x47, 0x1b, 0xa9, 0xd2, 0x18, 0x2a, 0xa5, 0x39, 0x5e, 0xfc, 0xcd, -0x37, 0x58, 0x3c, 0x77, 0x0a, 0x11, 0x98, 0x1e, 0x3d, 0xcb, 0xc4, 0xa9, -0xb7, 0xf8, 0xdc, 0x7d, 0xdf, 0x02, 0xb1, 0x14, 0x96, 0x97, 0x1a, 0xe9, -0x38, 0xa5, 0x48, 0xad, 0x27, 0x58, 0x98, 0x9d, 0xe5, 0xf0, 0x53, 0x7f, -0x24, 0x08, 0x42, 0x44, 0x60, 0x72, 0x72, 0x8a, 0xa9, 0xc9, 0x49, 0xee, -0xb8, 0xfd, 0x76, 0x17, 0x13, 0x91, 0x11, 0xb5, 0x9f, 0xc3, 0x6f, 0xeb, -0x40, 0xe9, 0x4c, 0x4b, 0x04, 0x12, 0x2e, 0x24, 0xb1, 0xee, 0xd1, 0x58, -0xe7, 0x42, 0xd6, 0x9a, 0xba, 0x02, 0x62, 0x2c, 0xa7, 0x5e, 0x79, 0x8c, -0x85, 0xa9, 0x53, 0x09, 0xeb, 0x2e, 0xce, 0xbc, 0xcb, 0xd9, 0x37, 0x8f, -0x82, 0xb5, 0x74, 0x74, 0xe7, 0x93, 0x96, 0x4f, 0x0c, 0x37, 0x39, 0xfa, -0xcf, 0x57, 0x09, 0x83, 0x30, 0xa1, 0xe0, 0xdb, 0x6f, 0x9f, 0x62, 0x7e, -0x6e, 0xbe, 0x8e, 0x80, 0xd6, 0xe0, 0x65, 0xdb, 0xf1, 0x32, 0xed, 0xa8, -0xd6, 0x5d, 0x7f, 0x2a, 0x06, 0x24, 0x19, 0x5b, 0x62, 0x03, 0x4a, 0x73, -0x6f, 0x02, 0x91, 0x67, 0x19, 0xc3, 0xcc, 0xd9, 0x23, 0x1b, 0x5b, 0x65, -0x81, 0xf1, 0xd3, 0x27, 0xc1, 0x58, 0x06, 0x06, 0xaf, 0xda, 0xe0, 0x3a, -0x35, 0xda, 0x31, 0xb8, 0x0b, 0xac, 0x65, 0x6a, 0x72, 0xb2, 0x11, 0x23, -0x31, 0x25, 0xce, 0x8e, 0x8c, 0xba, 0x6f, 0x45, 0x06, 0xf3, 0xb3, 0x9d, -0x68, 0x2f, 0x87, 0x6c, 0x72, 0xee, 0x3a, 0x6f, 0x10, 0x57, 0xc3, 0x42, -0xbd, 0xaa, 0x62, 0x0d, 0xd6, 0xda, 0x84, 0xe0, 0xb5, 0xb3, 0x42, 0x39, -0x28, 0x81, 0x35, 0x5c, 0x77, 0xe3, 0xa7, 0x13, 0xc2, 0xc7, 0x95, 0xe9, -0xec, 0xe8, 0x04, 0x6b, 0x09, 0x83, 0xb0, 0xb1, 0xc7, 0xc6, 0xae, 0xba, -0x16, 0xc4, 0x5e, 0xb6, 0x0b, 0x2f, 0xd3, 0x8e, 0x34, 0xea, 0xf6, 0xf9, -0x11, 0xa8, 0xbb, 0x90, 0x01, 0x6b, 0xcb, 0x94, 0x56, 0x26, 0x12, 0x31, -0xd0, 0x91, 0xef, 0x6f, 0x58, 0x3f, 0x76, 0x00, 0xd9, 0x75, 0xf5, 0x1e, -0x30, 0x96, 0x97, 0x9f, 0x3b, 0xec, 0x90, 0x6c, 0xe2, 0x42, 0x4f, 0x3d, -0xf9, 0x7b, 0xca, 0x41, 0x89, 0x1d, 0x3b, 0x07, 0x9b, 0xba, 0x58, 0xff, -0xd6, 0xad, 0x0e, 0x01, 0xed, 0x46, 0x26, 0xd7, 0x83, 0xf6, 0xb7, 0xa4, -0xc5, 0x6c, 0xad, 0x80, 0xa4, 0xba, 0x81, 0xca, 0xfa, 0x39, 0x4c, 0xd4, -0x25, 0xd6, 0x5c, 0x68, 0xf7, 0x0d, 0xb7, 0x26, 0xad, 0x1f, 0xcd, 0x07, -0x76, 0xee, 0xe2, 0xcc, 0xf0, 0x71, 0x16, 0x66, 0x67, 0x9a, 0x9f, 0xc2, -0x04, 0xc2, 0x20, 0xe4, 0x95, 0x97, 0x5e, 0x62, 0xef, 0xde, 0x6b, 0x37, -0x66, 0x29, 0x81, 0xc1, 0x9d, 0x3b, 0x12, 0x08, 0x64, 0xb6, 0xe4, 0xf1, -0x32, 0x9d, 0x88, 0xb4, 0x56, 0x60, 0xd3, 0x34, 0x5a, 0x2e, 0xcc, 0x62, -0x4d, 0xa3, 0x31, 0x13, 0x63, 0x78, 0xe7, 0xe8, 0xcb, 0xf5, 0x6c, 0x25, -0x34, 0xf8, 0x0b, 0xcf, 0x3c, 0xe5, 0x8c, 0x90, 0xf2, 0xff, 0xf8, 0x33, -0x02, 0x23, 0x67, 0x47, 0x98, 0x9b, 0x9d, 0xdf, 0x88, 0x10, 0xf0, 0xa7, -0xa7, 0x9f, 0xe5, 0x6b, 0x5f, 0xbe, 0x07, 0xad, 0xdd, 0xb3, 0xdf, 0xd6, -0x83, 0xf6, 0xdb, 0x11, 0x69, 0xed, 0x42, 0x9b, 0xa6, 0xd1, 0xd2, 0xf2, -0x78, 0x02, 0x81, 0xe9, 0xf1, 0x31, 0x4e, 0xff, 0xfb, 0xef, 0x1b, 0x84, -0x07, 0x58, 0x5b, 0x59, 0x69, 0x54, 0xf2, 0x16, 0x4a, 0x20, 0x10, 0x04, -0x21, 0xc5, 0x52, 0x98, 0xc8, 0xeb, 0xb5, 0x77, 0x66, 0xe7, 0x17, 0x38, -0xf9, 0x9f, 0x33, 0xf5, 0xc2, 0x99, 0xc9, 0xf5, 0xa2, 0xb4, 0xbf, 0x69, -0x10, 0x6f, 0x40, 0xa0, 0xa6, 0xab, 0x35, 0x50, 0x09, 0x0a, 0x18, 0xd3, -0x58, 0x3b, 0x79, 0xfc, 0x88, 0x4b, 0xb5, 0xb5, 0x0f, 0xcb, 0x46, 0x9e, -0x3e, 0x3f, 0x37, 0x43, 0x22, 0xde, 0xb6, 0xa7, 0xd7, 0x86, 0x4f, 0x9e, -0xa6, 0x63, 0x8b, 0xdb, 0xcb, 0xe4, 0x7a, 0xb0, 0x56, 0x36, 0x75, 0xa1, -0x64, 0x0c, 0x44, 0xfe, 0x6a, 0xc5, 0xc5, 0x40, 0x61, 0x7e, 0x14, 0x53, -0x73, 0x2b, 0x05, 0x85, 0xd5, 0xb5, 0x8d, 0xb7, 0x06, 0x31, 0x9e, 0x8e, -0x8b, 0xd6, 0xf5, 0xa0, 0xf5, 0x7b, 0xeb, 0xc5, 0x62, 0x2c, 0x8d, 0xf6, -0xa0, 0x74, 0x16, 0xa5, 0xde, 0x4b, 0x0c, 0x44, 0x64, 0x0c, 0x84, 0x85, -0x65, 0x8c, 0x81, 0x6c, 0x16, 0xaa, 0x15, 0x10, 0xab, 0x92, 0xd6, 0xab, -0x59, 0x3a, 0xcd, 0x63, 0x56, 0x4f, 0x3f, 0x9f, 0x0f, 0x95, 0x9d, 0xdb, -0xb3, 0x88, 0x71, 0x29, 0x34, 0xb3, 0xa5, 0x8f, 0x72, 0x50, 0x42, 0xea, -0x7d, 0xfe, 0x79, 0x10, 0xa8, 0x59, 0xdf, 0x4a, 0x4d, 0x81, 0x55, 0xac, -0x81, 0xbe, 0x1e, 0xb7, 0x3f, 0x33, 0x3b, 0xc3, 0xc0, 0xc0, 0x76, 0xba, -0xbb, 0xf3, 0xc9, 0x7b, 0x9c, 0x88, 0x67, 0xfc, 0x6c, 0xa2, 0x36, 0xc4, -0x11, 0xad, 0x09, 0x98, 0xcd, 0x66, 0x9b, 0x0a, 0xde, 0xd7, 0xdb, 0xc3, -0xbe, 0xeb, 0xb7, 0x81, 0xcc, 0xa1, 0x34, 0x6c, 0xfd, 0xe8, 0xed, 0x64, -0x73, 0xbd, 0x54, 0xc2, 0x22, 0xc6, 0x94, 0xdf, 0x3b, 0x02, 0x41, 0xe8, -0xae, 0x51, 0x00, 0x7a, 0xf3, 0xb0, 0x5a, 0x80, 0xb0, 0x0c, 0x33, 0x33, -0xd3, 0x0e, 0x5e, 0x2f, 0xea, 0x18, 0xb5, 0x83, 0x5b, 0x2b, 0x50, 0xaa, -0x4c, 0xae, 0xcd, 0xb5, 0x01, 0x35, 0x37, 0x88, 0xbf, 0xe3, 0x9e, 0xcb, -0x89, 0xa3, 0x68, 0x7d, 0x9f, 0x15, 0xaa, 0x95, 0x15, 0xb4, 0x82, 0x6c, -0xc7, 0x0e, 0xae, 0xf9, 0xcc, 0x83, 0x88, 0x68, 0xd6, 0x97, 0xce, 0x51, -0x2a, 0xac, 0x5d, 0x18, 0x02, 0xf1, 0x5e, 0x68, 0x79, 0xc5, 0xa1, 0x60, -0x8c, 0x73, 0x83, 0x5d, 0x3b, 0xa0, 0x3f, 0x0f, 0x99, 0x48, 0xe5, 0x7a, -0x75, 0x6e, 0xb0, 0xc6, 0x7a, 0x0b, 0x4a, 0xbf, 0x17, 0x3f, 0x37, 0x3b, -0x9f, 0xef, 0xa2, 0xff, 0x63, 0x77, 0x33, 0x74, 0xcf, 0x1f, 0xc8, 0xf5, -0x5c, 0xc9, 0xea, 0xdc, 0x18, 0x8b, 0x93, 0x27, 0x58, 0x5e, 0x5c, 0x68, -0xf9, 0x37, 0x5b, 0xa6, 0xd1, 0xd9, 0x05, 0x77, 0x2f, 0xe3, 0xc5, 0x54, -0xec, 0xe9, 0x56, 0xe4, 0x7b, 0x5c, 0xa7, 0xa5, 0xb4, 0x46, 0x29, 0x0f, -0xa5, 0xb5, 0xb3, 0x83, 0x72, 0xcf, 0x68, 0x1f, 0xa5, 0x7d, 0x77, 0x18, -0xc9, 0x6c, 0x41, 0xfb, 0x6d, 0x28, 0xdd, 0x86, 0x9f, 0xed, 0x40, 0x67, -0xb6, 0xa0, 0xfd, 0x76, 0xfc, 0x5c, 0x0f, 0x9e, 0xdf, 0x8e, 0x97, 0xe9, -0x20, 0x93, 0xeb, 0xc5, 0x6f, 0xeb, 0xc6, 0xf3, 0x3b, 0x68, 0xeb, 0xdc, -0x46, 0x5b, 0xfb, 0x00, 0xd6, 0x08, 0x8b, 0x13, 0x27, 0x98, 0x7a, 0xfb, -0x2f, 0x2c, 0x4c, 0x9e, 0x60, 0x69, 0xb9, 0x78, 0x81, 0x0a, 0x58, 0x8e, -0x11, 0x5d, 0x5b, 0x84, 0x21, 0x9c, 0x1d, 0x83, 0xab, 0xae, 0x68, 0x28, -0xa1, 0x14, 0x68, 0xdf, 0x43, 0x2b, 0x1f, 0xe5, 0xf9, 0x78, 0x7e, 0x16, -0xe5, 0x39, 0x81, 0xb5, 0x9f, 0x41, 0x7b, 0x59, 0xb4, 0xdf, 0x86, 0xf6, -0x73, 0x68, 0xaf, 0x0d, 0xe5, 0x65, 0xd1, 0x5e, 0x16, 0xa5, 0x6b, 0x6b, -0x6e, 0x5d, 0xfb, 0xed, 0xd1, 0x3c, 0xe7, 0xf2, 0xbc, 0x15, 0x4c, 0xb5, -0x4c, 0x69, 0x65, 0x9a, 0xb5, 0xb9, 0x71, 0xd6, 0x16, 0xc6, 0x59, 0x18, -0x7f, 0x83, 0xf9, 0xc9, 0xe3, 0x8c, 0x8d, 0xcd, 0x50, 0xad, 0x26, 0x82, -0xf8, 0xd8, 0x66, 0x08, 0x3c, 0x4d, 0xec, 0xde, 0xa5, 0x18, 0xc0, 0x3b, -0xa3, 0xee, 0x96, 0xac, 0xb3, 0xdd, 0x65, 0x23, 0x51, 0x0e, 0x24, 0x55, -0x05, 0x94, 0x8b, 0x56, 0xad, 0x0d, 0x56, 0x34, 0xca, 0x54, 0xf0, 0x8c, -0x46, 0x1b, 0x05, 0xda, 0x00, 0x21, 0x28, 0x0f, 0x88, 0x86, 0xf2, 0x80, -0x5a, 0x61, 0xf2, 0x41, 0xf9, 0x80, 0x46, 0x29, 0x1f, 0xa5, 0x32, 0xa0, -0x34, 0xa6, 0x5a, 0x61, 0x6d, 0x61, 0x8a, 0xe9, 0xf1, 0xd3, 0xcc, 0xcd, -0xcc, 0x51, 0xa9, 0x5a, 0x52, 0xf4, 0x74, 0x4b, 0x05, 0xc4, 0x72, 0x10, -0x38, 0x00, 0x8d, 0xeb, 0xc5, 0x72, 0x19, 0xce, 0xcd, 0xd6, 0xdf, 0x00, -0x29, 0x23, 0x94, 0x1b, 0x8f, 0xb5, 0x9d, 0x54, 0x51, 0xfb, 0x80, 0x68, -0x19, 0x38, 0x18, 0x5f, 0x48, 0x04, 0xf1, 0x43, 0x8f, 0xcb, 0x8a, 0x15, -0x0e, 0xd4, 0xd3, 0x69, 0xd4, 0xd8, 0x49, 0x34, 0xe2, 0xc5, 0x2a, 0x3d, -0x8f, 0xd7, 0x87, 0x0f, 0x90, 0x0e, 0xfc, 0xe0, 0x49, 0x59, 0x89, 0x2f, -0x34, 0xfd, 0xff, 0xc0, 0x4f, 0xbe, 0xaa, 0xee, 0xc3, 0x69, 0x9a, 0x8f, -0xaf, 0x7f, 0x08, 0x02, 0xb6, 0xa2, 0x65, 0x9c, 0xf0, 0xbf, 0x4b, 0x6f, -0x34, 0x55, 0x00, 0xe0, 0xc7, 0x5f, 0x51, 0x3d, 0x38, 0x77, 0xda, 0x4f, -0xea, 0x3e, 0xf2, 0x43, 0xa4, 0x63, 0x38, 0x9f, 0x3f, 0x98, 0xb6, 0x7c, -0x8d, 0x5a, 0x2a, 0x70, 0xa9, 0xd0, 0x25, 0xff, 0x4f, 0xbe, 0xcb, 0x0a, -0x5c, 0x6c, 0xba, 0xac, 0xc0, 0xc5, 0xa6, 0xff, 0x01, 0x9c, 0xeb, 0xc5, -0xd9, 0xf7, 0xbc, 0x76, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm b/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm deleted file mode 100644 index 8d492ca57e..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char *toolbar_fullscreen_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 78 1", -" c #0EA437", -". c #0EA539", -"X c #3FAD34", -"o c #74BC1D", -"O c #7BBE1D", -"+ c #54B332", -"@ c #64B72E", -"# c #6FBB29", -"$ c #76BD25", -"% c #7BBF24", -"& c #73BD2A", -"* c #7ABF29", -"= c #7EC027", -"- c #7DC02F", -"; c #80C125", -": c #83C32E", -"> c #82C337", -", c #88C537", -"< c #88C53C", -"1 c #8CC742", -"2 c #95CB56", -"3 c #95CC5E", -"4 c #97CD63", -"5 c #98CD62", -"6 c #A3D274", -"7 c #7FC1E3", -"8 c #ACD78D", -"9 c #AED88F", -"0 c #ADD891", -"q c #B0D994", -"w c #B5DC9F", -"e c #B9DDA4", -"r c #BBDEAB", -"t c #BDDFB0", -"y c #BFE0B3", -"u c #C1E1B5", -"i c #C2E2BB", -"p c #80C1E3", -"a c #8BC6E5", -"s c #8FC9E6", -"d c #92CAE7", -"f c #96CCE8", -"g c #9BCEE8", -"h c #9FD0EA", -"j c #A3D2EB", -"k c #ABD6EC", -"l c #AFD8ED", -"z c #B3DAEE", -"x c #B8DCEF", -"c c #B4DBF0", -"v c #BBDEF0", -"b c #BFE0F1", -"n c #D1D0D0", -"m c #C6E3C2", -"M c #CBE6CD", -"N c #C5E9CF", -"B c #D3EBCE", -"V c #DCEECC", -"C c #CDE7D3", -"Z c #CFE8D8", -"A c #D2EFDE", -"S c #D6ECE6", -"D c #D7ECE9", -"F c #DAEDEE", -"G c #C4E2F3", -"H c #CAE6F6", -"J c #D6EBF6", -"K c #DCEFF6", -"L c #D4EBF9", -"P c #DCEFFC", -"I c #DFF0FC", -"U c #E1E0E0", -"Y c #ECF6EC", -"T c #E2F1FD", -"R c #EAF5FA", -"E c #F4FBF7", -"W c #F3F9FD", -"Q c gray100", -/* pixels */ -"nUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUn", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQWJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJWQU", -"UQT77pppppppppppppppppppppppppppppppppppppp77TQU", -"UQTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTQU", -"UQTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTQU", -"UQTssddddddddddddddddddddddddddddddddddddddssTQU", -"UQTddddddddddddddddddddddddddddddddddddddddddTQU", -"UQRffffffffffffffffffffffffffffffffffffffffffRQU", -"UQRgggggggggggggggggfffgjfgggggggggggggggggggRQU", -"UQRgggggggggggggggggkHHHPcgggggggggggggggggggRQU", -"UQRhhjjjjjjjjjjjjjhjLTTTTTvjjhjjjjjjjjjjjjjhhRQU", -"UQRjjjjjjjjjjjjjjjjkITIIITPPLjjjjjjjjjjjjjjjjRQU", -"UQRjjjjkkkkkkkkkkjjvPIIIIITTTGkjjkkkkkkkkkkjjRQU", -"UQRkkjkjkkkkkkkkkkHTIIIIIIIIIIPHkkkkkkkkkkjkGWQU", -"UQRkkGLGlkkkklkzzlLTIIIIIIIIIITPzkllllllkzGLTWQU", -"UQWHGTTTGzHHvlGPPLLTIIIIIIIIIITPzlzzzzzzlLTTPWQU", -"UQWIIIITLLTTIHPTTTTIIIIIIIIIIIIPGzzzzzzzzLTIPWQU", -"UQWPIIIITTIITTIIIIIIIIIIIIIIIIITTGzxxxxvLPTIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIITGxvvvvbITIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIITPGvvvvvHTIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIILGGGGPTIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIITHGPPPIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIPPPTIIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIITTIIIIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIPWQU", -"UQWPIIIIIIIIIIIIITTTTTTTTTTTTTTTTTTTTTIIIIIIPWQU", -"UQWPIIIIIIIITTTTTTKSZMmureeweryimMADKTTTTTTIPWQU", -"UQWPIIIITTTTFCt9621,:=OOOOOOOOOOO;:,126qyCFTTWQU", -"UQWPITTTDi83<=OOOO%%%=============%%%OOOO=<50YQU", -"UQWTTAw4>$oo%%***************************%%ooVQU", -"UQEr3-oo$***********************************$VQU", -"UQVoo$*************************************$$VQU", -"UQV&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&VQU", -"UQV&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&VQU", -"UQV##&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&##VQU", -"UQV@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@VQU", -"UQB++++++++++++++++++++++++++++++++++++++++++BQU", -"UQBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBQU", -"UQN ...................................... NQU", -"UQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"nUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUn" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_help.c b/Source/Core/DolphinWX/resources/toolbar_help.c deleted file mode 100644 index cc0ee5979c..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_help.c +++ /dev/null @@ -1,306 +0,0 @@ -static const unsigned char toolbar_help_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0d, 0x87, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x79, 0x8c, 0x5e, 0xd5, 0x79, -0xc6, 0x7f, 0xef, 0x39, 0x77, 0xf9, 0x96, 0xd9, 0xbc, 0x60, 0xb0, 0x01, -0x63, 0xb3, 0x43, 0xb0, 0xec, 0xb6, 0x41, 0xcd, 0x62, 0xc0, 0x04, 0x04, -0xaa, 0x48, 0x30, 0x25, 0x8d, 0x02, 0x6e, 0xab, 0xd8, 0x21, 0xa4, 0x49, -0x93, 0x02, 0x8a, 0xd4, 0x26, 0x55, 0xdb, 0x64, 0xa0, 0x8b, 0x5b, 0x45, -0x6a, 0x9c, 0x45, 0x28, 0x49, 0x17, 0x4c, 0x5a, 0xfa, 0x47, 0x91, 0x5a, -0x20, 0x0d, 0x90, 0x88, 0x76, 0x6c, 0x52, 0xb6, 0x84, 0x80, 0x5d, 0x1b, -0x82, 0xeb, 0x05, 0x0f, 0xe3, 0x05, 0xc6, 0xc6, 0xf6, 0xd8, 0x33, 0xdf, -0x72, 0xef, 0x39, 0xe7, 0xed, 0x1f, 0xf7, 0x7e, 0x9f, 0xc7, 0xe3, 0x05, -0x1b, 0xa2, 0x46, 0x1c, 0xcd, 0xd1, 0x77, 0x46, 0x73, 0xe7, 0xdc, 0xe7, -0x39, 0xcf, 0xf3, 0xbe, 0xe7, 0x3d, 0x67, 0x46, 0x54, 0x95, 0x77, 0x73, -0x33, 0xbf, 0x6c, 0x00, 0xef, 0xb4, 0x45, 0xbf, 0xcc, 0x97, 0xff, 0xe3, -0xc7, 0x7a, 0xa4, 0x33, 0xfe, 0xe4, 0x83, 0xe3, 0x6f, 0xcb, 0x0a, 0xf2, -0x8b, 0xb2, 0xd0, 0x0f, 0x7f, 0x57, 0xe6, 0xa9, 0xb2, 0x24, 0xc0, 0x92, -0x10, 0x98, 0x17, 0x60, 0x61, 0x50, 0x06, 0x82, 0x82, 0x0f, 0x10, 0x94, -0xed, 0x41, 0x19, 0x0e, 0xca, 0x1a, 0xaf, 0xac, 0x77, 0xb6, 0xfe, 0xf0, -0x31, 0xa6, 0x51, 0x38, 0x35, 0x32, 0xef, 0x88, 0xc0, 0xd0, 0x72, 0x19, -0x50, 0xb8, 0x29, 0x28, 0x77, 0xaa, 0xb2, 0x28, 0x28, 0x1c, 0xab, 0xfb, -0xc9, 0xe3, 0xd0, 0x1d, 0x1f, 0xf0, 0xca, 0x23, 0x41, 0xe5, 0x9f, 0x4c, -0x52, 0x5b, 0x5b, 0x82, 0xef, 0x74, 0x00, 0x3d, 0x19, 0x22, 0x6f, 0x9b, -0xc0, 0x93, 0x9f, 0x94, 0x41, 0x2d, 0x80, 0x0f, 0x04, 0xa0, 0x12, 0x43, -0x4f, 0x05, 0xfa, 0x6b, 0x45, 0x60, 0xd5, 0x62, 0xd0, 0x50, 0xf4, 0xcc, -0xc1, 0x78, 0x1b, 0x0e, 0xb6, 0x60, 0x7f, 0x13, 0xf6, 0xb5, 0x21, 0xf3, -0x87, 0xc9, 0x78, 0xe5, 0x49, 0x45, 0xfe, 0x30, 0x4e, 0x6b, 0xeb, 0x4a, -0x02, 0xa1, 0x43, 0xe6, 0xad, 0x48, 0x9c, 0x72, 0x0c, 0x3c, 0x75, 0x9b, -0x2c, 0x01, 0xee, 0x33, 0xc2, 0x3c, 0x63, 0x60, 0x5a, 0x0f, 0xcc, 0x3e, -0xf7, 0x02, 0xaa, 0xf3, 0x3e, 0x80, 0x9d, 0x71, 0x09, 0x26, 0xe9, 0xc3, -0x24, 0x75, 0x70, 0x2d, 0xc8, 0x1b, 0xb8, 0x7d, 0xdb, 0x70, 0xfb, 0x87, -0xe9, 0xdd, 0xb3, 0x95, 0x81, 0xdd, 0x5b, 0x98, 0x93, 0xb5, 0x69, 0x67, -0xb0, 0xb7, 0x09, 0x5b, 0xc7, 0xa0, 0xe1, 0x04, 0x81, 0x2b, 0x83, 0xf2, -0x5c, 0xbb, 0xd5, 0xf8, 0xab, 0xb4, 0x52, 0xfb, 0x73, 0x40, 0x4a, 0x12, -0x1d, 0x22, 0xc7, 0x6d, 0xa7, 0xa4, 0xc0, 0xd3, 0xb7, 0xc9, 0xa0, 0x08, -0x5f, 0x01, 0x98, 0xd1, 0x0f, 0x67, 0x7f, 0xe0, 0x66, 0xd2, 0x4b, 0x6f, -0xc1, 0xf4, 0xce, 0x05, 0xd7, 0x80, 0xbc, 0x59, 0xf4, 0x13, 0x8c, 0x1b, -0x23, 0x1b, 0x18, 0xdb, 0xf6, 0x02, 0xd9, 0xc4, 0x04, 0xde, 0x0b, 0x23, -0x87, 0x60, 0xdb, 0x21, 0x68, 0x97, 0x16, 0x53, 0xe5, 0xc7, 0x62, 0xec, -0xc7, 0x2b, 0x69, 0xfa, 0x26, 0xe0, 0x81, 0x70, 0x22, 0x15, 0x4e, 0x5a, -0x81, 0xa7, 0x6e, 0x93, 0xfb, 0xac, 0xb0, 0x3c, 0x89, 0xe1, 0xbc, 0x85, -0x97, 0xd1, 0x7b, 0xdd, 0x57, 0x31, 0xfd, 0xe7, 0x96, 0xc0, 0x9a, 0x84, -0xfd, 0x9b, 0x71, 0x23, 0x6b, 0xf1, 0x6f, 0xac, 0x23, 0x1c, 0x1a, 0xc5, -0x4d, 0xec, 0x45, 0x3d, 0x84, 0x00, 0xa6, 0x76, 0x3a, 0xb6, 0x3a, 0x93, -0xa8, 0xf7, 0x74, 0x2a, 0x33, 0xe7, 0x52, 0x9b, 0x31, 0x87, 0x83, 0xaf, -0xbd, 0xc4, 0xde, 0xcd, 0x2f, 0x31, 0xa7, 0x0e, 0x03, 0x09, 0x6c, 0xdc, -0x0f, 0x07, 0x1d, 0x28, 0x5c, 0xe1, 0xbd, 0xff, 0x61, 0xb3, 0xd5, 0xbe, -0xbe, 0x5a, 0x49, 0xdf, 0xe4, 0xc8, 0xb8, 0x78, 0x7b, 0x0a, 0xfc, 0xf7, -0x6d, 0x72, 0x9f, 0x11, 0x96, 0xd7, 0x53, 0xb8, 0xe8, 0x23, 0x9f, 0xa1, -0xb2, 0xf8, 0xcb, 0x85, 0x45, 0x5c, 0x0b, 0xbf, 0xe9, 0x5f, 0x71, 0x9b, -0xfe, 0x99, 0xb0, 0x6f, 0x0b, 0x68, 0x01, 0xb8, 0xe3, 0xfd, 0x50, 0x12, -0x50, 0x5f, 0x8c, 0x7d, 0xf9, 0x99, 0xce, 0x98, 0x47, 0xdf, 0xec, 0xf3, -0xf0, 0xcd, 0x71, 0x46, 0x36, 0xbc, 0x80, 0xcb, 0x1d, 0xc1, 0xc3, 0x2b, -0x07, 0x61, 0x77, 0xab, 0x1b, 0xec, 0x1b, 0xac, 0xb5, 0xd7, 0xd5, 0xab, -0xe9, 0x5e, 0xc0, 0x1f, 0x4f, 0x85, 0xb7, 0x54, 0xe0, 0xc9, 0x15, 0x72, -0x9f, 0x31, 0x2c, 0xef, 0xab, 0xc3, 0x45, 0xbf, 0xfd, 0x35, 0xe2, 0x8b, -0x3f, 0x06, 0xae, 0x8d, 0xee, 0xf9, 0x1f, 0xdc, 0xd3, 0x5f, 0x44, 0x0f, -0x6c, 0x42, 0x14, 0x8c, 0x2d, 0x40, 0x1b, 0x0a, 0xe3, 0xa2, 0x20, 0x52, -0x74, 0x2d, 0x3f, 0xa5, 0xfc, 0x61, 0x63, 0xcf, 0x30, 0x87, 0x76, 0x0f, -0xd3, 0x7b, 0xc6, 0x7c, 0xce, 0xbe, 0xf4, 0x52, 0xb6, 0x6f, 0x78, 0x99, -0xe0, 0x3d, 0x17, 0xd4, 0xa1, 0xe9, 0x95, 0x7d, 0x19, 0x00, 0x0b, 0x72, -0xe7, 0xff, 0x0e, 0xf8, 0x2d, 0x4e, 0x10, 0x0b, 0x27, 0xdc, 0x89, 0x87, -0x96, 0xcb, 0x9d, 0x0a, 0xcb, 0x2b, 0x09, 0x5c, 0x78, 0xcb, 0xdf, 0x10, -0x5f, 0x70, 0x23, 0xb8, 0x26, 0x7e, 0xe3, 0x77, 0x71, 0x8f, 0xdd, 0x84, -0x1c, 0xdc, 0x84, 0xb1, 0x74, 0xbb, 0xd8, 0x02, 0xa4, 0x48, 0x31, 0x73, -0x67, 0x2c, 0x02, 0x48, 0x11, 0x99, 0x42, 0x49, 0x0a, 0xd8, 0xb7, 0xf3, -0x55, 0x76, 0x6d, 0xdb, 0xca, 0x9c, 0x73, 0xcf, 0x29, 0x7c, 0x22, 0x70, -0x49, 0x8f, 0x50, 0x39, 0x8c, 0xea, 0xc3, 0xfb, 0x0e, 0x36, 0xee, 0x00, -0xcc, 0xe4, 0x4d, 0x6f, 0x72, 0x3b, 0xae, 0x85, 0x9e, 0xf8, 0x84, 0x2c, -0x32, 0xc2, 0x8b, 0xb1, 0x85, 0x5f, 0xbb, 0xee, 0x46, 0x6a, 0x57, 0xff, -0x25, 0x20, 0xe4, 0x4f, 0xff, 0x09, 0x3a, 0xfc, 0x70, 0x01, 0xb8, 0x04, -0xa8, 0x0a, 0xad, 0x4c, 0xd8, 0x30, 0x92, 0xb0, 0x65, 0x34, 0x66, 0xcf, -0xb8, 0xa5, 0xed, 0x0e, 0xbf, 0x6f, 0x76, 0xaf, 0x63, 0x46, 0xea, 0x79, -0xcf, 0x8c, 0x36, 0x35, 0x13, 0x70, 0x5e, 0xc8, 0x1d, 0x38, 0x07, 0xce, -0x0b, 0x71, 0x52, 0xa5, 0xd2, 0xd3, 0xc3, 0xe8, 0xce, 0x3d, 0x10, 0x60, -0x2c, 0x83, 0xf5, 0x87, 0x14, 0x1f, 0xc0, 0x2b, 0x63, 0x22, 0x72, 0xf9, -0xf4, 0xde, 0xea, 0x96, 0x63, 0xd9, 0xe8, 0xb8, 0x16, 0x52, 0xe5, 0x3e, -0x05, 0x2e, 0x38, 0x6f, 0x36, 0xd5, 0xcb, 0xff, 0x00, 0x5c, 0x93, 0xec, -0x99, 0x7b, 0xd0, 0xe1, 0xff, 0xc0, 0xd8, 0x92, 0xbd, 0x14, 0x2b, 0xff, -0x93, 0x2d, 0x29, 0x4f, 0x6d, 0xae, 0x20, 0xe9, 0x00, 0x0b, 0xae, 0x5d, -0xc6, 0x95, 0xef, 0xbb, 0x81, 0xd3, 0xe7, 0x2f, 0x20, 0xad, 0xf7, 0x75, -0xe7, 0x7b, 0x6d, 0xe3, 0x53, 0x8c, 0x6e, 0xdb, 0xc0, 0xd6, 0xb5, 0x5f, -0xe7, 0x12, 0x36, 0x15, 0xef, 0x28, 0xde, 0x43, 0xa3, 0xd1, 0xc4, 0x05, -0x21, 0x4a, 0x53, 0xb2, 0x66, 0x46, 0x5f, 0xa4, 0xcc, 0x4a, 0x84, 0xdd, -0x6d, 0x05, 0xa5, 0xdf, 0x05, 0xfd, 0x33, 0x60, 0x39, 0xc7, 0xb0, 0xd1, -0x31, 0x15, 0x78, 0xfc, 0x77, 0xe4, 0x13, 0x46, 0x58, 0x3d, 0xbd, 0x07, -0x16, 0xde, 0x7a, 0x0f, 0xf1, 0xdc, 0x2b, 0x71, 0xaf, 0x3e, 0x4e, 0xfe, -0xfc, 0x5f, 0x23, 0x93, 0x2d, 0x63, 0xe0, 0xb1, 0x0d, 0x35, 0x36, 0xee, -0x48, 0xb8, 0x7c, 0xe9, 0x67, 0xb9, 0x62, 0xd9, 0x97, 0x48, 0x6a, 0x7d, -0x47, 0xcd, 0x37, 0xb5, 0xbd, 0xf2, 0xd8, 0xbd, 0x54, 0x1e, 0xff, 0x3c, -0xb9, 0x83, 0xdc, 0x09, 0xce, 0x17, 0x4a, 0x88, 0x58, 0x5c, 0xe6, 0x91, -0xa0, 0x64, 0x1e, 0x9e, 0x3d, 0x58, 0xaa, 0x10, 0x14, 0x55, 0x39, 0xff, -0x8f, 0x9f, 0x08, 0x5b, 0x4f, 0x4a, 0x81, 0x00, 0x83, 0x00, 0xe7, 0x5e, -0x7a, 0x19, 0xf1, 0x19, 0xbf, 0x4a, 0x18, 0xdb, 0x4e, 0xfb, 0x85, 0x6f, -0x22, 0x0a, 0x52, 0xe4, 0x6a, 0x34, 0xc0, 0xc6, 0x9d, 0x09, 0x1b, 0x77, -0x24, 0xdc, 0x70, 0xd7, 0xbd, 0x2c, 0xb8, 0xe6, 0xd6, 0x62, 0x55, 0x0f, -0x0e, 0x93, 0x3f, 0xbf, 0x0a, 0x37, 0xbc, 0x06, 0xbf, 0x6b, 0x1d, 0xc1, -0x83, 0xc6, 0x03, 0xd8, 0xb9, 0x4b, 0xc8, 0xdf, 0xfb, 0x05, 0xa6, 0x5f, -0x74, 0x05, 0x17, 0xff, 0xc6, 0xef, 0xb3, 0xf7, 0x8c, 0xb3, 0xd9, 0xff, -0xf7, 0x4b, 0xcb, 0x1c, 0x29, 0x28, 0xe0, 0x9c, 0x2f, 0xe6, 0x10, 0x43, -0x22, 0x81, 0x19, 0x91, 0x30, 0x9a, 0x29, 0x20, 0x04, 0xf4, 0x0e, 0xe0, -0xce, 0xa9, 0x58, 0x8f, 0x0a, 0xe2, 0xef, 0x2f, 0x93, 0xa5, 0xaa, 0xcc, -0x9b, 0x51, 0x87, 0xfa, 0xfc, 0x2b, 0xc0, 0xb5, 0x68, 0x3d, 0x7f, 0x2f, -0xda, 0x9e, 0xe8, 0x02, 0xef, 0xa4, 0xc5, 0x9f, 0x6d, 0x4f, 0x59, 0x70, -0xcd, 0xb2, 0x2e, 0x78, 0xff, 0xd2, 0xfd, 0xb4, 0x57, 0x2f, 0x22, 0xff, -0xe9, 0x2a, 0xc2, 0xee, 0x75, 0xc5, 0xb3, 0x0a, 0xa1, 0x79, 0x80, 0xec, -0xe5, 0x87, 0xf0, 0xab, 0xaf, 0xe4, 0x67, 0x0f, 0xae, 0x04, 0x60, 0xe6, -0xaf, 0x7c, 0x84, 0xde, 0x5f, 0x5f, 0x0e, 0xe5, 0x82, 0x04, 0x04, 0xc5, -0xa0, 0x65, 0x60, 0xa9, 0x18, 0x66, 0xc6, 0x9d, 0x0c, 0x00, 0x28, 0x4b, -0x8f, 0x15, 0xc8, 0x47, 0x11, 0x50, 0x58, 0xae, 0x0a, 0xa7, 0x0d, 0xd4, -0x48, 0xcf, 0x7e, 0x1f, 0x6e, 0xf7, 0x8b, 0xe4, 0x3b, 0x7f, 0xd2, 0x05, -0x1f, 0x26, 0xe5, 0xf8, 0x3d, 0xe3, 0x96, 0xcb, 0x97, 0x7e, 0xb6, 0x50, -0x6d, 0x6c, 0x98, 0x6d, 0xff, 0xf2, 0x29, 0x7c, 0xf3, 0x40, 0x17, 0x78, -0xa7, 0x33, 0x49, 0xb5, 0x3d, 0x8f, 0xde, 0xc3, 0xe8, 0xab, 0x1b, 0x01, -0x98, 0xf6, 0xa1, 0x3b, 0x8b, 0xdd, 0x97, 0x22, 0xd7, 0x86, 0x12, 0x78, -0x41, 0xc2, 0x30, 0x23, 0x12, 0x8c, 0x08, 0x22, 0x82, 0xc2, 0x39, 0x3b, -0xf6, 0x4e, 0x2c, 0x3a, 0x21, 0x81, 0x7f, 0xbb, 0x45, 0x06, 0x82, 0x72, -0x53, 0x1c, 0xc1, 0xf4, 0x39, 0xe7, 0x83, 0x6b, 0xd1, 0x7e, 0x75, 0xe8, -0x08, 0xe0, 0x93, 0xc7, 0x00, 0xb3, 0xe6, 0x5f, 0x06, 0xc0, 0xe6, 0xb5, -0x0f, 0xf0, 0x83, 0xad, 0x67, 0xf2, 0xa2, 0x5c, 0x7f, 0xd4, 0xf3, 0x53, -0x89, 0xfc, 0xef, 0xb3, 0x3f, 0x00, 0x20, 0x3d, 0x6b, 0x61, 0x37, 0x90, -0x15, 0x83, 0x88, 0x01, 0xb1, 0x88, 0xb1, 0x60, 0x2d, 0xd6, 0x1a, 0x7a, -0xad, 0xe9, 0x46, 0x6e, 0x80, 0xa5, 0x27, 0x24, 0xa0, 0xca, 0x55, 0xaa, -0xd0, 0x13, 0x43, 0x34, 0x7d, 0x3e, 0xda, 0xdc, 0x4f, 0x6b, 0xfb, 0xd3, -0x47, 0xee, 0xac, 0x93, 0xfa, 0xc5, 0xb3, 0xb2, 0xee, 0xef, 0xfa, 0x9e, -0xf9, 0x5c, 0x73, 0xfb, 0x4a, 0x16, 0xff, 0xd1, 0xe3, 0xa4, 0x1f, 0x5e, -0x7d, 0x18, 0xfc, 0x14, 0x22, 0x5b, 0xc6, 0x92, 0x23, 0x00, 0x84, 0x20, -0x85, 0x7d, 0xc4, 0xa0, 0x62, 0xc1, 0x46, 0x88, 0x8d, 0x11, 0xb1, 0x88, -0x58, 0x2a, 0x46, 0x90, 0x32, 0x46, 0x80, 0x85, 0x27, 0x24, 0x10, 0xca, -0x9a, 0xbe, 0x2f, 0x81, 0xa8, 0xe7, 0x34, 0xb2, 0xd7, 0x5f, 0x3a, 0xbc, -0x9a, 0x9e, 0xa3, 0x88, 0x7c, 0x70, 0x6e, 0x93, 0xad, 0x3f, 0x7e, 0x00, -0x80, 0x4b, 0x3f, 0x74, 0x2b, 0x17, 0xbe, 0xff, 0x06, 0x00, 0x24, 0x1d, -0xe8, 0xd6, 0x41, 0x9d, 0xdf, 0x69, 0x3b, 0xe1, 0x3f, 0x77, 0xd4, 0x99, -0x70, 0x86, 0x05, 0xd7, 0x2c, 0x03, 0xa0, 0x35, 0xb2, 0xbe, 0x78, 0x06, -0x5b, 0xd8, 0xc6, 0x44, 0x88, 0x8d, 0x90, 0x28, 0x46, 0xa2, 0x08, 0x31, -0x86, 0xde, 0xc8, 0x80, 0x74, 0xf3, 0xe7, 0xc0, 0x89, 0x15, 0x80, 0x25, -0x41, 0x21, 0x16, 0x48, 0xfa, 0x67, 0x93, 0x8d, 0x6e, 0x3e, 0xc2, 0x36, -0x1d, 0xe0, 0x9d, 0x20, 0x8e, 0x51, 0x4e, 0x7b, 0xe6, 0xf3, 0x34, 0xb7, -0x3d, 0x59, 0x58, 0xa2, 0xd6, 0x87, 0xb6, 0xc6, 0x68, 0xfc, 0xd7, 0xe0, -0x11, 0xe0, 0x37, 0xed, 0x4f, 0x78, 0x70, 0x4b, 0x1f, 0xa3, 0x3a, 0x93, -0x8f, 0xfe, 0xe9, 0x03, 0xf4, 0xcf, 0x3a, 0x1b, 0x80, 0x7d, 0x4f, 0xdd, -0x4f, 0xa0, 0x50, 0x00, 0xb1, 0x18, 0x6b, 0x31, 0x51, 0x8c, 0x89, 0x22, -0xc4, 0x94, 0x56, 0x12, 0x41, 0xb5, 0xcb, 0x60, 0xc9, 0x54, 0x02, 0x47, -0xa4, 0xd1, 0xa0, 0x0c, 0x08, 0x50, 0xb5, 0x80, 0x6b, 0x91, 0x1f, 0xd8, -0x49, 0x08, 0xe5, 0xf6, 0xaf, 0xe5, 0xce, 0xab, 0x47, 0x96, 0x06, 0x7e, -0xfc, 0x00, 0x7e, 0xf5, 0x55, 0x64, 0x67, 0x2c, 0xc2, 0x54, 0x06, 0xc8, -0xb6, 0xad, 0xe9, 0x06, 0xec, 0xae, 0xf1, 0x88, 0xe7, 0x5e, 0xaf, 0xb2, -0xaf, 0x65, 0x59, 0x70, 0xcd, 0x32, 0xae, 0xbd, 0x7d, 0x65, 0x77, 0x73, -0x6b, 0x8d, 0xac, 0xe7, 0xf5, 0x1f, 0x7d, 0x83, 0x10, 0x2c, 0x6a, 0x0d, -0x18, 0x8b, 0xd8, 0x08, 0x63, 0x23, 0xac, 0x08, 0x6a, 0x02, 0x2a, 0xbe, -0xfb, 0xa2, 0xe3, 0x95, 0x9c, 0x53, 0x09, 0x2c, 0x32, 0x02, 0x56, 0x80, -0xbc, 0x49, 0x6b, 0xcf, 0x08, 0xc6, 0x14, 0xd2, 0x50, 0x7e, 0xea, 0x94, -0xda, 0xa6, 0xd3, 0xfc, 0xce, 0x75, 0xdd, 0x20, 0x45, 0xe1, 0x85, 0xd1, -0x0a, 0x2f, 0xee, 0xa9, 0x30, 0x77, 0xc1, 0x62, 0x6e, 0xba, 0x7d, 0x65, -0x37, 0xd8, 0x01, 0xc6, 0xd7, 0x3d, 0xc2, 0xf0, 0x3f, 0xac, 0x28, 0x4e, -0x64, 0x08, 0x5a, 0x06, 0xae, 0xb1, 0x31, 0x36, 0x8a, 0x8b, 0x82, 0xd0, -0x7a, 0x10, 0xd3, 0xad, 0x9b, 0x8e, 0xc7, 0x60, 0x2a, 0x81, 0x62, 0xf5, -0x7c, 0xa1, 0x80, 0x86, 0xa2, 0x0c, 0xec, 0x2a, 0xd0, 0x01, 0x7e, 0x0c, -0x02, 0x9d, 0x97, 0xa8, 0xc2, 0x73, 0xaf, 0x57, 0x79, 0x79, 0x7f, 0xca, -0xe2, 0x65, 0x5f, 0x62, 0xf1, 0xad, 0x5f, 0xec, 0x3e, 0xd3, 0xda, 0xbc, -0x96, 0x3d, 0x8f, 0xdc, 0xcd, 0xd8, 0xcf, 0xd7, 0xd2, 0xf6, 0x42, 0x50, -0x43, 0x30, 0xa6, 0xb0, 0x4b, 0x09, 0xde, 0x46, 0x11, 0x26, 0x14, 0x72, -0x7b, 0x84, 0x56, 0x27, 0x8b, 0x9d, 0xa4, 0x02, 0x18, 0x81, 0xa0, 0x02, -0xae, 0x45, 0x50, 0x41, 0x3a, 0x16, 0x42, 0x8f, 0x28, 0x8f, 0x8f, 0x47, -0x60, 0x3c, 0x33, 0xbc, 0xbc, 0x3f, 0xe5, 0xda, 0xdb, 0x57, 0xf2, 0xde, -0x1b, 0x3f, 0xd3, 0x05, 0x3e, 0xfa, 0xbd, 0x15, 0xb4, 0x46, 0xb7, 0x93, -0x7b, 0xc1, 0x79, 0xc1, 0xa9, 0xe0, 0xd5, 0x10, 0x24, 0x22, 0xb2, 0x31, -0x51, 0x7c, 0x98, 0x80, 0x38, 0x87, 0x22, 0x18, 0x85, 0x86, 0x87, 0x70, -0xb8, 0xdc, 0x59, 0xf7, 0x96, 0x04, 0x44, 0x84, 0x56, 0x2e, 0xb4, 0xf6, -0x8e, 0x40, 0x30, 0x65, 0x81, 0xaf, 0xc5, 0x76, 0x2f, 0xe5, 0xa6, 0xdf, -0x21, 0x32, 0x65, 0x32, 0x55, 0x18, 0x3e, 0x14, 0xd3, 0x3f, 0x6b, 0x6e, -0x17, 0xfc, 0xf8, 0xb3, 0xf7, 0x33, 0x7a, 0xff, 0x0a, 0xbc, 0x07, 0x17, -0x84, 0x3c, 0x40, 0x1e, 0xc0, 0x63, 0x50, 0x13, 0x61, 0x6c, 0x8c, 0x89, -0x13, 0xa2, 0x24, 0x25, 0x8a, 0x13, 0x22, 0x31, 0xa8, 0x0f, 0x84, 0x72, -0x83, 0xd8, 0xe7, 0x94, 0x49, 0xf5, 0xda, 0x81, 0xa9, 0x04, 0xa6, 0xa6, -0xd1, 0x35, 0x8a, 0xd0, 0x74, 0x42, 0x36, 0xf6, 0x66, 0x91, 0xde, 0x88, -0x08, 0x6a, 0x09, 0x18, 0x82, 0x0a, 0x5e, 0x05, 0xef, 0xc1, 0xbb, 0xe2, -0x84, 0xd5, 0xed, 0xe5, 0xf7, 0x2d, 0x27, 0xdd, 0x74, 0x0a, 0xf0, 0xe6, -0xf7, 0xef, 0x26, 0x77, 0x90, 0x79, 0x21, 0xf3, 0x65, 0xf1, 0x86, 0x25, -0x48, 0x84, 0xda, 0x18, 0x1b, 0x57, 0x88, 0xd3, 0x94, 0x38, 0x49, 0x89, -0xe3, 0x18, 0x63, 0x2c, 0x52, 0xde, 0x4b, 0x4c, 0xe4, 0x5a, 0xac, 0xfe, -0xe1, 0x95, 0x5a, 0xf3, 0x56, 0x0a, 0x1c, 0x08, 0x0a, 0x07, 0x9c, 0x61, -0xfc, 0x8d, 0x5d, 0x24, 0xf5, 0x7e, 0xb2, 0x66, 0x83, 0xee, 0x8c, 0x21, -0xa0, 0xc1, 0x13, 0xca, 0xca, 0x65, 0x6a, 0x53, 0x85, 0x99, 0xb1, 0x27, -0xf4, 0x1c, 0xae, 0x48, 0x1b, 0x6f, 0x6c, 0xc7, 0x07, 0xc1, 0x05, 0xc8, -0xd5, 0x90, 0x63, 0x08, 0xc4, 0x60, 0x63, 0xa2, 0xa4, 0x4a, 0x5c, 0xa9, -0x92, 0xa4, 0x55, 0xe2, 0x24, 0xc5, 0x1a, 0x83, 0x66, 0x39, 0x1a, 0x02, -0x78, 0xcf, 0xee, 0xcc, 0xe3, 0x83, 0x3f, 0xa1, 0x85, 0xa6, 0x2a, 0xb0, -0xde, 0x2b, 0x8c, 0xe5, 0x42, 0x7b, 0xa2, 0x05, 0x2a, 0x88, 0x49, 0xc0, -0xa6, 0x60, 0x52, 0xd4, 0x24, 0x04, 0x49, 0x50, 0x8d, 0xf0, 0xc1, 0xe2, -0x82, 0xc1, 0x39, 0x21, 0x77, 0x42, 0x9e, 0x0b, 0xce, 0x09, 0xd3, 0xac, -0xe3, 0xcc, 0x1d, 0x3f, 0x22, 0x34, 0xc7, 0x68, 0x8d, 0xac, 0x27, 0x73, -0x42, 0x16, 0x0c, 0xb9, 0x5a, 0x1c, 0x11, 0x6a, 0x12, 0x24, 0x4e, 0x88, -0xd3, 0x1a, 0x49, 0xb5, 0x46, 0x5a, 0xad, 0x93, 0x56, 0xaa, 0xc4, 0x49, -0x82, 0x35, 0x16, 0x09, 0x8a, 0x3a, 0x4f, 0xc8, 0x3d, 0x3b, 0x32, 0x4f, -0xe8, 0x64, 0x96, 0x93, 0x51, 0x00, 0x31, 0x0f, 0x05, 0xe5, 0x2b, 0xfb, -0xbd, 0xe0, 0x82, 0x21, 0xcf, 0x3d, 0xd8, 0x42, 0xd6, 0xd0, 0x39, 0xb1, -0x93, 0xa3, 0xe4, 0xa8, 0x77, 0x04, 0x0d, 0x04, 0xf5, 0xc5, 0x61, 0xbe, -0xf4, 0x6c, 0x3b, 0x08, 0xaf, 0x3c, 0xff, 0x0c, 0x2f, 0xac, 0x98, 0xcd, -0x99, 0xa9, 0x47, 0x24, 0x2a, 0xfd, 0x6e, 0xc1, 0x94, 0x69, 0x32, 0xa9, -0x10, 0xa7, 0x15, 0xd2, 0x6a, 0xad, 0x00, 0x1f, 0xc7, 0x88, 0x2a, 0x21, -0xcf, 0x08, 0xb9, 0x23, 0x64, 0x39, 0x3b, 0xda, 0x39, 0x2d, 0xef, 0x08, -0x3e, 0x74, 0xb4, 0x7e, 0x68, 0x70, 0x48, 0xc7, 0x4e, 0xa8, 0xc0, 0xa7, -0x1f, 0xf6, 0xeb, 0x42, 0x60, 0x38, 0x04, 0x65, 0x57, 0x0b, 0x9c, 0x13, -0x90, 0x18, 0x89, 0x52, 0x4c, 0x5c, 0xc3, 0x26, 0x35, 0x4c, 0x5a, 0x47, -0x92, 0x1a, 0x44, 0x55, 0xd4, 0x54, 0x50, 0x5b, 0xc1, 0x4b, 0x42, 0x90, -0x18, 0x47, 0xcc, 0x4f, 0xc7, 0xea, 0x6c, 0xe3, 0x74, 0x7a, 0xaf, 0xbd, -0x8b, 0xfc, 0xaa, 0x2f, 0x20, 0xbd, 0xb3, 0x20, 0xae, 0x20, 0x49, 0x0d, -0x5b, 0xad, 0x11, 0xd7, 0x7a, 0xa9, 0xf6, 0xf4, 0x52, 0xeb, 0xe9, 0xa3, -0x5a, 0xef, 0x21, 0xad, 0x54, 0xb0, 0x36, 0x2a, 0xce, 0x19, 0xb9, 0xc3, -0xb7, 0x33, 0xf2, 0x56, 0xc6, 0xd6, 0xa6, 0xc3, 0xfb, 0x30, 0x39, 0x80, -0x57, 0x1f, 0xe5, 0xd9, 0xa3, 0x14, 0x00, 0x14, 0x79, 0xd8, 0x07, 0xbd, -0x63, 0x67, 0x5b, 0x99, 0xe3, 0x15, 0xab, 0x02, 0x12, 0x61, 0xe2, 0xb8, -0x48, 0x3d, 0x21, 0x20, 0x3e, 0xc7, 0x59, 0x87, 0xfa, 0x42, 0x09, 0xf1, -0x1e, 0x2d, 0x2f, 0x3c, 0xf7, 0xe5, 0xca, 0xb2, 0x7b, 0x1e, 0x60, 0xee, -0x65, 0x1f, 0x04, 0xe0, 0xd0, 0xe6, 0x1b, 0xd9, 0xfc, 0xcd, 0x8f, 0x23, -0x51, 0x5c, 0x64, 0x9a, 0x24, 0x25, 0x49, 0x8b, 0xc0, 0x8d, 0xa2, 0x18, -0x01, 0xd4, 0x39, 0x7c, 0x96, 0xe3, 0x5a, 0x2d, 0x42, 0xb3, 0xc5, 0xcf, -0x27, 0x32, 0x1a, 0x2e, 0x9f, 0x4c, 0x60, 0xfb, 0xe0, 0x90, 0x1e, 0xeb, -0x32, 0xf8, 0x68, 0x02, 0x62, 0xec, 0x2a, 0x1f, 0xc2, 0x1d, 0x2d, 0x17, -0x78, 0xad, 0x11, 0x38, 0x3f, 0x51, 0x54, 0x05, 0x31, 0x51, 0x51, 0xa7, -0x88, 0x10, 0x54, 0x91, 0xc4, 0x61, 0x5c, 0x8e, 0x71, 0x0e, 0xe7, 0x3c, -0x12, 0x3c, 0xa2, 0xca, 0x8c, 0xea, 0x44, 0x17, 0x3c, 0x40, 0xef, 0x05, -0xef, 0xa7, 0xd2, 0xdb, 0x8f, 0x4d, 0x12, 0xa2, 0x38, 0x21, 0x4e, 0xd2, -0x22, 0xe7, 0xdb, 0x08, 0x50, 0x42, 0x96, 0x13, 0xda, 0x19, 0xae, 0xd1, -0xc4, 0x35, 0x9a, 0x8c, 0x4c, 0xb4, 0xd8, 0xd5, 0xce, 0x70, 0xb9, 0x27, -0x84, 0xae, 0x7d, 0x06, 0x8f, 0x05, 0xfe, 0x28, 0x0b, 0x01, 0xfc, 0xde, -0xa7, 0x3f, 0xb5, 0xdd, 0x07, 0xfd, 0x5e, 0xe6, 0x3c, 0x23, 0x4d, 0xc7, -0xfe, 0x66, 0x8e, 0xcf, 0x5d, 0x71, 0xc5, 0x2c, 0x06, 0x13, 0xa7, 0x44, -0x95, 0x1a, 0x49, 0xbd, 0x8f, 0xb4, 0x77, 0x80, 0xb4, 0x6f, 0x1a, 0xd5, -0xfe, 0x69, 0x54, 0xfa, 0x8a, 0xbe, 0xf8, 0xc2, 0x39, 0xec, 0xdb, 0xfc, -0x5c, 0x77, 0xbe, 0xd6, 0x6b, 0x2f, 0xd2, 0x33, 0x30, 0x9d, 0x7a, 0xdf, -0x00, 0xb5, 0xde, 0x3e, 0x2a, 0xb5, 0x3a, 0x49, 0x92, 0x62, 0x44, 0xc0, -0xf9, 0xc2, 0x32, 0x13, 0x0d, 0xdc, 0xc4, 0x04, 0xaf, 0x8f, 0x37, 0x78, -0x79, 0xa2, 0x4d, 0x96, 0xe5, 0x78, 0xef, 0x3b, 0xab, 0xbf, 0x6e, 0x70, -0x48, 0xef, 0x3f, 0x1e, 0x81, 0x63, 0x1e, 0xea, 0xbf, 0x73, 0x73, 0xed, -0xdc, 0x3c, 0xcf, 0x5f, 0x48, 0xe2, 0xb8, 0xbf, 0xa7, 0x5a, 0x61, 0x61, -0x7f, 0x8d, 0xde, 0xde, 0x3a, 0x51, 0xbd, 0x4e, 0x94, 0x56, 0x31, 0x69, -0x82, 0xd8, 0x42, 0x3c, 0xa5, 0xd8, 0x29, 0x55, 0xb5, 0xbb, 0xe5, 0x9b, -0x4a, 0x2f, 0xd5, 0x4b, 0xaf, 0x47, 0x44, 0x68, 0x6e, 0x7a, 0x02, 0xc9, -0x5b, 0x88, 0x31, 0x48, 0x79, 0x07, 0xa3, 0xbe, 0x04, 0xde, 0x6c, 0x92, -0x8f, 0x4f, 0x90, 0x8f, 0x8f, 0xb3, 0xfb, 0xe0, 0x38, 0xeb, 0xc7, 0x9a, -0xb4, 0xda, 0x2d, 0xb2, 0xcc, 0xe1, 0x43, 0xd7, 0x3e, 0x8b, 0x06, 0x87, -0x74, 0xfd, 0x29, 0x11, 0xe0, 0xd1, 0xcf, 0xc9, 0x37, 0xee, 0xfd, 0xee, -0x5d, 0x22, 0xf2, 0xb7, 0x95, 0x24, 0xa1, 0xde, 0x25, 0xd1, 0x43, 0x5c, -0xab, 0x63, 0xab, 0x15, 0x6c, 0x92, 0x16, 0x35, 0xbb, 0xb5, 0x80, 0x14, -0x35, 0x48, 0x77, 0x77, 0x90, 0xf2, 0x6b, 0xf2, 0x99, 0x56, 0x09, 0xde, -0x13, 0x5c, 0x19, 0xa8, 0x8d, 0x06, 0x6e, 0xa2, 0x41, 0x3e, 0x3e, 0xce, -0xd6, 0x83, 0x0d, 0x36, 0x8f, 0x37, 0x69, 0xb5, 0x8b, 0xd5, 0x0f, 0x3e, -0x74, 0x72, 0xff, 0x5d, 0x83, 0x43, 0xfa, 0xf5, 0xe3, 0x81, 0x3f, 0x3e, -0x81, 0x92, 0xc4, 0xaa, 0x6f, 0x7d, 0xe7, 0x21, 0x6b, 0xed, 0x8d, 0x69, -0x9a, 0xd0, 0x53, 0xa9, 0xf0, 0x9e, 0xbe, 0x1a, 0x03, 0x3d, 0x75, 0xa2, -0x5a, 0x8d, 0xa8, 0x5a, 0xc1, 0xa6, 0x15, 0x4c, 0x1c, 0x23, 0xd6, 0x22, -0xc6, 0x94, 0xd5, 0x63, 0x59, 0xfe, 0x6a, 0x07, 0x77, 0xb1, 0xe2, 0xc1, -0x39, 0x7c, 0xee, 0xf0, 0xad, 0x16, 0x79, 0xb3, 0x85, 0x6b, 0x4c, 0x70, -0x68, 0xbc, 0xc1, 0xcb, 0x07, 0x9b, 0xec, 0x69, 0x36, 0x69, 0xb7, 0x32, -0x72, 0xe7, 0xbb, 0xd6, 0x51, 0x58, 0x3d, 0x38, 0xa4, 0x2b, 0x4e, 0x04, -0xfe, 0xc4, 0x04, 0x80, 0x6f, 0x7f, 0xb4, 0x77, 0x5a, 0xa3, 0xd1, 0x1c, -0xb2, 0xd6, 0x2e, 0x4c, 0xd2, 0x98, 0x6a, 0x9a, 0x72, 0x4e, 0xbd, 0xca, -0x59, 0x3d, 0x35, 0xd2, 0x5a, 0x15, 0x5b, 0xa9, 0x10, 0xa5, 0x29, 0x26, -0x4e, 0xca, 0x43, 0x88, 0xa1, 0xa8, 0xbf, 0x41, 0x83, 0xa2, 0x21, 0x10, -0x82, 0x27, 0xe4, 0x0e, 0x9f, 0x65, 0xf8, 0x76, 0x1b, 0xd7, 0x6a, 0xd1, -0x98, 0x68, 0x32, 0x3c, 0xd1, 0x62, 0x64, 0xa2, 0x45, 0xb3, 0xdd, 0x26, -0x6b, 0xe7, 0xe4, 0x9d, 0x9c, 0x7f, 0x0a, 0xe0, 0xdf, 0x92, 0x00, 0xc0, -0xbd, 0x37, 0xf7, 0x4e, 0x9b, 0x68, 0x34, 0x87, 0x22, 0x6b, 0x16, 0xc6, -0x51, 0x4c, 0x92, 0xc4, 0xf4, 0x54, 0x53, 0xce, 0xaa, 0x56, 0x99, 0x55, -0x4d, 0xa9, 0xa4, 0x29, 0x36, 0x2d, 0x09, 0x44, 0x51, 0x79, 0x30, 0x2f, -0x08, 0x04, 0xef, 0x8b, 0x14, 0x99, 0x67, 0xf8, 0x76, 0xc6, 0xfe, 0x56, -0xc6, 0x68, 0xb3, 0xcd, 0x8e, 0x46, 0xbb, 0x6b, 0x97, 0xdc, 0x39, 0x9c, -0x2f, 0x76, 0xdc, 0x12, 0xcb, 0x49, 0x83, 0x3f, 0x29, 0x02, 0x00, 0xdf, -0xfa, 0xcd, 0xde, 0x69, 0x8d, 0x46, 0xe3, 0xdf, 0x8d, 0x98, 0xab, 0xa2, -0xc8, 0x12, 0xc5, 0x31, 0x69, 0x5c, 0x90, 0x99, 0x9e, 0xc6, 0xf4, 0xc7, -0x31, 0xfd, 0x71, 0x44, 0x6a, 0x2d, 0xb1, 0x29, 0x3c, 0x9f, 0xab, 0xd2, -0xf6, 0x81, 0xf1, 0xdc, 0x73, 0x20, 0xcb, 0x79, 0xb3, 0xed, 0x68, 0xe4, -0x39, 0x59, 0x9e, 0x93, 0x67, 0x79, 0xd7, 0x2e, 0x3e, 0x04, 0x74, 0x52, -0xba, 0x1c, 0x1c, 0xd2, 0xbb, 0x4f, 0x16, 0xfc, 0x49, 0x13, 0x00, 0xe0, -0xd1, 0xcf, 0xc9, 0xca, 0xaf, 0x7d, 0x7b, 0x50, 0x84, 0x2f, 0x5b, 0x53, -0x5c, 0x79, 0xd8, 0x28, 0x22, 0xb2, 0x96, 0x28, 0xb2, 0x58, 0x6b, 0x31, -0xc6, 0x74, 0x83, 0x56, 0x55, 0xf1, 0x41, 0xf1, 0xde, 0xe3, 0xbc, 0xc7, -0x3b, 0x7f, 0x18, 0xb4, 0x0f, 0x84, 0x50, 0x06, 0x6a, 0x61, 0x99, 0xed, -0xc0, 0xf2, 0xc1, 0x21, 0x5d, 0x7b, 0x2a, 0xe0, 0x4f, 0x8d, 0x40, 0xd9, -0xfe, 0xe2, 0x5a, 0xbb, 0x48, 0x55, 0x57, 0x19, 0x23, 0x57, 0x19, 0x63, -0x30, 0x62, 0x30, 0x46, 0x8a, 0x34, 0x49, 0x71, 0x09, 0x05, 0x9d, 0x8b, -0x5b, 0x2d, 0x80, 0x86, 0x40, 0x08, 0xda, 0x05, 0xad, 0xda, 0xb5, 0xcb, -0x01, 0x60, 0xd5, 0xa9, 0xae, 0xfa, 0x3b, 0x22, 0xd0, 0x69, 0x83, 0x57, -0xcb, 0x55, 0x46, 0x64, 0x85, 0x18, 0x59, 0x2a, 0x22, 0x03, 0x66, 0x0a, -0x01, 0x80, 0xa0, 0xa1, 0x4b, 0xa2, 0x58, 0xec, 0x2e, 0xf0, 0x75, 0xc0, -0x2a, 0x8e, 0x53, 0xa0, 0xfd, 0xbf, 0x10, 0x98, 0xdc, 0x06, 0xaf, 0x96, -0xa5, 0xc0, 0x22, 0x8a, 0x6b, 0x8f, 0x79, 0x65, 0xef, 0xb4, 0x03, 0x14, -0x80, 0xb7, 0x53, 0x94, 0xc3, 0x6b, 0x06, 0x87, 0x74, 0xf8, 0x1d, 0xbf, -0xb4, 0x6c, 0xbf, 0xb0, 0xbf, 0xd4, 0xff, 0xb2, 0xda, 0xbb, 0xfe, 0x9f, -0x3d, 0xde, 0xf5, 0x04, 0xfe, 0x0f, 0x54, 0x13, 0xec, 0xcc, 0x99, 0x7c, -0x3d, 0x8f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, -0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_help.xpm b/Source/Core/DolphinWX/resources/toolbar_help.xpm deleted file mode 100644 index cdf5d7a9cb..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_help.xpm +++ /dev/null @@ -1,283 +0,0 @@ -/* XPM */ -static const char *toolbar_help_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 229 2", -" c #121F74", -". c #0F2276", -"X c #062D7C", -"o c #092D7C", -"O c #132376", -"+ c #192677", -"@ c #152678", -"# c #192678", -"$ c #132D7C", -"% c #1C2E7D", -"& c #04307F", -"* c #08317F", -"= c #16317F", -"- c #232F7E", -"; c #292D7E", -": c #362F7F", -"> c #22317E", -", c #012F83", -"< c #0A2E81", -"1 c #023483", -"2 c #093384", -"3 c #00398A", -"4 c #163C87", -"5 c #143D8A", -"6 c #013F90", -"7 c #233482", -"8 c #2B3581", -"9 c #2D3D87", -"0 c #223C88", -"q c #293F88", -"w c #373784", -"e c #303C86", -"r c #473E89", -"t c #00408D", -"y c #0E4089", -"u c #03488F", -"i c #16438B", -"p c #014493", -"a c #014B94", -"s c #0B4D92", -"d c #004F9A", -"f c #134F93", -"g c #055097", -"h c #0B5094", -"j c #01559C", -"k c #00589E", -"l c #085A9E", -"z c #125094", -"x c #115698", -"c c #22458D", -"v c #2C448B", -"b c #2D4A8F", -"n c #33478D", -"m c #3B448B", -"M c #35498F", -"N c #224F95", -"B c #255596", -"V c #2A5194", -"C c #245C9D", -"Z c #2C5E9D", -"A c #395495", -"S c #375798", -"D c #355A9A", -"F c #3A5B9A", -"G c #2D619E", -"H c #3E639E", -"J c #005CA3", -"K c #0D5EA1", -"L c #0262A6", -"P c #0065AB", -"I c #0069AE", -"U c #1563A5", -"Y c #1C66A5", -"T c #1F68A6", -"R c #176BAB", -"E c #0064B2", -"W c #006DB2", -"Q c #106FB0", -"! c #0071B6", -"~ c #0C73B5", -"^ c #0074B9", -"/ c #1273B3", -"( c #1C79B6", -") c #2666A3", -"_ c #2C65A2", -"` c #2569A6", -"' c #2A6AA6", -"] c #266EA9", -"[ c #2C6EA9", -"{ c #3567A2", -"} c #3A65A1", -"| c #336BA5", -" . c #3A69A3", -".. c #336EA8", -"X. c #2C71AA", -"o. c #3373AB", -"O. c #3579AF", -"+. c #3D79AF", -"@. c #2176B2", -"#. c #297DB7", -"$. c #207FBB", -"%. c #3577B0", -"&. c #347AB2", -"*. c #3D7CB2", -"=. c #4F4A91", -"-. c #5B4E92", -";. c #435495", -":. c #465E9B", -">. c #4A5D9B", -",. c #555597", -"<. c #644E91", -"1. c #665898", -"2. c #43629E", -"3. c #49609D", -"4. c #55639E", -"5. c #4165A0", -"6. c #4B6DA5", -"7. c #566FA7", -"8. c #5A6BA4", -"9. c #536FAA", -"0. c #5670A7", -"q. c #5778AC", -"w. c #427CB1", -"e. c #517EB0", -"r. c #6E69A3", -"t. c #6B76AA", -"y. c #7174A9", -"u. c #8272A7", -"i. c #8476AA", -"p. c #8872A8", -"a. c #2580BB", -"s. c #2C83BD", -"d. c #3386BD", -"f. c #3488BF", -"g. c #398ABF", -"h. c #4585B7", -"j. c #4884B7", -"k. c #448BBD", -"l. c #488DBF", -"z. c #5282B3", -"x. c #5B81B1", -"c. c #5688B7", -"v. c #5488B8", -"b. c #7C89B6", -"n. c #738DB8", -"m. c #6091BD", -"M. c #348AC0", -"N. c #3692C8", -"B. c #3E95C9", -"V. c #428DC1", -"C. c #569ECA", -"Z. c #6295C0", -"A. c #679AC4", -"S. c #729CC5", -"D. c #7C9BC2", -"F. c #60A3CE", -"G. c #7DACCF", -"H. c #6CA7D1", -"J. c #6FABD3", -"K. c #8F84B4", -"L. c #998AB7", -"P. c #9B8FB9", -"I. c #A397BE", -"U. c #83ACCE", -"Y. c #8FAFCE", -"T. c #94A7C9", -"R. c #9DA7C9", -"E. c #97AECE", -"W. c #9BABCB", -"Q. c #92B4D2", -"!. c #93BFDC", -"~. c #99BFDA", -"^. c #A2A5C8", -"/. c #A0ABCB", -"(. c #B2A7C9", -"). c #B6AECD", -"_. c #A3B1CF", -"`. c #A6B4D1", -"'. c #AAB5D1", -"]. c #A7B8D4", -"[. c #ABBAD5", -"{. c #A0BED9", -"}. c #AEBFD8", -"|. c #B2BED7", -" X c #95C3DF", -".X c #A3C4DD", -"XX c #B7C2D9", -"oX c #B9C4DC", -"OX c #95C4E0", -"+X c #9DC7E2", -"@X c #9DC9E4", -"#X c #A2C7E0", -"$X c #A5CAE2", -"%X c #AECDE3", -"&X c #B0CCE2", -"*X c #BACCE0", -"=X c #BFD7E8", -"-X c #CDCCCC", -";X c #D0CFCF", -":X c #C7C5DB", -">X c #CDC4DB", -",X c #D4D3D3", -" O # % > > > > % + O > 4.'.gXhXdXqX-XjXjXjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXjXjX.>.>.>.;.;.M 9 > O O ;.'.hXhXrX,XjXjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXjXqXdXhX7X8.@ @ 7 M ;.>.>.>.>.>.>.>.>.>.>.>.>.;.M 7 @ @ 8.7XhXsX,XjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXqXhXhXXXv . 7 M >.>.>.:.:.:.:.:.:.:.:.:.:.:.:.>.>.>.M 7 . v XXhXsX.;.q @ % _.hXsX,XjXjXjXjXjXjX", -"jXjXjXjXjXXw D } H 2.2.c o 7.hXdX,XjXjXjX", -"jXjXjXsXhX[.o 4 F 5.} } { G e.gXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhX(.7 { } } 5.F 4 o [.hXwXjXjXjX", -"jXjXqXhXgXD 2 V } } { { { _ *XhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhX-.V | { } 5.V * S gXdX,XjXjX", -"jXjXsXhX].& i } .{ { | _ z.hXhXhXhXhXhXhXhXeX^.E.3XhXhXhXhXhXhXhXhXI.7 ..{ { } } i X ].hXqXjXjX", -"jXX; ..| { { .B 1 6.hXsX-XjX", -"jXwXhX6Xy j _ { | | | | _ 3XhXhXhXhXhXhXhX1.N O.o.' m.hXhXhXhXhXhXhX4X; | | | | { { j y 6XhX,XjX", -"jXrXhXE.1 / %.{ | .........X6XuXgXhXhXhXiX: [ o.X.T U.hXhXhXhXhXhXhX>X; o...| | { O.Q 1 E.hXqXjX", -"jXdXhXx.t ( d...| ....o.o.[ o.w.v.Z.S.U.D.5 l l d *.pXhXhXhXhXhXhXhXL.0 o.....| ..d.( t x.hXrXjX", -" c #BB221B", -", c #9C2721", -"< c #9F2821", -"1 c #A32821", -"2 c #AA2821", -"3 c #B32821", -"4 c #BC2821", -"5 c #A2312A", -"6 c #AB312A", -"7 c #B3312A", -"8 c #BC312A", -"9 c #C7150D", -"0 c #C41B13", -"q c #CB1E16", -"w c #D31D15", -"e c #C3231B", -"r c #CB241C", -"t c #D1221A", -"y c #C42921", -"u c #CB2921", -"i c #D32921", -"p c #C1322A", -"a c #AE544F", -"s c #AF5751", -"d c #B05954", -"f c #B25D58", -"g c #B5645F", -"h c #CB5A55", -"j c #CF5D58", -"k c #D25A55", -"l c #D15D58", -"z c #D5615B", -"x c #CC6762", -"c c #CFA9A6", -"v c #D3AEAB", -"b c #DAAEAC", -"n c #DBB0AE", -"m c #D5BAB9", -"M c #E3B1AF", -"N c #E4B6B4", -"B c #EAB6B4", -"V c #CDCCCC", -"C c #D0CFCF", -"Z c #DFCAC9", -"A c #D4D3D3", -"S c #D8D7D7", -"D c #D7D8D6", -"F c #D8D8D7", -"G c #DCDCDB", -"H c #E6C5C4", -"J c #E9C5C4", -"K c #E2CECD", -"L c #EBCECC", -"P c #E5D0CF", -"I c #EED0CE", -"U c #E4D3D1", -"Y c #EED3D2", -"T c #E0DFDF", -"R c #F0DCDB", -"E c #E0E0DF", -"W c #E8E0DF", -"Q c #E3E3E3", -"! c #EBE4E4", -"~ c #E7E8E7", -"^ c #E8E8E7", -"/ c #E8E7E8", -"( c #E6EBEA", -") c #ECECEC", -"_ c #F1E7E7", -"` c #F0E8E7", -"' c #F3EAEA", -"] c #E9F0EF", -"[ c #F0F0EF", -"{ c #ECF2F2", -"} c #F2F2F2", -"| c #F5FBFB", -" . c #FAFCFC", -".. c None", -/* pixels */ -"....................................F D V V V V V V V V D F ....................................", -"..............................F V V A S G Q Q Q ~ Q Q G F A V V F ..............................", -"..........................A V A G ~ ^ ) ) ) ) ^ ^ ) ) ) ) ^ ~ G A V A ..........................", -"......................F V D Q ^ ) ^ ^ ) ) ) ) ) ) ) ) ) ) ^ ^ ) ^ Q S V S ......................", -"....................V A Q ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ^ ^ ) Q A V ....................", -"................G V F ^ ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ^ ^ G V G ................", -"..............F V Q ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ) Q V S ..............", -"............F V Q ) / ) ) ) ) ) ) ) ) ) ) [ [ [ [ [ [ ) ) ) ) ) ) ) ) ) ) ^ ) Q V S ............", -"..........G V Q ) ^ ) ) ) ) ) ) ) ) [ } } } } } } } } } [ ) ) ) ) ) ) ) ) ) ^ ^ Q V G ..........", -"..........V T ) ^ ) ) ) ) ) ) ) } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ) ^ ) Q V ..........", -"........V F ) ^ ) ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ ) G V ........", -"......G C ^ ^ ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ ^ A F ......", -"......V Q ) ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ Q V ......", -"....D A ) ^ ) ) ) ) ) } } } } | | | | | | } } } } } } | | | | | | } } } [ ) ) ) ) ) ^ ) S A ....", -"....V Q ) ) ) ) ) ) [ } } | J k l l j h x ' | } } | R z k l j j h H | } } ) ) ) ) ) ) ^ Q V ....", -"..G A ^ ) ) ) ) ) [ } } } | M 9 0 0 0 O 4 ` | | | .Y q 9 0 0 & O M | } } } [ ) ) ) ) ^ ) A G ..", -"..V G ) ) ) ) ) ) } } } } | B q r r e e p ' .| | .Y i r r r e & b { ~ ~ ^ ) ) ) ) ) ^ ) T V ..", -"..V ~ ) ) ) ) ) ) } } } } | B w t r r e p ' .} } | L i t r r e & b { Q Q Q G G Q ^ ) ) ^ ^ V ..", -"G A ^ ) ) ) ) ) [ } } } } | B w t r r e p ' | } } | I i t r r e & b { ~ Q Q Q G G G G ~ ) ) A G ", -"S S ) ) ) ) ) ) } } } } } .B w r r e e p _ | } } | Y i t r r e & b { ~ Q Q Q G G G F D G / G D ", -"V G ) ) ) ) ) [ } } } } } .B q r r e > 8 _ | } } | Y u r r e e & b { ~ Q Q Q E G G G F A A F V ", -"V Q ) ) ) ) ) [ } } } } } .B 0 e e e > 8 ' .| | .Y u e e e > & b { ~ Q Q Q E G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } .N 0 e e > > 8 ' . . . .Y y e e > > % b { ^ ~ Q Q Q G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } .N & > > > * 8 ' . . . .Y 4 > > > : % b { ^ ~ Q Q Q G G G F A A C V ", -"V Q ) ) ) ) ) [ } } } } } .N % > : : * 7 ' . . . .Y 4 > > : : @ b { ^ ~ Q Q Q G G G F A A C V ", -"V Q ) ) ) ) ) [ } } } } } | n % : : : $ 7 ' . . . .Y 3 : : : ; @ b { ^ ~ Q Q Q G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } { b @ ; ; ; $ 6 ' .| | .Y 3 ; ; ; ; + v { ~ ~ Q Q Q G G G F A A V V ", -"C G ) ) ) ) ) [ } } } } ) { b + ; ; - # 6 ` | | | .U 2 ; ; ; - + v { ~ Q Q Q E G G G F A A V V ", -"S S ) ) ) ) ) [ } } } } ^ { v + - - - # 5 ! | } } .U 2 - - - - X v { ~ Q Q Q E G G G D A A V S ", -"G A ^ ) ) ) ) ) } } } ) ~ { v X - = = o 5 ! | } } | P 1 - - = = X v { ~ Q Q Q G G G G D A C V G ", -"..V ~ ) ) ) ) ) [ } } Q Q { v X = = = o 5 ! } } } | K < = = = = X v { Q Q Q Q G G G F A A C V ..", -"..C G ) ) ) ) ) ) } ) Q Q { v X = = = o 5 ! } } [ } K < = = = = X v ] Q Q Q E G G G F A A V C ..", -"..G A ) ) ) ) ) ) } ~ Q Q ) c . . . , W } ) ) } Z o . . . c ) Q Q E G G G G D A A V G ..", -"....V Q ) ) ) ) ) ) Q Q Q ( m a d d d s g ! ) ) ) { U f d d d d a m ( Q Q G G G G F A A V V ....", -"....D D ) ) ) ) ) ) G E Q Q ~ ( ) ) { { { ) ) ) ) ^ ) { { { ) ) ( Q Q Q G G G G F D A A V D ....", -"......V Q ) ) ) ) ^ G G Q Q Q Q Q ~ ~ ~ ^ ^ ^ ^ ^ ^ ^ ~ ~ ~ Q Q Q Q Q G G G G G D A A V V ......", -"......G A ^ ) ) ) Q G G G E Q Q Q Q Q Q ~ ~ ~ ~ ~ ~ ~ ~ Q Q Q Q Q Q G G G G G F A A C V G ......", -"........V G ) ) ) Q G G G G G Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q E G G G G G F D A A V V ........", -"..........V Q ) ) E F G G G G G Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q G G G G G G F D A A V V ..........", -"..........G V Q ) G D F G G G G G G E Q Q Q Q Q Q Q Q Q E G G G G G G G F D A A V V G ..........", -"............F V Q G A D F G G G G G G G G G G G G G G G G G G G G G G F A A A V V F ............", -"..............F V S A A A D F G G G G G G G G G G G G G G G G G G F D A A A V V F ..............", -"................G V V A A A A D F G G G G G G G G G G G G G G F D A A A A V V G ................", -"....................V V C A A A A D F F F G G G G G G F F D D A A A A C V V ....................", -"......................G V V C A A A A A A D D D D D D A A A A A A C V V G ......................", -"..........................A V V V A A A A A A A A A A A A A C V V V A ..........................", -"..............................G A V V V V A A A A A A V V V V A G ..............................", -"....................................G F A V V V V V V A F G ...................................." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_play.c b/Source/Core/DolphinWX/resources/toolbar_play.c deleted file mode 100644 index c77e26af54..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_play.c +++ /dev/null @@ -1,278 +0,0 @@ -static const unsigned char toolbar_play_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x3b, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5b, 0x8c, 0x5d, 0xd5, 0x79, -0xc7, 0x7f, 0x6b, 0xad, 0xbd, 0xf7, 0x39, 0x67, 0x8e, 0xc7, 0x3e, 0x33, -0xe3, 0xb1, 0x31, 0xc1, 0xc6, 0xc4, 0x02, 0xcb, 0x15, 0xc1, 0x6e, 0x22, -0x45, 0xb2, 0xaa, 0x82, 0x93, 0x87, 0xf8, 0x05, 0xc5, 0x48, 0x3c, 0x54, -0x02, 0xa1, 0x38, 0x8a, 0x5a, 0x72, 0x91, 0xb8, 0x3c, 0xf0, 0xe4, 0x54, -0x71, 0x84, 0x52, 0x22, 0x24, 0x0a, 0x76, 0x2b, 0x55, 0x69, 0x1f, 0x8c, -0x54, 0xcd, 0x6b, 0x45, 0xda, 0x07, 0xd2, 0x44, 0x45, 0xb6, 0xd3, 0x48, -0xb4, 0x02, 0xc9, 0x24, 0x10, 0xf0, 0x05, 0x18, 0xdb, 0x83, 0x2f, 0x33, -0x73, 0xe6, 0x7e, 0x2e, 0xfb, 0xb2, 0xbe, 0xaf, 0x0f, 0x7b, 0x9f, 0xcb, -0xd8, 0x33, 0xe3, 0x31, 0x44, 0x45, 0x2c, 0x69, 0xe9, 0xdc, 0xf7, 0xfe, -0xff, 0xbf, 0xff, 0xb7, 0xfe, 0xdf, 0xb7, 0xd6, 0x8c, 0x51, 0x55, 0xbe, -0xc8, 0xc3, 0x7e, 0xde, 0x00, 0x3e, 0xeb, 0x08, 0x3e, 0xcf, 0x9b, 0x3f, -0xf9, 0xe4, 0x3f, 0x9b, 0xce, 0xf3, 0x5f, 0xfc, 0xe2, 0x6f, 0x3e, 0x55, -0x2a, 0x98, 0x3f, 0x55, 0x0a, 0xfd, 0xfc, 0xe7, 0xbf, 0xda, 0xa9, 0xaa, -0x07, 0x54, 0xe5, 0x80, 0x88, 0xec, 0x14, 0xd1, 0xbd, 0xaa, 0x52, 0x13, -0x11, 0x44, 0x04, 0x55, 0x19, 0x17, 0x91, 0x8b, 0x22, 0x72, 0x52, 0x44, -0xde, 0x99, 0x9f, 0x6f, 0xfe, 0x72, 0x85, 0xcb, 0x28, 0xdc, 0x1e, 0x99, -0xcf, 0x44, 0xe0, 0xa5, 0x97, 0xde, 0xa8, 0xa9, 0xca, 0x23, 0xaa, 0xfa, -0xb4, 0xaa, 0xee, 0xcb, 0x81, 0x2a, 0x7d, 0xa0, 0xbb, 0xcf, 0x97, 0xbf, -0xf6, 0x88, 0xc8, 0x9c, 0x88, 0xfc, 0xbb, 0xf7, 0xf2, 0xaf, 0xad, 0x56, -0x76, 0xaa, 0x00, 0xdf, 0x99, 0x00, 0xba, 0x1e, 0x22, 0x9f, 0x9a, 0xc0, -0xcb, 0x2f, 0x9f, 0x3c, 0x0a, 0xfa, 0xb4, 0x88, 0xd6, 0x54, 0x95, 0x72, -0xb9, 0x44, 0xb5, 0x5a, 0x65, 0x70, 0x70, 0x10, 0x63, 0x0c, 0x51, 0x54, -0xea, 0x82, 0x4d, 0xd3, 0x94, 0x66, 0x73, 0x89, 0xa5, 0xa5, 0x26, 0x8b, -0x8b, 0xf3, 0x2c, 0x2e, 0x2e, 0x92, 0x65, 0x69, 0x3f, 0xb9, 0xd3, 0xde, -0xfb, 0xe7, 0x92, 0x84, 0x33, 0x05, 0x01, 0xe9, 0x90, 0xb9, 0x15, 0x89, -0xdb, 0x5e, 0x03, 0xc7, 0x8e, 0x9d, 0x3e, 0x60, 0x8c, 0x39, 0x61, 0xad, -0xdd, 0x69, 0xad, 0x65, 0x78, 0x78, 0x98, 0xbb, 0xef, 0xbe, 0x83, 0x91, -0x91, 0x0a, 0x03, 0x03, 0x01, 0x41, 0x60, 0x09, 0x02, 0x87, 0xf7, 0x20, -0x02, 0x8d, 0x46, 0xc2, 0xd2, 0x52, 0xcc, 0xfc, 0x7c, 0x93, 0x7a, 0x7d, -0x81, 0xe1, 0xe1, 0x21, 0x92, 0x24, 0x61, 0x7e, 0x7e, 0x96, 0xab, 0x57, -0xaf, 0x11, 0xc7, 0x31, 0xc0, 0x83, 0xc6, 0x98, 0xff, 0x09, 0x43, 0xff, -0x77, 0x69, 0x6a, 0x9f, 0x07, 0x4c, 0x41, 0xa2, 0x43, 0x64, 0xd5, 0x71, -0x5b, 0x0a, 0x1c, 0x3f, 0xfe, 0xdf, 0x47, 0x8d, 0x31, 0x3f, 0x01, 0xd8, -0xb2, 0x65, 0x94, 0xfb, 0xef, 0xdf, 0xce, 0x96, 0x2d, 0x25, 0x4a, 0x25, -0x8b, 0x08, 0x5d, 0xd0, 0x6b, 0x3d, 0x9f, 0x9c, 0x9c, 0x63, 0x62, 0xe2, -0x1a, 0xcd, 0x66, 0x0b, 0x91, 0x8c, 0xa9, 0xa9, 0x29, 0x26, 0x27, 0x27, -0xbb, 0x8a, 0xa8, 0xca, 0x6f, 0xbd, 0xd7, 0xbf, 0x52, 0x0d, 0xea, 0x80, -0x07, 0x64, 0x2d, 0x15, 0xd6, 0xad, 0xc0, 0xf1, 0xe3, 0xbf, 0x3d, 0x61, -0xad, 0x3d, 0x5c, 0x2a, 0x95, 0x78, 0xe0, 0x81, 0xdd, 0xdc, 0x77, 0xdf, -0x06, 0xca, 0x65, 0xd3, 0x05, 0xd7, 0x6a, 0x79, 0x66, 0x66, 0x12, 0x16, -0x16, 0x52, 0xda, 0xed, 0x7c, 0x7a, 0xef, 0x11, 0xf1, 0x44, 0x91, 0xa3, -0x54, 0x0a, 0xa9, 0x54, 0x4a, 0xd4, 0x6a, 0x83, 0x0c, 0x0d, 0xd5, 0xb8, -0x7a, 0x75, 0x92, 0x8f, 0x3f, 0xbe, 0xc8, 0xd0, 0xd0, 0x30, 0x95, 0x4a, -0x85, 0x89, 0x89, 0xcb, 0xb4, 0x5a, 0x2d, 0x80, 0xbf, 0x34, 0x46, 0xff, -0x53, 0x35, 0x3b, 0x08, 0x41, 0x9d, 0xe5, 0xeb, 0xe2, 0xa6, 0xb1, 0x2e, -0x05, 0x8e, 0x1d, 0x3b, 0x7d, 0xc2, 0x5a, 0x7b, 0xb8, 0x5a, 0xad, 0xf2, -0xe0, 0x83, 0xf7, 0xb3, 0x63, 0x47, 0xd8, 0x8d, 0x68, 0xbd, 0xee, 0xb9, -0x76, 0x2d, 0xa1, 0xd9, 0xcc, 0x10, 0xf1, 0x78, 0x2f, 0xc5, 0xa3, 0xef, -0x7b, 0x14, 0xbc, 0xf7, 0x78, 0x9f, 0x91, 0x65, 0x42, 0xad, 0xb6, 0x81, -0xad, 0x5b, 0xb7, 0x92, 0x24, 0x19, 0xef, 0xbe, 0xfb, 0x1e, 0x69, 0x1a, -0xe3, 0xbd, 0xe7, 0xea, 0xd5, 0x2b, 0xcc, 0xcf, 0xcf, 0x75, 0xd6, 0xc5, -0x1f, 0x54, 0xcd, 0xb7, 0x8c, 0x89, 0xa6, 0x01, 0xbf, 0x9a, 0x0a, 0xb7, -0x2c, 0x64, 0x2f, 0xbf, 0x7c, 0xf2, 0x04, 0x70, 0x78, 0xd3, 0xa6, 0x1a, -0x07, 0x0f, 0x7e, 0x85, 0xed, 0xdb, 0xc3, 0x22, 0xe2, 0x70, 0xfe, 0x7c, -0xc6, 0xc4, 0x44, 0x46, 0x1c, 0x2b, 0xc6, 0x18, 0xc0, 0x60, 0x0a, 0x67, -0xcf, 0x1f, 0x4d, 0x31, 0xbb, 0xf1, 0x02, 0xa0, 0x5e, 0x9f, 0xe5, 0xf7, -0xbf, 0x7f, 0x97, 0xd9, 0xd9, 0x59, 0xf6, 0xec, 0xf9, 0x33, 0xac, 0x75, -0x88, 0x28, 0x5b, 0xb6, 0x6c, 0xa5, 0x5c, 0x1e, 0xe8, 0xfc, 0xee, 0x2b, -0xaa, 0xfe, 0x5f, 0x00, 0x77, 0xc3, 0x45, 0xd6, 0x4f, 0xe0, 0xa5, 0x97, -0xfe, 0xeb, 0x69, 0x55, 0x3d, 0x5c, 0x2e, 0x97, 0xf9, 0xc6, 0x37, 0x76, -0x33, 0x3c, 0x1c, 0x20, 0x02, 0xd3, 0xd3, 0xca, 0x87, 0x1f, 0x2a, 0xed, -0xf6, 0xad, 0xe8, 0xd3, 0x25, 0x94, 0x3f, 0xef, 0xbd, 0x50, 0x85, 0x4f, -0x3e, 0x99, 0xe0, 0xc2, 0x85, 0x0b, 0xec, 0xda, 0x75, 0x5f, 0xd7, 0x7e, -0xb7, 0x6e, 0xdd, 0x4a, 0x10, 0x74, 0x33, 0xfb, 0xe1, 0x2c, 0x6b, 0x3c, -0x05, 0xd8, 0xfe, 0xa2, 0xb7, 0x2e, 0x02, 0x2f, 0xbe, 0xf8, 0x9b, 0x7d, -0xaa, 0xfa, 0x8a, 0x73, 0x8e, 0xfd, 0xfb, 0xef, 0x67, 0x78, 0x38, 0x8f, -0xfc, 0xa5, 0x4b, 0x9e, 0x2b, 0x57, 0x72, 0xfb, 0x03, 0xa5, 0x93, 0x81, -0x2b, 0xa7, 0x62, 0xef, 0xf3, 0xce, 0xeb, 0x1e, 0x87, 0xfc, 0xb3, 0x66, -0x73, 0x91, 0x4b, 0x97, 0xc6, 0xd9, 0xb6, 0xed, 0x4b, 0xa8, 0x2a, 0xc6, -0x58, 0x46, 0x47, 0x47, 0xe9, 0x4b, 0xfb, 0x23, 0x69, 0xba, 0x74, 0xcf, -0x6a, 0x38, 0xd7, 0x50, 0x40, 0x4f, 0xa8, 0xc2, 0x9e, 0x3d, 0xf7, 0xb2, -0x7d, 0x7b, 0x05, 0x11, 0xb8, 0x78, 0x31, 0x61, 0x66, 0x26, 0x2b, 0x0a, -0x91, 0xef, 0x16, 0xa7, 0x5f, 0xff, 0xfa, 0x37, 0x34, 0x1a, 0x4b, 0xa8, -0x6a, 0x97, 0x48, 0x0f, 0x78, 0x8f, 0x41, 0xfe, 0x9e, 0x2e, 0xfb, 0x4c, -0x15, 0x16, 0x17, 0x17, 0x98, 0x9b, 0x9b, 0x25, 0x0c, 0xcb, 0xa8, 0x0a, -0xa5, 0x52, 0x99, 0x0d, 0x1b, 0x06, 0x3b, 0x5f, 0xda, 0xa4, 0x2a, 0x7f, -0xcb, 0x2a, 0x69, 0xb4, 0x22, 0x81, 0x17, 0x5e, 0x78, 0xfd, 0x3b, 0xaa, -0xba, 0x6f, 0xe3, 0xc6, 0x8d, 0xdc, 0x7b, 0xef, 0x08, 0xc6, 0x18, 0xa6, -0xa7, 0x53, 0xea, 0xf5, 0x14, 0xef, 0xa5, 0x3b, 0x3b, 0x85, 0xe8, 0xfa, -0xf5, 0xeb, 0xbc, 0xfe, 0xfa, 0xaf, 0x38, 0x7b, 0xf6, 0x5c, 0x97, 0x44, -0x3e, 0x3b, 0xc0, 0x6f, 0x34, 0x12, 0x2d, 0xc0, 0xf7, 0xde, 0x5f, 0x5c, -0x5c, 0x20, 0x4d, 0x63, 0x44, 0xf2, 0xf7, 0x6b, 0xb5, 0x21, 0x54, 0xbb, -0xca, 0x3e, 0x11, 0xc7, 0x73, 0x2b, 0xaa, 0xb0, 0x22, 0x01, 0x55, 0x3d, -0xaa, 0xaa, 0xec, 0xd9, 0xf3, 0x65, 0x36, 0x6e, 0x8c, 0x68, 0xb7, 0x85, -0x89, 0x89, 0x56, 0x5f, 0x1b, 0xd0, 0x53, 0x20, 0x4f, 0x25, 0x38, 0x78, -0xf0, 0x01, 0xce, 0x9d, 0xfb, 0x23, 0xa7, 0x4e, 0x9d, 0x5e, 0xa6, 0xc6, -0x72, 0x32, 0x5a, 0xa4, 0x89, 0x29, 0xc0, 0xd1, 0x05, 0x2c, 0xa2, 0xa4, -0x69, 0xa7, 0x16, 0x28, 0xce, 0x39, 0xaa, 0xd5, 0x2a, 0xc6, 0x74, 0xbe, -0xc7, 0x53, 0xeb, 0x22, 0xf0, 0xfc, 0xf3, 0xff, 0x71, 0x48, 0x55, 0x77, -0x0e, 0x0d, 0xd5, 0x18, 0x1d, 0xad, 0x22, 0x02, 0x97, 0x2f, 0x37, 0x49, -0xd3, 0x1e, 0xe0, 0x0e, 0x81, 0x8e, 0x45, 0x02, 0x3c, 0xfc, 0xf0, 0xd7, -0xf8, 0xf1, 0x8f, 0x1f, 0x65, 0x68, 0x28, 0xe2, 0x8d, 0x37, 0x4e, 0xf1, -0xe1, 0x87, 0x1f, 0xa1, 0x2a, 0x37, 0x11, 0xe9, 0x57, 0xa4, 0xa3, 0x50, -0x4e, 0x42, 0x6e, 0x50, 0xcc, 0x30, 0x30, 0x50, 0x2d, 0xf2, 0x46, 0x01, -0x39, 0xb4, 0xd2, 0x42, 0xbe, 0x89, 0x80, 0xaa, 0x1e, 0x56, 0x15, 0x36, -0x6f, 0x1e, 0x61, 0x68, 0xa8, 0xc2, 0xc2, 0x42, 0xc2, 0xec, 0x6c, 0xeb, -0x06, 0xe0, 0xd2, 0xf5, 0xfb, 0x99, 0x99, 0x3a, 0x77, 0xdd, 0x35, 0x82, -0x08, 0x0c, 0x0d, 0x0d, 0xf2, 0xec, 0xb3, 0x0f, 0xf3, 0xd8, 0x63, 0x7f, -0xc1, 0x47, 0x1f, 0x5d, 0xe0, 0xcd, 0x37, 0xff, 0x97, 0x66, 0xb3, 0xd9, -0x8d, 0x7c, 0x47, 0x89, 0x4e, 0xd4, 0x3b, 0xcd, 0x9d, 0xaa, 0x14, 0x37, -0x17, 0x50, 0xc5, 0x1a, 0x83, 0x41, 0xa9, 0x0e, 0x54, 0x00, 0xd3, 0x49, -0xfe, 0xbb, 0x1b, 0x8d, 0xe9, 0x7d, 0x6b, 0x12, 0x38, 0x7a, 0xf4, 0xdf, -0x6a, 0xaa, 0xf2, 0x48, 0x10, 0x84, 0x8c, 0x8e, 0x0e, 0x17, 0x96, 0xd9, -0xa2, 0xbf, 0xa3, 0xec, 0x00, 0xef, 0xa4, 0x50, 0x1c, 0x27, 0x54, 0x2a, -0x51, 0xb7, 0xb0, 0x89, 0xc0, 0xd7, 0xbf, 0x7e, 0x1f, 0xcf, 0x3f, 0xff, -0x18, 0x77, 0xdd, 0xb5, 0x91, 0xdf, 0xfd, 0xee, 0x4d, 0xc6, 0xc7, 0x2f, -0xf5, 0xa9, 0xd1, 0xe9, 0x4a, 0x57, 0x56, 0xc5, 0x98, 0xa2, 0x0a, 0x18, -0x70, 0xce, 0x51, 0x2a, 0x95, 0xa1, 0x9b, 0x72, 0x7a, 0xe8, 0x46, 0x02, -0xcb, 0x5a, 0x09, 0x11, 0x7d, 0xc8, 0x5a, 0xa5, 0x5a, 0x1d, 0xa0, 0x5a, -0x8d, 0x48, 0x53, 0x61, 0x7a, 0xba, 0x51, 0xf8, 0x77, 0x6e, 0x71, 0xd0, -0xf3, 0xf3, 0x1e, 0xa0, 0xbc, 0xdf, 0xe9, 0x1f, 0x51, 0x14, 0xf1, 0xbd, -0xef, 0x7d, 0x8b, 0xf3, 0xe7, 0xaf, 0x30, 0x36, 0x76, 0x8a, 0xc9, 0xc9, -0x29, 0x76, 0xef, 0xbe, 0x97, 0x30, 0x74, 0xcb, 0xa2, 0x2f, 0x22, 0xa8, -0x68, 0x01, 0xda, 0x60, 0x8c, 0xc1, 0x1a, 0x83, 0xa8, 0x20, 0x0a, 0x41, -0xe0, 0x30, 0x3d, 0x03, 0xd8, 0xbb, 0xa6, 0x02, 0xaa, 0xba, 0x4f, 0x55, -0x18, 0x18, 0x18, 0xa0, 0x5c, 0x0e, 0x59, 0x58, 0x88, 0x97, 0x45, 0x7e, -0x79, 0x5b, 0xe0, 0xbb, 0xef, 0xe7, 0xe4, 0x57, 0x9e, 0xbb, 0x76, 0xdd, -0xc9, 0x73, 0xcf, 0x3d, 0xca, 0xde, 0xbd, 0x3b, 0x78, 0xfb, 0xed, 0x33, -0x4c, 0x4c, 0x5c, 0x2d, 0xae, 0xd9, 0x59, 0xbc, 0xd2, 0x8b, 0x3e, 0x86, -0xc0, 0x5a, 0x02, 0x67, 0x71, 0xd6, 0x61, 0x2d, 0x94, 0xcb, 0xa5, 0x3e, -0x85, 0xa8, 0xdd, 0x82, 0x80, 0x1c, 0x10, 0x51, 0x82, 0x20, 0x60, 0x60, -0xa0, 0xcc, 0xc2, 0x42, 0xeb, 0x26, 0xc7, 0x59, 0xee, 0x42, 0x9e, 0x46, -0xa3, 0x41, 0xb9, 0x5c, 0xc2, 0x7b, 0x56, 0x9d, 0x51, 0x14, 0xf1, 0xed, -0x6f, 0xef, 0xe7, 0xa9, 0xa7, 0x0e, 0x91, 0xa6, 0x0d, 0x3e, 0xf8, 0xe0, -0x3c, 0xed, 0x76, 0xdc, 0x33, 0x01, 0xcd, 0xc1, 0x3b, 0x9b, 0xcf, 0xc0, -0x5a, 0x9c, 0x31, 0x58, 0x63, 0xb1, 0x26, 0x8f, 0x7f, 0x91, 0x69, 0x07, -0x6e, 0xa5, 0x40, 0x2d, 0x2f, 0x24, 0xa5, 0xa2, 0x97, 0x6f, 0xaf, 0xe8, -0x3c, 0xbd, 0x5a, 0xe0, 0x69, 0x36, 0x1b, 0x6c, 0xdb, 0x36, 0xb2, 0xaa, -0x02, 0xfd, 0x73, 0xdb, 0xb6, 0x11, 0x9e, 0x79, 0xe6, 0x51, 0xf6, 0xef, -0xdf, 0xcd, 0xc4, 0xc4, 0x65, 0xea, 0xf5, 0xd9, 0x5c, 0x09, 0x04, 0x6b, -0xc8, 0x09, 0x38, 0x5b, 0x4c, 0x83, 0xb5, 0x79, 0x4a, 0xf5, 0x9c, 0xe8, -0xe6, 0x71, 0xc3, 0x1a, 0x90, 0x7d, 0x9d, 0x3c, 0x14, 0x81, 0x85, 0x85, -0x06, 0xc6, 0xd8, 0x6e, 0x6e, 0xc2, 0xf2, 0x7e, 0x26, 0xff, 0x8d, 0xae, -0xb8, 0x06, 0xd6, 0x1a, 0xdf, 0xfc, 0xe6, 0xd7, 0xf8, 0xea, 0x57, 0x77, -0xf3, 0xc6, 0x1b, 0xef, 0x30, 0x39, 0x39, 0x87, 0x35, 0xa6, 0x20, 0xe0, -0x08, 0x5d, 0x80, 0x35, 0xf9, 0x75, 0xad, 0x91, 0xa2, 0x66, 0xac, 0xde, -0x51, 0x2f, 0x23, 0x90, 0xdb, 0x99, 0x2d, 0x22, 0x0e, 0x22, 0x82, 0x31, -0xfd, 0x9d, 0xe6, 0x72, 0x12, 0xcb, 0xad, 0x71, 0xfd, 0x04, 0x00, 0xca, -0xe5, 0x32, 0x43, 0x43, 0x83, 0x4c, 0x5e, 0x9f, 0xc3, 0x18, 0x83, 0x2b, -0x72, 0x3f, 0x70, 0x16, 0x03, 0x38, 0x2b, 0x64, 0x62, 0x48, 0xd3, 0x64, -0x95, 0x3e, 0x6b, 0x05, 0x02, 0x22, 0x8a, 0x31, 0xd2, 0x23, 0xe0, 0xf3, -0x08, 0x50, 0x28, 0xd0, 0x6b, 0x91, 0x7b, 0xa3, 0xd5, 0x6a, 0x22, 0x32, -0x74, 0x5b, 0x0a, 0xbc, 0xff, 0xfe, 0x25, 0xde, 0x7e, 0xfb, 0x1c, 0xad, -0x56, 0x8c, 0x2b, 0x52, 0x27, 0x74, 0x8e, 0x28, 0x0c, 0x08, 0x83, 0xdc, -0xa5, 0x8c, 0xcf, 0xad, 0x34, 0x4d, 0x53, 0xa4, 0x47, 0xe0, 0xcc, 0x9a, -0x04, 0x54, 0x05, 0x83, 0x21, 0x8e, 0x63, 0x16, 0x16, 0x1a, 0x85, 0x22, -0xbd, 0x9e, 0x5e, 0xc4, 0x70, 0x43, 0x06, 0xd1, 0x6c, 0xb6, 0xb9, 0xe3, -0x8e, 0x91, 0x75, 0x29, 0x30, 0x35, 0x35, 0xc7, 0x5b, 0x6f, 0x9d, 0x63, -0x6a, 0x6a, 0x96, 0x2c, 0xcb, 0x30, 0x08, 0xd6, 0xd8, 0x1c, 0x7c, 0x10, -0x10, 0x05, 0x8e, 0xc0, 0x39, 0x52, 0x9f, 0x61, 0xac, 0xc1, 0x60, 0xba, -0x6d, 0x49, 0x31, 0xe6, 0xd6, 0x24, 0x20, 0x22, 0x27, 0x8d, 0xb5, 0x07, -0x92, 0xb8, 0x4d, 0xb3, 0xd1, 0xa2, 0x93, 0x77, 0xa6, 0x53, 0x3d, 0xa1, -0xdb, 0xcb, 0x40, 0xaf, 0xf8, 0x84, 0x61, 0xb4, 0xa6, 0x02, 0xcd, 0x66, -0xcc, 0x3b, 0xef, 0x5c, 0xe0, 0xf2, 0xe5, 0xeb, 0xa4, 0x69, 0x4a, 0x96, -0x79, 0x50, 0xc1, 0x19, 0x43, 0x14, 0x38, 0xca, 0x51, 0x40, 0xb9, 0x14, -0x12, 0x05, 0x0e, 0x80, 0xcc, 0xe7, 0xe0, 0xe3, 0x24, 0x2e, 0xa2, 0xdf, -0x25, 0x70, 0xf2, 0x56, 0x04, 0xe6, 0x72, 0xd6, 0x8b, 0xcc, 0xd4, 0x67, -0xa8, 0x94, 0x4b, 0x24, 0x71, 0x82, 0xa8, 0x60, 0xc8, 0x15, 0x52, 0x01, -0x51, 0xed, 0x1d, 0xde, 0xdc, 0x62, 0x0d, 0x9c, 0x3d, 0x7b, 0x89, 0xf3, -0xe7, 0x2f, 0xd3, 0x6a, 0xb5, 0xc9, 0xb2, 0x0c, 0xdf, 0x05, 0x6f, 0x29, -0x85, 0x01, 0x03, 0xa5, 0x88, 0x4a, 0x14, 0x51, 0x0e, 0x03, 0x9c, 0x73, -0x64, 0xe2, 0xbb, 0xd7, 0x9d, 0x9d, 0x9b, 0xc3, 0x7b, 0xed, 0x57, 0xe0, -0x56, 0x29, 0xa4, 0x67, 0x14, 0x7d, 0xa4, 0xb1, 0xd4, 0xa0, 0xdd, 0x6e, -0x52, 0xad, 0x0e, 0x80, 0x0a, 0x81, 0x31, 0x39, 0x68, 0x35, 0x18, 0x3c, -0x5e, 0xa4, 0x78, 0xdd, 0xe9, 0x20, 0x6f, 0x76, 0xa1, 0x7a, 0x7d, 0x9e, -0x33, 0x67, 0xce, 0xb2, 0xb8, 0xd8, 0xe8, 0x15, 0x3e, 0xef, 0x31, 0x28, -0xce, 0x5a, 0xa2, 0xc0, 0x51, 0x89, 0xa2, 0x9c, 0x40, 0x29, 0x22, 0x0a, -0x1d, 0xaa, 0x90, 0x79, 0x8f, 0xa0, 0x78, 0x15, 0xe6, 0xe6, 0x66, 0x97, -0x35, 0x79, 0xeb, 0x51, 0xe0, 0x35, 0x63, 0xcc, 0xd1, 0x46, 0xa3, 0x81, -0xcf, 0x32, 0xd2, 0x38, 0xc5, 0x19, 0x8a, 0xf2, 0x0e, 0x06, 0x21, 0xf3, -0x79, 0x4a, 0x21, 0x79, 0x15, 0x6d, 0x36, 0x5b, 0xc5, 0x21, 0x56, 0x7e, -0x8d, 0x56, 0xab, 0xcd, 0x7b, 0xef, 0x7d, 0xc8, 0x95, 0x2b, 0x93, 0x85, -0xc5, 0x7a, 0xb4, 0x28, 0x56, 0xce, 0x1a, 0x9c, 0xc9, 0xc1, 0x97, 0xc2, -0x80, 0x6a, 0xb9, 0xc4, 0x40, 0x29, 0x22, 0x0c, 0x02, 0xac, 0x85, 0x24, -0xf3, 0x78, 0x15, 0x32, 0x2f, 0xd4, 0x67, 0x66, 0x89, 0x93, 0x14, 0x2f, -0xdd, 0xc8, 0xbc, 0x36, 0x36, 0x76, 0x64, 0xfe, 0x46, 0x02, 0xcb, 0x0a, -0xd9, 0xf1, 0xe3, 0x7f, 0xfd, 0x8e, 0x78, 0x3f, 0xee, 0xc5, 0x53, 0xaf, -0x4f, 0xe3, 0xb3, 0x04, 0x63, 0x20, 0xb0, 0x10, 0x58, 0x4b, 0xe4, 0x1c, -0x91, 0xb3, 0x84, 0xce, 0x10, 0x58, 0x70, 0x46, 0xd9, 0xba, 0x65, 0x33, -0x23, 0x23, 0x23, 0x78, 0x0f, 0x67, 0xcf, 0x8e, 0x73, 0xfa, 0xd4, 0x5b, -0x5c, 0xbb, 0x32, 0x09, 0x2a, 0x18, 0x15, 0xac, 0xe6, 0x37, 0x89, 0xac, -0xa5, 0x12, 0x06, 0x54, 0xcb, 0x11, 0x1b, 0x2a, 0x65, 0x36, 0x55, 0x07, -0x18, 0xac, 0x94, 0xf3, 0xe8, 0x07, 0xf9, 0xbe, 0x5d, 0x44, 0x49, 0x33, -0x4f, 0x9c, 0xa6, 0x5c, 0x9f, 0xbc, 0x8e, 0x97, 0xac, 0x3f, 0xfa, 0xaf, -0xde, 0x08, 0xfe, 0x26, 0x05, 0x8a, 0x44, 0xfa, 0xa5, 0x78, 0x79, 0x7a, -0x7a, 0x7a, 0x9a, 0xcd, 0xc3, 0x9b, 0x89, 0x02, 0x8b, 0xc1, 0x12, 0xd8, -0xdc, 0x8d, 0x9c, 0xc9, 0x01, 0xa5, 0x05, 0xfb, 0x5d, 0x77, 0x7f, 0x89, -0xb9, 0xd9, 0x05, 0xde, 0x7f, 0xf7, 0x2c, 0xcd, 0x56, 0x0b, 0x15, 0xcd, -0xdb, 0x00, 0x0c, 0xb8, 0xbc, 0x2d, 0x76, 0xc6, 0x75, 0xd3, 0xa6, 0x14, -0x06, 0x94, 0xa3, 0x90, 0x52, 0x18, 0x12, 0x85, 0x0e, 0x63, 0x0c, 0x99, -0x17, 0xbc, 0x08, 0x49, 0x96, 0x91, 0x64, 0x9e, 0x4f, 0xae, 0x4c, 0xd0, -0x8e, 0x63, 0x7c, 0xb7, 0x4f, 0x62, 0x7c, 0x6c, 0xec, 0xc8, 0x4a, 0x87, -0xc1, 0x37, 0x13, 0x50, 0xd5, 0x57, 0xbc, 0xf8, 0xa7, 0x93, 0x34, 0x61, -0x6a, 0xfa, 0x3a, 0xa5, 0x3b, 0xef, 0x24, 0xb0, 0x79, 0x9b, 0x1b, 0x38, -0x43, 0xa8, 0x01, 0xa1, 0xb3, 0x64, 0xce, 0x92, 0x7a, 0x4b, 0x92, 0x19, -0xce, 0xbf, 0xfb, 0x01, 0xc6, 0x0b, 0xe5, 0x20, 0x40, 0x34, 0xef, 0x2e, -0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x81, 0x75, 0x84, 0x81, 0xcd, 0xad, 0x32, -0x0c, 0x88, 0x82, 0x80, 0xc0, 0x59, 0xc0, 0x90, 0x89, 0x27, 0x13, 0x4f, -0x3b, 0x49, 0x69, 0xa7, 0x29, 0x53, 0xf5, 0x69, 0xea, 0x33, 0x73, 0xa4, -0x59, 0x86, 0x48, 0x37, 0xfc, 0x47, 0x57, 0x02, 0x0f, 0xab, 0x1c, 0x6c, -0xfd, 0xe8, 0x47, 0xff, 0xf4, 0x6a, 0x18, 0x04, 0xdf, 0x29, 0x47, 0x21, -0xf7, 0x7e, 0xf9, 0x1e, 0x86, 0x36, 0xd5, 0x28, 0x87, 0x01, 0xa5, 0x30, -0x20, 0x28, 0xfc, 0x59, 0x54, 0xf1, 0xde, 0x93, 0x79, 0x21, 0xf3, 0x9e, -0xcc, 0xfb, 0xc2, 0x31, 0x84, 0x7c, 0x3f, 0x05, 0xd6, 0xe4, 0xbd, 0x4d, -0xe8, 0x2c, 0x81, 0x73, 0xc5, 0x2c, 0x1a, 0x34, 0x55, 0x52, 0x9f, 0xa7, -0x4b, 0x33, 0x4e, 0x69, 0xc4, 0x31, 0xd7, 0xa7, 0xa7, 0xf9, 0xf8, 0xe2, -0x38, 0xad, 0x38, 0xee, 0x27, 0x70, 0x66, 0x6c, 0xec, 0xc8, 0x9f, 0xaf, -0x46, 0x60, 0xc5, 0xa3, 0xc5, 0xd0, 0xd9, 0x9f, 0x66, 0x59, 0x7a, 0x28, -0x81, 0xda, 0xf8, 0xa5, 0xcb, 0x04, 0xf7, 0x04, 0xd8, 0xc1, 0x0d, 0x79, -0xd5, 0x0c, 0x43, 0x9c, 0xb3, 0x04, 0x06, 0x28, 0xaa, 0xa6, 0x14, 0xae, -0x24, 0xa2, 0xfd, 0xc7, 0x11, 0xf9, 0xce, 0xca, 0x80, 0x2d, 0xba, 0x4b, -0x63, 0x0c, 0x8a, 0xe2, 0x45, 0x0a, 0xf0, 0x19, 0xcd, 0x38, 0xa5, 0x19, -0xc7, 0x4c, 0xd5, 0xeb, 0x5c, 0xbc, 0x7c, 0x89, 0x38, 0xc9, 0xc8, 0xbc, -0xef, 0xb7, 0xce, 0xc3, 0xab, 0x81, 0x5f, 0x55, 0x01, 0x80, 0x1f, 0xfe, -0xe0, 0x1f, 0x9f, 0x35, 0xc6, 0xfe, 0x7d, 0x39, 0x8a, 0xa8, 0x56, 0xca, -0xec, 0xba, 0x67, 0x27, 0xb5, 0xc1, 0x41, 0x2a, 0x51, 0x58, 0x28, 0x61, -0x71, 0xd6, 0x62, 0xad, 0xe9, 0xd6, 0x99, 0x1c, 0x5e, 0x31, 0x0a, 0x19, -0x3a, 0x85, 0x5b, 0x35, 0x07, 0x9e, 0xf9, 0x3c, 0xd7, 0xf3, 0xc8, 0x27, -0x34, 0xe3, 0x84, 0x89, 0x2b, 0x57, 0xb9, 0x3a, 0x79, 0x8d, 0x76, 0x9c, -0x90, 0xa4, 0x69, 0x7f, 0xee, 0x3f, 0x33, 0x36, 0x76, 0xe4, 0xd8, 0xa7, -0x22, 0x00, 0xf0, 0xfd, 0x27, 0x8f, 0xbf, 0x16, 0x38, 0x77, 0xa8, 0x54, -0x90, 0xd8, 0xb9, 0x63, 0x07, 0x43, 0x1b, 0x7b, 0x24, 0xa2, 0x20, 0xc0, -0x15, 0x44, 0x3a, 0x3b, 0xaa, 0x6e, 0xfe, 0x14, 0xc5, 0x4e, 0x8a, 0xed, -0x63, 0x9e, 0x6a, 0xf9, 0x22, 0x6d, 0x27, 0x29, 0xad, 0x24, 0x61, 0x61, -0x69, 0x89, 0x8b, 0x13, 0x13, 0xcc, 0x2d, 0x2c, 0xd0, 0x8e, 0x13, 0x32, -0x9f, 0x91, 0xf9, 0x2e, 0xf8, 0x57, 0xc7, 0xc6, 0x8e, 0x7c, 0x77, 0x2d, -0xf0, 0x70, 0x8b, 0xd3, 0xe9, 0xc0, 0xb9, 0xc3, 0x71, 0x9a, 0x9e, 0x54, -0xd5, 0xbd, 0x22, 0x9e, 0xf3, 0x1f, 0x7d, 0xc4, 0xd6, 0xcd, 0xa3, 0xdc, -0xb1, 0x65, 0x94, 0x81, 0x52, 0x89, 0x28, 0xf4, 0x44, 0x81, 0x23, 0x74, -0x0e, 0x67, 0xf3, 0x0d, 0x48, 0xe7, 0x18, 0x44, 0xc9, 0x81, 0x7b, 0x2f, -0x64, 0x22, 0x24, 0x69, 0x56, 0xb8, 0x4c, 0xc6, 0x52, 0xb3, 0xc5, 0xb5, -0xa9, 0x49, 0xa6, 0xa6, 0xa7, 0x69, 0xb6, 0x13, 0x92, 0x34, 0xc9, 0xd7, -0x90, 0xdc, 0x1e, 0xf8, 0x5b, 0x2a, 0x00, 0xf0, 0xc3, 0xef, 0xff, 0x43, -0x2d, 0xc9, 0xb2, 0x93, 0x81, 0x73, 0x7b, 0xc3, 0xc0, 0x51, 0x0a, 0x43, -0x06, 0x2a, 0x65, 0xb6, 0x8c, 0x6c, 0x66, 0xb8, 0x56, 0xa3, 0x52, 0x2e, -0x11, 0x76, 0x17, 0x67, 0x4e, 0x00, 0xcd, 0xdb, 0x0d, 0xd1, 0x7c, 0xe3, -0x93, 0x7a, 0x4f, 0x92, 0x66, 0xcc, 0x2f, 0x2e, 0x32, 0x3b, 0x3f, 0xc7, -0xf4, 0xcc, 0x0c, 0xad, 0x38, 0x07, 0x9e, 0x66, 0x45, 0x95, 0xee, 0x55, -0xdc, 0x75, 0x83, 0x5f, 0x17, 0x01, 0x80, 0x1f, 0x3c, 0x79, 0xbc, 0x16, -0x27, 0xc9, 0x6b, 0xd6, 0xda, 0x87, 0xa2, 0xd0, 0x11, 0x06, 0x01, 0x61, -0x10, 0x10, 0x85, 0x21, 0x1b, 0x37, 0x6c, 0xa0, 0x3a, 0x50, 0x65, 0x43, -0x75, 0x80, 0x28, 0x8c, 0x70, 0x2e, 0x6f, 0xc8, 0xbc, 0xcf, 0x88, 0x93, -0x94, 0x76, 0xbb, 0xcd, 0x52, 0x63, 0x89, 0xf9, 0xc5, 0x45, 0xe2, 0x24, -0xa1, 0x9d, 0xa4, 0xa4, 0x59, 0xde, 0xd0, 0x79, 0x29, 0xda, 0x92, 0x3e, -0xbb, 0x1c, 0x1b, 0x3b, 0xf2, 0xd3, 0xf5, 0x82, 0x5f, 0x37, 0x81, 0xce, -0xf8, 0xee, 0xe1, 0x17, 0x8f, 0x1a, 0x63, 0x7e, 0xe2, 0xac, 0xc5, 0xb9, -0xbc, 0x38, 0x05, 0x85, 0xa7, 0xe7, 0x1b, 0x11, 0xd7, 0x4d, 0x21, 0xc8, -0x17, 0xac, 0x48, 0xc7, 0x66, 0xb3, 0xae, 0xdd, 0x8a, 0x48, 0x37, 0x5d, -0x8a, 0xdb, 0x8f, 0x03, 0x87, 0xc7, 0xc6, 0x8e, 0x9c, 0xba, 0x1d, 0xf0, -0xb7, 0x4d, 0x00, 0xe0, 0x89, 0x27, 0x5e, 0xd8, 0x6b, 0x8c, 0x79, 0xc5, -0x1a, 0x73, 0xc0, 0xd8, 0xde, 0xc6, 0xdb, 0x16, 0x95, 0xda, 0x16, 0xb6, -0xd3, 0x39, 0xd7, 0x14, 0x95, 0x6e, 0x94, 0x65, 0xd9, 0x49, 0x1d, 0x90, -0xf7, 0xf7, 0xaf, 0xdc, 0x6e, 0xd4, 0x3f, 0x13, 0x81, 0xce, 0x78, 0xfc, -0xf1, 0x9f, 0x3d, 0x64, 0x0c, 0x87, 0xad, 0xb1, 0x8f, 0x18, 0x63, 0x6a, -0xbd, 0x0d, 0x78, 0x6f, 0xc7, 0xd3, 0x01, 0x9c, 0xef, 0x25, 0x96, 0x01, -0x3f, 0x03, 0xbc, 0xc2, 0x2a, 0x0d, 0xda, 0xff, 0x0b, 0x81, 0xfe, 0xf1, -0xf8, 0xe3, 0x3f, 0x3b, 0x04, 0xec, 0x23, 0x3f, 0xf6, 0xd8, 0x59, 0xcc, -0xce, 0x98, 0x23, 0x07, 0x3c, 0x4e, 0xde, 0x0e, 0x9f, 0x1c, 0x1b, 0x3b, -0x72, 0xf1, 0x33, 0xdf, 0xb4, 0x18, 0x7f, 0xb2, 0xbf, 0xd4, 0x7f, 0x5e, -0xe3, 0x0b, 0xff, 0xcf, 0x1e, 0x5f, 0x78, 0x02, 0xff, 0x07, 0xe2, 0x1a, -0xeb, 0x6e, 0x4b, 0x67, 0x61, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_play.xpm b/Source/Core/DolphinWX/resources/toolbar_play.xpm deleted file mode 100644 index e7bae8dc84..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_play.xpm +++ /dev/null @@ -1,149 +0,0 @@ -/* XPM */ -static const char *toolbar_play_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 95 2", -" c #9D0F08", -". c #A5160F", -"X c #AE170F", -"o c #B5160F", -"O c #A31710", -"+ c #A51A12", -"@ c #AA1B14", -"# c #A11E18", -"$ c #A81F18", -"% c #B31A13", -"& c #BC1A11", -"* c #A5211A", -"= c #AD231C", -"- c #B3231C", -"; c #BC241C", -": c #AA2B24", -"> c #AE322B", -", c #B9322B", -"< c #B03933", -"1 c #CA1006", -"2 c #CE170E", -"3 c #D1180F", -"4 c #C31B12", -"5 c #CC1A12", -"6 c #D11A11", -"7 c #C3241C", -"8 c #CB241C", -"9 c #D3231B", -"0 c #D32C25", -"q c #D23B34", -"w c #B4403B", -"e c #AF4B45", -"r c #B84C46", -"t c #B6534E", -"y c #B65F5A", -"u c #BA635E", -"i c #BE6560", -"p c #BE6C67", -"a c #D24E47", -"s c #C0625D", -"d c #CE625C", -"f c #D7635E", -"g c #C46661", -"h c #CA6662", -"j c #CE6862", -"k c #D36762", -"l c #D36863", -"z c #DC6964", -"x c #DE716B", -"c c #C67874", -"v c #D07874", -"b c #C98581", -"n c #CD918D", -"m c #D2918D", -"M c #D39D9B", -"N c #E38985", -"B c #E6A39F", -"V c #D3A5A2", -"C c #DCB6B3", -"Z c #D7B9B6", -"A c #D8B9B6", -"S c #D8BBB9", -"D c #E3B5B2", -"F c #CDCCCC", -"G c #D9C4C2", -"H c #D0CFCF", -"J c #DBCBCA", -"K c #D4D3D3", -"L c #D8D7D7", -"P c #D7D8D6", -"I c #D8D8D7", -"U c #DCDCDB", -"Y c #EBC5C3", -"T c #E4CAC8", -"R c #E2D1D0", -"E c #EDD5D4", -"W c #E0DFDF", -"Q c #E9DBDA", -"! c #F1D9D8", -"~ c #E0E0DF", -"^ c #E4E3E3", -"/ c #EAE5E4", -"( c #E8E8E7", -") c #E8E7E8", -"_ c #E6E9E8", -"` c #ECECEC", -"' c #F2EDEC", -"] c #EEF0EF", -"[ c #F0F0EF", -"{ c #EDF2F2", -"} c #F2F3F2", -"| c #F1F8F7", -" . c #F4FBFB", -".. c #F9FEFE", -"X. c None", -/* pixels */ -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.I P F F F F F F F F P I X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.I F F K L U ^ ^ ^ ^ ^ ^ U I K F F I X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.K F K U ( ( ` ` ` ` ( ( ` ` ` ` ( ( U K F K X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.I F P ^ ( ` ( ( ` ` ` ` ` ` ` ` ` ` ( ( ` ( ^ L F L X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.F K ^ ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ( ( ` ^ K F X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.U F I ( ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ( ( U F U X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.I F ^ ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ` ^ F L X.X.X.X.X.X.X.", -"X.X.X.X.X.X.I F ^ ` ) ` ` ` ` ` ` ` ` ` ` [ [ [ [ [ [ ` ` ` ` ` ` ` ` ` ` ( ` ^ F L X.X.X.X.X.X.", -"X.X.X.X.X.U F ^ ` ( ` ` ` ` ` ` ` ` [ } } } } } } } } } [ ` ` ` ` ` ` ` ` ` ( ( ^ F U X.X.X.X.X.", -"X.X.X.X.X.F W ` ( ` ` ` ` ` ` ` } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ` ( ` ^ F X.X.X.X.X.", -"X.X.X.X.F I ` ( ` ` ` ` ` ` ` } } } } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ` U F X.X.X.X.", -"X.X.X.U H ( ( ` ` ` ` ` ` } } } } | } } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ( K I X.X.X.", -"X.X.X.F ^ ` ` ` ` ` ` ` } } } } } E } .} } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ^ F X.X.X.", -"X.X.P K ` ( ` ` ` ` ` } } } } } .f a Y .. .} } } } } } } } } } } } } } [ ` ` ` ` ` ( ` L K X.X.", -"X.X.F ^ ` ` ` ` ` ` [ } } } } } .z 1 9 x ! .. .| | } } } } } } } } } } } ` ` ` ` ` ` ( ^ F X.X.", -"X.U K ( ` ` ` ` ` [ } } } } } } ..z 5 9 3 0 N ' .. .| | | } } } } } } } } } [ ` ` ` ` ( ` K U X.", -"X.F U ` ` ` ` ` ` } } } } } } } ..z 6 9 9 9 2 q B | ..} ` ` ` ( ( ( ( ( ( ( ` ` ` ` ` ( ` W F X.", -"X.F ^ ` ` ` ` ` ` } } } } } } } ..z 6 9 9 9 9 5 5 a D | | ` ` ` ( ( ( ^ ^ ^ U U ^ ( ` ` ( ( F X.", -"U K ( ` ` ` ` ` [ } } } } } } } ..z 6 9 9 9 8 8 8 4 4 d T .{ ` ` ( ( ( ^ ^ ^ U U U U ( ` ` K U ", -"L L ` ` ` ` ` ` } } } } } } } | ..z 5 9 9 8 8 8 8 7 7 & ; v Q .` ( ( ( ^ ^ ^ U U U I P U ) U P ", -"F U ` ` ` ` ` [ } } } } } } } | ..z 5 8 8 8 8 8 7 7 7 ; ; o , m / { _ ( ^ ^ ^ ~ U U U I K K I F ", -"F ^ ` ` ` ` ` [ } } } } } } | | ..l 4 8 8 8 8 7 7 7 ; ; ; - % X w V ` { ^ ^ ^ ~ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } } | | .k 4 7 7 7 7 7 7 7 ; ; ; - - - @ + t A ` _ ^ ^ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } } | } | l 4 7 7 7 7 7 ; ; ; ; - - - = = * + # y J _ ^ U U U I K K H F ", -"F ^ ` ` ` ` ` [ } } } } } | } ` | l & 7 7 7 ; ; ; ; ; - - - = = = * + # y J _ ^ U U U I K K H F ", -"F ^ ` ` ` ` ` [ } } } } } } ` ` | j & ; ; ; ; ; ; ; - - - - = = + + t Z ` _ ^ ^ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } ` ` ` | h % ; ; ; ; ; - - - - - = $ . w V ` { ( ^ ^ ^ U U U I K K F F ", -"H U ` ` ` ` ` [ } } } } ` ( ` ` | h % - - - - - - - - = = . > n / { _ ( ^ ^ ^ ~ U U U I K K F F ", -"L L ` ` ` ` ` [ } } } } ( ( ( ` | g % - - - - - - - = @ = c Q .] ( ( ( ^ ^ ^ ~ U U U P K K F L ", -"U K ( ` ` ` ` ` } } } ` ( ( ( ` | g @ - - - - = = @ @ s T .} ` ` ( ( ( ^ ^ ^ U U U U P K H F U ", -"X.F ( ` ` ` ` ` [ } } ^ ^ ( ( ( { g @ = = = = @ + r C | | ` ` ` ( ( ( ^ ^ ^ ^ U U U I K K H F X.", -"X.H U ` ` ` ` ` ` } ` ^ ^ ( ( ( { i + = = $ . < M ' .] ` ` ` ( ( ( ( ^ ^ ^ ~ U U U I K K F H X.", -"X.U K ` ` ` ` ` ` } ( ^ ^ ^ ( ( { i + * O : b / .{ ` ` ` ` ( ( ( ( ^ ^ ^ ~ U U U U P K K F U X.", -"X.X.F ^ ` ` ` ` ` ` ^ ^ ^ ^ ^ ( { u * p R | { ` ` ` ` ( ( ( ( ( ^ ^ ^ ^ U U U U I K K F F X.X.", -"X.X.P P ` ` ` ` ` ` U ~ ^ ^ ^ ^ ` y e S { { ` ` ` ` ( ( ( ( ( ( ^ ^ ^ ^ U U U U I P K K F P X.X.", -"X.X.X.F ^ ` ` ` ` ( U U ^ ^ ^ ^ ^ G ^ { ( ( ( ( ( ( ( ( ( ( ^ ^ ^ ^ ^ U U U U U P K K F F X.X.X.", -"X.X.X.U K ( ` ` ` ^ U U U ~ ^ ^ ^ _ _ ^ ( ( ( ( ( ( ( ( ^ ^ ^ ^ ^ ^ U U U U U I K K H F U X.X.X.", -"X.X.X.X.F U ` ` ` ^ U U U U U ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ~ U U U U U I P K K F F X.X.X.X.", -"X.X.X.X.X.F ^ ` ` ~ I U U U U U ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ U U U U U U I P K K F F X.X.X.X.X.", -"X.X.X.X.X.U F ^ ` U P I U U U U U U ~ ^ ^ ^ ^ ^ ^ ^ ^ ^ ~ U U U U U U U I P K K F F U X.X.X.X.X.", -"X.X.X.X.X.X.I F ^ U K P I U U U U U U U U U U U U U U U U U U U U U U I K K K F F I X.X.X.X.X.X.", -"X.X.X.X.X.X.X.I F L K K K P I U U U U U U U U U U U U U U U U U U I P K K K F F I X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.U F F K K K K P I U U U U U U U U U U U U U U I P K K K K F F U X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.F F H K K K K P I I I U U U U U U I I P P K K K K H F F X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.U F F H K K K K K K P P P P P P K K K K K K H F F U X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.K F F F K K K K K K K K K K K K K H F F F K X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.U K F F F F K K K K K K F F F F K U X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.U I K F F F F F F K I U X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c b/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c deleted file mode 100644 index 0f4f24f4e7..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c +++ /dev/null @@ -1,316 +0,0 @@ -static const unsigned char toolbar_plugin_dsp_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x31, 0x2f, 0x30, 0x34, 0x0e, 0x46, 0xed, 0x55, 0x00, 0x00, 0x0e, 0x01, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x7b, 0x70, 0x5c, 0xd5, -0x7d, 0xc7, 0x3f, 0xe7, 0xde, 0xdd, 0x95, 0xb4, 0xbb, 0xd2, 0x4a, 0xb6, -0x2c, 0xc9, 0xef, 0xb5, 0xc0, 0x74, 0xc0, 0xd8, 0x56, 0xcc, 0x18, 0x4c, -0x93, 0x60, 0xd9, 0xbc, 0xfa, 0x4a, 0x6c, 0x92, 0x29, 0x01, 0x6d, 0x82, -0xe5, 0x96, 0x92, 0xa1, 0x0f, 0x70, 0x28, 0x90, 0x09, 0xc2, 0xb5, 0x5d, -0x10, 0xd3, 0x16, 0x06, 0x1b, 0x48, 0x4a, 0x81, 0x38, 0x36, 0x29, 0x52, -0x5c, 0xc1, 0xd4, 0x40, 0x26, 0x6d, 0x02, 0xd8, 0x96, 0x5d, 0x52, 0x0c, -0x64, 0x40, 0xb6, 0x6c, 0x17, 0xe3, 0x58, 0x92, 0x1d, 0xc9, 0x96, 0x56, -0x5e, 0x69, 0xb5, 0x2b, 0x69, 0x77, 0xa5, 0xbd, 0xe7, 0xf4, 0x8f, 0xfb, -0xd8, 0xab, 0xb5, 0x64, 0x4c, 0xa0, 0x93, 0xe9, 0x6f, 0xe7, 0xce, 0x9e, -0xbd, 0xf7, 0x3c, 0xbe, 0xdf, 0xf3, 0x7b, 0x9c, 0xdf, 0x39, 0x77, 0x85, -0x52, 0x8a, 0xff, 0xcf, 0xe2, 0xb9, 0xd8, 0x8a, 0x91, 0xba, 0xc6, 0x5a, -0xc0, 0xbe, 0x42, 0x40, 0x1c, 0xd8, 0xdc, 0xd4, 0xdc, 0xb0, 0x3f, 0xbf, -0xee, 0x03, 0x0f, 0xfc, 0x6b, 0x58, 0x29, 0x55, 0xab, 0x94, 0x0c, 0x4b, -0xa9, 0x6a, 0x95, 0x92, 0x28, 0xa5, 0x50, 0x4a, 0x22, 0xa5, 0x8a, 0x2b, -0x25, 0xdb, 0xa4, 0x54, 0xad, 0xcf, 0x3e, 0xfb, 0x97, 0xad, 0x9f, 0x95, -0x80, 0xb8, 0x90, 0x06, 0x22, 0x75, 0x8d, 0x61, 0x60, 0x33, 0xb0, 0x06, -0x28, 0xb5, 0x6e, 0x77, 0x01, 0xf5, 0xf9, 0xc0, 0x1f, 0x7a, 0x68, 0x57, -0x8d, 0x52, 0xaa, 0x5e, 0x4a, 0xb9, 0xc6, 0x02, 0xee, 0x06, 0x8d, 0x4d, -0x42, 0xca, 0xf3, 0xc8, 0x3c, 0x25, 0xa5, 0xda, 0xf6, 0xc2, 0x0b, 0xf7, -0xc4, 0x3f, 0x37, 0x02, 0x91, 0xba, 0xc6, 0x52, 0x60, 0x1b, 0xb0, 0x2e, -0xef, 0xd1, 0xe6, 0xa6, 0xe6, 0x86, 0x2d, 0xee, 0x1b, 0x1b, 0x37, 0xbe, -0x5c, 0xaf, 0x94, 0xba, 0x57, 0x4a, 0x59, 0x93, 0x0f, 0x78, 0x32, 0xe0, -0x79, 0x04, 0xec, 0xe7, 0x71, 0x29, 0xe5, 0xfa, 0x1f, 0xfe, 0x70, 0xc3, -0xab, 0x9f, 0x99, 0x40, 0xa4, 0xae, 0x71, 0x2d, 0xb0, 0x83, 0xdc, 0x8c, -0x03, 0xb4, 0x61, 0xce, 0xfa, 0x21, 0x87, 0xc9, 0xe6, 0x7f, 0xaf, 0x97, -0x52, 0x6d, 0x52, 0x4a, 0x86, 0x4d, 0x40, 0x26, 0x38, 0xbf, 0x3f, 0x88, -0xdf, 0x1f, 0xc4, 0xeb, 0xf5, 0xe1, 0xf5, 0xfa, 0x26, 0x00, 0xcd, 0x66, -0xc7, 0x49, 0xa7, 0x53, 0x24, 0x93, 0x09, 0x12, 0x89, 0x41, 0xb2, 0xd9, -0x6c, 0x3e, 0xc1, 0xf5, 0xdb, 0xb7, 0x7f, 0x67, 0xe7, 0x6f, 0x4d, 0x20, -0x52, 0xd7, 0x58, 0x6f, 0x81, 0x77, 0xcb, 0x4e, 0x60, 0x43, 0x53, 0x73, -0xc3, 0x10, 0xc0, 0x23, 0x8f, 0xbc, 0x5e, 0x23, 0xa5, 0xdc, 0xaa, 0x94, -0xac, 0x35, 0x07, 0x56, 0x78, 0x3c, 0x1e, 0xca, 0xca, 0x66, 0xe0, 0xf7, -0x07, 0x29, 0x2b, 0x29, 0x64, 0xe6, 0xf4, 0x00, 0xe5, 0xa1, 0x22, 0x0a, -0xbd, 0x1e, 0x8a, 0xbc, 0x1e, 0x0c, 0x43, 0x21, 0xb3, 0x8a, 0xe8, 0x60, -0x92, 0xc1, 0xc4, 0x28, 0x9d, 0x7d, 0x31, 0x06, 0x92, 0xc3, 0xc4, 0x07, -0x63, 0xf4, 0x9f, 0x8b, 0x5a, 0x24, 0x1d, 0x22, 0xb7, 0xec, 0xd8, 0xf1, -0xb7, 0x17, 0xad, 0x09, 0x87, 0x80, 0x65, 0x36, 0x9d, 0x79, 0x33, 0xbf, -0xa1, 0xa9, 0xb9, 0xe1, 0x29, 0xfb, 0xc7, 0xa3, 0x8f, 0xfe, 0x74, 0x83, -0x52, 0x72, 0xab, 0x3d, 0xa3, 0xba, 0xee, 0x65, 0xda, 0xb4, 0x19, 0x14, -0x17, 0x97, 0x32, 0x7f, 0x76, 0x31, 0x97, 0x57, 0x97, 0x51, 0xe4, 0xf3, -0x20, 0x0d, 0x85, 0xb2, 0x40, 0x4b, 0x43, 0x21, 0xb3, 0xd2, 0x22, 0x21, -0x91, 0x86, 0xc2, 0x30, 0x24, 0xfd, 0x83, 0xc3, 0xb4, 0x75, 0x76, 0x33, -0x98, 0x48, 0xd0, 0x7d, 0xe6, 0x34, 0xa3, 0xa9, 0x51, 0x9b, 0x40, 0x5c, -0x29, 0xb5, 0x60, 0xe7, 0xce, 0xfb, 0x2f, 0xca, 0x27, 0xdc, 0x51, 0xc8, -0xed, 0xa8, 0x60, 0x9a, 0xcc, 0x8b, 0xd6, 0xac, 0x97, 0x0a, 0xc1, 0x0e, -0xa5, 0x58, 0x6b, 0xf2, 0x55, 0x94, 0x95, 0xcd, 0x60, 0xda, 0xb4, 0x4a, -0x16, 0xcc, 0x0b, 0x71, 0xc5, 0xc2, 0x52, 0xfc, 0x85, 0x3a, 0xd2, 0x00, -0x99, 0x55, 0x08, 0x05, 0x3d, 0x7d, 0x49, 0xba, 0x7b, 0x87, 0x88, 0x0d, -0xa5, 0x18, 0x4c, 0x8c, 0x3a, 0xb3, 0x2c, 0xa5, 0xc4, 0xef, 0xf3, 0x50, -0x51, 0x12, 0x64, 0xf1, 0xbc, 0x59, 0xf4, 0x0f, 0x95, 0x50, 0xe8, 0xf3, -0x72, 0xf4, 0xf8, 0x31, 0xb2, 0x46, 0x16, 0x0b, 0xc3, 0x3a, 0xe0, 0xa9, -0x48, 0x5d, 0x63, 0x69, 0x53, 0x73, 0xc3, 0x05, 0x89, 0xb8, 0x09, 0x84, -0x5d, 0xe5, 0x36, 0x1b, 0x3c, 0x80, 0x52, 0x6a, 0x9f, 0x52, 0xd4, 0x00, -0x68, 0x9a, 0x46, 0x55, 0x55, 0x98, 0x8a, 0x8a, 0xe9, 0x2c, 0xaf, 0x99, -0x4e, 0xf9, 0xb4, 0x02, 0x94, 0x02, 0x95, 0x55, 0x8c, 0x67, 0x0d, 0x8e, -0x9f, 0x1c, 0xe0, 0xa3, 0x93, 0x31, 0x0e, 0x1f, 0xfd, 0x25, 0xfd, 0xe7, -0xba, 0xf1, 0x79, 0x0b, 0xf1, 0x79, 0x0b, 0x98, 0x37, 0xf7, 0x0a, 0xfc, -0xfe, 0x10, 0x42, 0x40, 0x7a, 0x6c, 0x9c, 0x33, 0x03, 0x43, 0xf4, 0xc7, -0x93, 0xcc, 0x28, 0x0e, 0x30, 0x3d, 0x58, 0xcc, 0xdc, 0x99, 0xb3, 0xe9, -0xec, 0x3e, 0xe5, 0x68, 0x1e, 0x78, 0x0a, 0x98, 0x1f, 0xa9, 0x6b, 0xfc, -0x10, 0xb8, 0xa5, 0xa9, 0xb9, 0xa1, 0xed, 0x93, 0x08, 0xd4, 0xba, 0xca, -0x8e, 0x0d, 0x6e, 0xd9, 0xb2, 0x7b, 0x0d, 0x98, 0xe0, 0x01, 0xc2, 0xe1, -0xcb, 0x99, 0x3d, 0xab, 0x94, 0x6b, 0xaf, 0x99, 0x8e, 0xd7, 0xa3, 0xa1, -0x14, 0x8c, 0xa7, 0x0c, 0x3e, 0x3a, 0x11, 0xe7, 0xa3, 0x5f, 0xc7, 0xe8, -0xee, 0xe9, 0xe2, 0x3f, 0x7e, 0xfe, 0x1c, 0x89, 0xe4, 0xc0, 0x84, 0x81, -0xde, 0x79, 0xef, 0xa7, 0xd4, 0x2c, 0xb9, 0x9e, 0x9a, 0x25, 0xab, 0x01, -0x10, 0x42, 0xe0, 0xd1, 0x35, 0x52, 0x63, 0xe3, 0x78, 0x75, 0x9d, 0xf9, -0x55, 0xb3, 0x38, 0x13, 0xed, 0x25, 0x95, 0x4e, 0x01, 0x84, 0xef, 0xb8, -0xe3, 0x9f, 0xd6, 0x34, 0x35, 0x37, 0xbc, 0x16, 0xa9, 0x6b, 0x6c, 0x03, -0xf6, 0x45, 0xea, 0x1a, 0x57, 0x4d, 0x46, 0x62, 0xaa, 0x85, 0xcc, 0xa9, -0x28, 0xa5, 0x5a, 0x2b, 0x84, 0x59, 0x0e, 0x85, 0xca, 0x99, 0x3b, 0xbb, -0x8c, 0x2f, 0x7f, 0xb1, 0x1c, 0xa1, 0x0b, 0x40, 0xd1, 0x7b, 0x36, 0xcd, -0xc1, 0xf7, 0xfa, 0x18, 0x1e, 0x19, 0xa3, 0x2f, 0x7a, 0x9a, 0xdd, 0xaf, -0x6f, 0x23, 0x93, 0x49, 0x71, 0xe3, 0xf5, 0xb5, 0xdc, 0x74, 0xe3, 0x6a, -0x96, 0x2c, 0x5e, 0xc4, 0xe1, 0xf6, 0xa3, 0xbc, 0xf1, 0xe6, 0x5e, 0xde, -0xdc, 0xb3, 0x07, 0x80, 0x9a, 0xc5, 0xab, 0x40, 0x81, 0x26, 0x04, 0x1e, -0x4d, 0xc3, 0xa7, 0xe9, 0x68, 0x42, 0x30, 0xa7, 0x72, 0x26, 0x27, 0x4e, -0x75, 0x00, 0xca, 0x9e, 0xd0, 0xd7, 0x30, 0x83, 0xc8, 0x5a, 0x60, 0x2b, -0xb0, 0x2a, 0x1f, 0xa8, 0xe6, 0x2a, 0xd7, 0xb8, 0xca, 0x5d, 0x76, 0x41, -0x29, 0x59, 0x23, 0xa5, 0x19, 0x6d, 0xfc, 0xfe, 0x20, 0x73, 0x67, 0x17, -0x81, 0x00, 0x04, 0x1c, 0x3f, 0x91, 0x60, 0xdf, 0x81, 0x33, 0x8c, 0x8c, -0x8e, 0x03, 0x8a, 0x03, 0x6f, 0xbf, 0x4c, 0x26, 0x93, 0xe2, 0xbe, 0x0d, -0x7f, 0xc5, 0x83, 0xf7, 0xdf, 0xcb, 0xb2, 0x65, 0x4b, 0xf1, 0xfa, 0xbc, -0x2c, 0x5b, 0xb6, 0x94, 0x07, 0xef, 0xbf, 0x97, 0x6f, 0xdf, 0x59, 0x4f, -0xdb, 0xe1, 0x3d, 0x9c, 0xed, 0x3d, 0x89, 0x34, 0x41, 0xa2, 0x09, 0x81, -0xcf, 0xa3, 0x53, 0xe8, 0xf1, 0x52, 0x35, 0xbd, 0xdc, 0x1a, 0x13, 0x2c, -0xd0, 0x34, 0x35, 0x37, 0xbc, 0x86, 0xb9, 0xea, 0xd7, 0x5a, 0x0b, 0xeb, -0x94, 0x04, 0x1c, 0x07, 0x76, 0xc7, 0x7b, 0xa5, 0x54, 0x8d, 0x19, 0xab, -0x25, 0x05, 0x05, 0x85, 0x54, 0x55, 0x16, 0xa1, 0x24, 0x74, 0x74, 0x24, -0xf9, 0xe0, 0x83, 0x18, 0xf6, 0x1a, 0x10, 0xed, 0x3f, 0x4d, 0x77, 0xcf, -0xc7, 0x5c, 0xbb, 0x62, 0x39, 0x7f, 0x70, 0xf3, 0xf5, 0x78, 0x3c, 0x3a, -0x99, 0xcc, 0x18, 0xef, 0xbe, 0xfb, 0x2b, 0x62, 0xb1, 0x01, 0x3c, 0x1e, -0x9d, 0xaf, 0x7f, 0xfd, 0xab, 0x54, 0x56, 0xcc, 0xe0, 0xd8, 0xf1, 0x83, -0xd8, 0x21, 0xd8, 0x24, 0xa1, 0xe1, 0xd3, 0x75, 0x42, 0xfe, 0x00, 0x01, -0x7f, 0xc0, 0x1e, 0x39, 0xfc, 0xcd, 0x6f, 0xfe, 0x83, 0x0d, 0xb8, 0xd5, -0xfa, 0xbe, 0xf7, 0x42, 0x04, 0x26, 0x15, 0x1b, 0xa0, 0x52, 0x8a, 0x60, -0xd0, 0x8f, 0x57, 0x17, 0x28, 0x43, 0x71, 0xfc, 0x78, 0x9c, 0x5c, 0x8e, -0xa3, 0x38, 0xd9, 0x61, 0x72, 0xbe, 0xe1, 0xfa, 0x5a, 0x34, 0x4d, 0x23, -0x95, 0x4a, 0xf3, 0xe7, 0x7f, 0xf1, 0xd7, 0x7c, 0xef, 0xe1, 0xbf, 0xe7, -0xd6, 0xdb, 0xd7, 0x73, 0xb8, 0xfd, 0x18, 0x9a, 0xa6, 0xb1, 0x62, 0xc5, -0x72, 0xfa, 0xa2, 0x9d, 0x48, 0xa5, 0x90, 0x56, 0x5b, 0x21, 0xc0, 0xa3, -0x6b, 0x78, 0x75, 0x9d, 0xe9, 0x25, 0x21, 0x40, 0xd9, 0x5a, 0x58, 0x9a, -0x47, 0x60, 0xed, 0xa7, 0x22, 0xf0, 0xd0, 0x43, 0xbb, 0x56, 0xe6, 0x96, -0x7e, 0x45, 0x49, 0xc0, 0x63, 0xc6, 0x77, 0x03, 0x06, 0x06, 0xd3, 0x4e, -0x58, 0x54, 0x4a, 0xd2, 0xdd, 0xf3, 0x31, 0x00, 0xc1, 0x60, 0x00, 0x81, -0xe0, 0x64, 0x47, 0x27, 0x67, 0x7b, 0xfb, 0x9c, 0xbe, 0x0e, 0x1d, 0x6e, -0x47, 0x58, 0x9f, 0xb1, 0xb1, 0xb4, 0x6b, 0x62, 0x00, 0x05, 0xba, 0x66, -0x6a, 0x61, 0x5a, 0xa8, 0x94, 0xdc, 0xda, 0xaa, 0x6c, 0xb3, 0xb6, 0x09, -0x84, 0xf3, 0xcd, 0xe8, 0x82, 0x04, 0xdc, 0x29, 0x82, 0xae, 0x7b, 0x4c, -0xc0, 0x06, 0x44, 0xa3, 0xa3, 0x0e, 0x70, 0xb7, 0x16, 0x00, 0x86, 0x87, -0x47, 0x50, 0x4a, 0x71, 0x49, 0x75, 0x98, 0x99, 0x55, 0x95, 0x4e, 0x5f, -0x4b, 0x97, 0x2c, 0x46, 0x29, 0xc5, 0xe1, 0xf6, 0xa3, 0x56, 0xdf, 0x12, -0x69, 0xb5, 0x05, 0xd3, 0x17, 0x74, 0x4d, 0x23, 0x58, 0x58, 0x64, 0x8f, -0x8e, 0x1d, 0xba, 0xdd, 0x26, 0x0d, 0xac, 0x74, 0x63, 0xbc, 0x60, 0x3a, -0xad, 0x94, 0xc4, 0xf4, 0x58, 0xf0, 0x78, 0xbc, 0x26, 0x68, 0xc3, 0x5c, -0x5d, 0xdd, 0xc0, 0x95, 0x52, 0xcc, 0x9e, 0xb5, 0x90, 0x9e, 0x33, 0x27, -0xd8, 0xfd, 0xda, 0xcf, 0xf8, 0xd2, 0x17, 0x57, 0x50, 0x58, 0x58, 0xc8, -0xf6, 0xe7, 0x9f, 0xa6, 0xed, 0xf0, 0x51, 0x2e, 0xad, 0x0e, 0x53, 0x5e, -0x5e, 0x4e, 0xcb, 0x2b, 0xbb, 0xe9, 0xe8, 0xec, 0x22, 0x18, 0x28, 0x35, -0x4d, 0x48, 0x82, 0x72, 0x39, 0xb3, 0x47, 0xd3, 0x08, 0x05, 0x82, 0xe4, -0x4c, 0x48, 0xe5, 0xe7, 0x63, 0x35, 0xd6, 0xe5, 0xac, 0x51, 0x93, 0x69, -0xc0, 0x59, 0xf9, 0x72, 0xd9, 0xa2, 0x79, 0x95, 0x97, 0x16, 0x22, 0x0d, -0x45, 0x6c, 0x20, 0x85, 0x94, 0xc6, 0x04, 0x13, 0xfa, 0xbd, 0xcb, 0x96, -0x03, 0x70, 0xe4, 0xc8, 0x31, 0x1e, 0x7f, 0xe2, 0x69, 0x06, 0x87, 0x12, -0xf8, 0x7c, 0x05, 0x5c, 0xb3, 0xfc, 0x2a, 0x7c, 0xbe, 0x02, 0x7e, 0xf4, -0x62, 0x13, 0xff, 0xf2, 0xbc, 0x99, 0x66, 0x5d, 0xf5, 0x85, 0x9b, 0xcd, -0xc5, 0x0f, 0xe9, 0xf8, 0x80, 0x86, 0x40, 0x17, 0x1a, 0xba, 0x26, 0xd0, -0x35, 0x1d, 0x57, 0x28, 0xcd, 0xc7, 0xe5, 0x8e, 0x96, 0x13, 0x34, 0x10, -0xc7, 0x8c, 0x44, 0x0e, 0x6b, 0xc7, 0x46, 0x2d, 0x32, 0xd2, 0x30, 0x73, -0x99, 0x4c, 0x26, 0x6b, 0x01, 0xc7, 0x9a, 0x2d, 0x45, 0xc0, 0x5f, 0xca, -0xaa, 0xeb, 0x6e, 0x67, 0xdf, 0x81, 0x9f, 0xf0, 0xd6, 0xde, 0xfd, 0xbc, -0x73, 0xf0, 0x7d, 0xaa, 0xab, 0xc3, 0x00, 0xb4, 0x1f, 0x39, 0xe6, 0x0c, -0x72, 0xed, 0x35, 0x6b, 0x99, 0x3d, 0xeb, 0x32, 0xa7, 0x6f, 0xdb, 0x07, -0x84, 0x10, 0x26, 0x78, 0xa1, 0x51, 0x1c, 0x08, 0x10, 0x8b, 0xc7, 0x1d, -0xf3, 0xb2, 0xa4, 0xd5, 0x22, 0x34, 0x25, 0x81, 0xb6, 0x3c, 0xc6, 0x96, -0x09, 0x01, 0x88, 0x5c, 0x2e, 0x63, 0x27, 0x68, 0x52, 0x62, 0xab, 0xda, -0x36, 0xa3, 0x85, 0x97, 0x5e, 0x45, 0x20, 0x10, 0xe2, 0x9d, 0x77, 0x5f, -0x27, 0x36, 0x70, 0xc6, 0x01, 0xee, 0xf3, 0x15, 0x32, 0x77, 0xce, 0xe5, -0x2c, 0x59, 0xb4, 0x92, 0xa2, 0xa2, 0x12, 0xab, 0x5f, 0x13, 0xbd, 0xb0, -0x4c, 0x48, 0x60, 0x9a, 0x91, 0x26, 0xac, 0x45, 0x86, 0x29, 0x37, 0x5a, -0x6e, 0xb3, 0xba, 0xb0, 0x0f, 0x48, 0x69, 0xaa, 0x17, 0x94, 0xe5, 0xc0, -0x39, 0xf0, 0x39, 0x02, 0x39, 0x07, 0x56, 0x4a, 0x51, 0x59, 0x11, 0x66, -0xcd, 0x9f, 0xfc, 0x0d, 0xc9, 0xe1, 0x41, 0x92, 0xc9, 0x01, 0xbc, 0xde, -0x02, 0x4a, 0x43, 0x95, 0x8e, 0x19, 0xda, 0x3b, 0x35, 0xab, 0x57, 0x07, -0xa6, 0x10, 0x20, 0x94, 0x49, 0x20, 0xa7, 0x1d, 0xc5, 0x6d, 0xb7, 0x3d, -0xb2, 0x72, 0xd7, 0xae, 0x8d, 0xfb, 0x71, 0x65, 0x07, 0x91, 0xba, 0xc6, -0x95, 0xf6, 0x8e, 0xf0, 0x13, 0x9c, 0x58, 0xc5, 0x27, 0x33, 0x21, 0x69, -0x48, 0xa4, 0x34, 0x1c, 0xd0, 0xf9, 0x9a, 0x50, 0x4a, 0x72, 0xee, 0x5c, -0x0f, 0xa7, 0xbb, 0x8f, 0x31, 0x3c, 0x3c, 0xe8, 0xd4, 0x2b, 0x2b, 0xad, -0x64, 0xf6, 0xac, 0xcb, 0x98, 0x51, 0x3e, 0xcf, 0xb9, 0xa7, 0xa4, 0x34, -0x17, 0x76, 0x21, 0xd0, 0x04, 0x68, 0x9a, 0xc0, 0x5f, 0x58, 0x48, 0xcc, -0xd5, 0xa7, 0x25, 0x93, 0x66, 0xa5, 0x6e, 0x27, 0x76, 0x33, 0x2c, 0x05, -0xd8, 0xba, 0x75, 0xfd, 0x21, 0x3b, 0xda, 0x8c, 0x8d, 0x65, 0xe8, 0x8d, -0x25, 0xcd, 0x9c, 0x5e, 0xda, 0x97, 0x31, 0xa1, 0xac, 0x94, 0xe4, 0xd4, -0xe9, 0x23, 0xbc, 0xb2, 0xfb, 0x71, 0xf6, 0x1d, 0x68, 0xe2, 0x64, 0xc7, -0x87, 0xf4, 0x45, 0xbb, 0xe8, 0x8b, 0x76, 0x11, 0xed, 0x3f, 0xc5, 0xf1, -0x13, 0xef, 0xb1, 0x77, 0xff, 0x4b, 0xec, 0x3b, 0xf0, 0x12, 0xc3, 0x23, -0x39, 0x1b, 0x17, 0x42, 0x59, 0x24, 0x4c, 0xe3, 0x29, 0xf4, 0x15, 0x38, -0x13, 0x33, 0x85, 0x38, 0x7e, 0x90, 0xef, 0xc4, 0xb6, 0x2c, 0x05, 0xf6, -0xbb, 0x67, 0x78, 0x7c, 0x3c, 0x93, 0x67, 0x46, 0x86, 0x5b, 0x53, 0x80, -0xe2, 0xc3, 0x43, 0x7b, 0x38, 0xd4, 0xbe, 0x0f, 0x80, 0x40, 0x20, 0xc0, -0x4d, 0x37, 0xac, 0xe2, 0xf7, 0xaf, 0xbd, 0x9a, 0xea, 0xea, 0x30, 0x7d, -0x7d, 0x51, 0x4e, 0x76, 0x74, 0xf1, 0xe6, 0x5b, 0xfb, 0x38, 0xdc, 0x7e, -0x94, 0x5f, 0xec, 0xd9, 0xce, 0x1f, 0xaf, 0xbe, 0x83, 0x72, 0xff, 0xa5, -0x08, 0x4c, 0xd3, 0x31, 0x94, 0x49, 0xc4, 0x6d, 0x42, 0x53, 0x1c, 0x3a, -0x38, 0x7e, 0xe0, 0x26, 0xd0, 0x35, 0x59, 0x4d, 0xf7, 0x5a, 0xa0, 0xa4, -0x81, 0x34, 0xa4, 0xf9, 0x2d, 0x6d, 0x07, 0x37, 0x07, 0x3b, 0xd4, 0xbe, -0xd7, 0x01, 0xbf, 0x64, 0xf1, 0x22, 0x36, 0xfd, 0xdd, 0x77, 0x29, 0x29, -0x2e, 0x46, 0x08, 0x81, 0x00, 0x42, 0xa1, 0x12, 0x16, 0x5e, 0x7a, 0x09, -0x37, 0xdd, 0xb8, 0x8a, 0x5f, 0xbc, 0xb1, 0x97, 0x27, 0xb7, 0xfd, 0x80, -0xb7, 0xde, 0x7e, 0x99, 0xf0, 0xd7, 0x36, 0xa0, 0x89, 0x90, 0xe3, 0xc4, -0x00, 0xa3, 0xe9, 0x14, 0xf9, 0xb3, 0xdf, 0xd4, 0xdc, 0xb0, 0x3f, 0x52, -0xd7, 0x78, 0x1e, 0x3e, 0xb7, 0x09, 0xb9, 0x09, 0x84, 0xed, 0x82, 0x94, -0xaa, 0xcd, 0x36, 0x93, 0x74, 0x26, 0x8b, 0xcc, 0x2a, 0x8a, 0x0b, 0x0b, -0x26, 0x98, 0xd0, 0xd9, 0xde, 0x0e, 0x07, 0x7c, 0x75, 0x75, 0x98, 0x27, -0xfe, 0xf1, 0x11, 0x42, 0x25, 0x25, 0xe8, 0xba, 0x8e, 0x47, 0xd7, 0xd1, -0x3d, 0x1e, 0xeb, 0x5b, 0x47, 0xd7, 0x74, 0x6e, 0xbe, 0x69, 0x35, 0x77, -0xdd, 0x59, 0xcf, 0xf0, 0x48, 0x9c, 0x5f, 0x7e, 0xb8, 0x07, 0x5d, 0x13, -0x08, 0xcb, 0x79, 0x0d, 0x29, 0x19, 0x4d, 0xa7, 0x2e, 0x34, 0xfb, 0x9f, -0x8e, 0x80, 0xe9, 0xc8, 0x66, 0x67, 0x67, 0xfa, 0xfb, 0x31, 0x0c, 0x89, -0x2e, 0xb4, 0x09, 0xf6, 0x7f, 0xf8, 0xc8, 0x3e, 0xa7, 0xe1, 0xe6, 0x87, -0xbf, 0x8b, 0xa6, 0x69, 0xe8, 0x9a, 0x86, 0x6e, 0x81, 0xf6, 0xe8, 0xba, -0x59, 0xd6, 0x75, 0x74, 0x5d, 0x43, 0xd7, 0x74, 0xbe, 0x76, 0xcb, 0x57, -0xa8, 0xac, 0x98, 0x41, 0xfb, 0xc7, 0xbf, 0x22, 0x33, 0x96, 0x46, 0x58, -0xa1, 0x53, 0x2a, 0x75, 0x31, 0xe0, 0x1d, 0x7c, 0x0e, 0x81, 0xa6, 0xe6, -0x86, 0x53, 0x93, 0x55, 0x50, 0x4a, 0x76, 0xe5, 0x8e, 0x3e, 0x0c, 0x27, -0x0a, 0xd9, 0xeb, 0x42, 0x6c, 0xe0, 0x0c, 0x7d, 0x51, 0x93, 0xfb, 0x0d, -0xd7, 0xd7, 0x52, 0x35, 0xb3, 0x12, 0xa1, 0x09, 0x33, 0x23, 0x1d, 0x4d, -0xd1, 0xb0, 0xf1, 0x51, 0xbe, 0x54, 0xfb, 0x87, 0x7c, 0x79, 0xd5, 0x1f, -0xf1, 0xfd, 0x7f, 0x7e, 0x01, 0x4d, 0xd3, 0xcc, 0xe7, 0x42, 0xb0, 0x62, -0xc5, 0x72, 0xd2, 0x63, 0x29, 0x3a, 0xba, 0x4f, 0x58, 0xe1, 0x13, 0x2b, -0x18, 0x7c, 0xe2, 0xc4, 0x9f, 0x4f, 0xc0, 0x92, 0xd6, 0xfc, 0x0a, 0x52, -0xaa, 0x2e, 0x3b, 0x34, 0xa6, 0xd3, 0x29, 0x06, 0x12, 0x23, 0xe8, 0x42, -0x38, 0x26, 0x64, 0x83, 0x07, 0xd3, 0xf6, 0x6d, 0x87, 0x14, 0x9a, 0xc6, -0x33, 0x3f, 0x78, 0x9e, 0x03, 0xff, 0xf5, 0xdf, 0xce, 0xf3, 0x97, 0x5f, -0x79, 0x95, 0x9d, 0x3f, 0xfe, 0x89, 0xe9, 0x17, 0x42, 0x50, 0x55, 0x51, -0x01, 0x40, 0x4f, 0xff, 0x6f, 0x10, 0x02, 0xc7, 0x84, 0x52, 0xe9, 0x51, -0x37, 0xa6, 0x0b, 0x6e, 0xea, 0xf3, 0x09, 0xd8, 0xa1, 0xb4, 0xd6, 0xbe, -0xa1, 0x94, 0x6a, 0xb3, 0x77, 0x64, 0xd9, 0x6c, 0x96, 0x74, 0x66, 0x8c, -0xe2, 0x82, 0x02, 0x27, 0x6c, 0x0e, 0x8f, 0xe4, 0xfa, 0xaf, 0xac, 0xac, -0xb0, 0xfd, 0x1d, 0x01, 0xfc, 0xec, 0x3f, 0xdf, 0x38, 0x6f, 0xc0, 0xb6, -0x43, 0xed, 0x4e, 0x39, 0x10, 0x34, 0x37, 0x2f, 0x42, 0x68, 0x96, 0x01, -0x59, 0x04, 0x32, 0x19, 0xa7, 0x4e, 0x4b, 0xcb, 0xa6, 0x43, 0x90, 0x0b, -0xed, 0x17, 0x4b, 0xc0, 0x69, 0x90, 0x33, 0x21, 0x49, 0x2a, 0x35, 0x42, -0xdf, 0x60, 0x02, 0x69, 0x48, 0x8a, 0xbc, 0x66, 0x7a, 0x1d, 0x8f, 0xf7, -0xe6, 0x5a, 0x9b, 0x19, 0x1a, 0xca, 0x24, 0xce, 0xc2, 0x85, 0x97, 0x9c, -0x37, 0x60, 0x30, 0x18, 0xb0, 0xea, 0x28, 0x4e, 0x76, 0x74, 0x02, 0xa0, -0x5b, 0x1a, 0x31, 0xa4, 0x24, 0x3d, 0x36, 0x36, 0x19, 0x4e, 0xc8, 0x6d, -0x6e, 0x2e, 0x8e, 0x80, 0xdd, 0xe0, 0xf9, 0xe7, 0xef, 0x39, 0x64, 0x3b, -0x55, 0x26, 0x93, 0x66, 0x38, 0x95, 0xc6, 0xc8, 0x4a, 0x0a, 0x3c, 0x5e, -0xa4, 0x34, 0x28, 0x9f, 0x3e, 0xd7, 0x69, 0x70, 0xb8, 0xfd, 0xa8, 0xe9, -0x84, 0x96, 0xc6, 0xfe, 0x6c, 0x5d, 0xe4, 0x3c, 0xf0, 0xf5, 0xdf, 0xba, -0xdd, 0x49, 0xc5, 0xdf, 0x39, 0xf8, 0x3e, 0x00, 0xc5, 0xfe, 0x20, 0x00, -0x86, 0x94, 0xc4, 0x92, 0x09, 0x77, 0x93, 0xae, 0x29, 0xc8, 0x38, 0xf7, -0x27, 0x10, 0xb0, 0x36, 0x0e, 0xb6, 0x4d, 0xd4, 0xda, 0xf7, 0xa5, 0x94, -0x6d, 0x52, 0x4a, 0xb2, 0xd9, 0x2c, 0x67, 0x62, 0x31, 0x0c, 0x4b, 0x03, -0x4a, 0x29, 0xfc, 0x45, 0x25, 0x4e, 0xfb, 0x37, 0xf7, 0xb4, 0xa2, 0x64, -0x6e, 0xa5, 0xbe, 0x76, 0xc5, 0xd5, 0xfc, 0xe8, 0x85, 0xef, 0xb3, 0xbe, -0x3e, 0xc2, 0xfa, 0x75, 0x11, 0xb6, 0x3f, 0xf7, 0x34, 0xe1, 0x05, 0xf3, -0x91, 0x52, 0xf1, 0xe3, 0x97, 0xfe, 0x8d, 0x68, 0xb4, 0x1f, 0x80, 0x6b, -0x2e, 0xbf, 0xda, 0x5c, 0xed, 0xb3, 0x59, 0xfa, 0xe3, 0x83, 0xbf, 0x3d, -0x01, 0x4b, 0xec, 0x33, 0x21, 0x87, 0x80, 0x52, 0xaa, 0xcd, 0xd6, 0xc2, -0xc0, 0x50, 0x9c, 0xf1, 0xb1, 0x2c, 0xd3, 0xfc, 0x7e, 0x7c, 0x9a, 0xce, -0xfc, 0x59, 0x0b, 0x9d, 0x86, 0xd1, 0x68, 0x3f, 0x8f, 0x3f, 0xf9, 0x0c, -0x86, 0x94, 0x18, 0x86, 0x81, 0x61, 0x18, 0x84, 0xc3, 0xf3, 0xb8, 0x23, -0xf2, 0x0d, 0xbe, 0x15, 0xf9, 0x06, 0xe5, 0xe5, 0xe5, 0x48, 0x43, 0xf2, -0xf3, 0x37, 0xf6, 0xd0, 0xd4, 0xdc, 0x02, 0xc0, 0x95, 0x0b, 0x16, 0x51, -0x35, 0xad, 0x92, 0xac, 0x94, 0x64, 0xb2, 0xe3, 0xc4, 0xa7, 0xd6, 0xc0, -0x84, 0x34, 0xda, 0x96, 0xc9, 0x92, 0xb9, 0x56, 0xa0, 0x3e, 0x8f, 0x80, -0x7d, 0x8f, 0x74, 0x3a, 0x45, 0xdf, 0x50, 0x82, 0xb2, 0x22, 0x3f, 0xc1, -0x02, 0x1f, 0xa2, 0xb0, 0x80, 0x65, 0x8b, 0xae, 0xe3, 0x83, 0xa3, 0x07, -0x00, 0xd8, 0xb3, 0x77, 0x3f, 0x23, 0x23, 0xa3, 0xdc, 0x7d, 0xd7, 0x7a, -0x66, 0xce, 0xac, 0x42, 0x48, 0xe1, 0x64, 0xc7, 0x67, 0x7b, 0xfb, 0x78, -0xf6, 0xb9, 0xed, 0x8e, 0xe9, 0x04, 0x0a, 0x03, 0x7c, 0xfb, 0x2b, 0x77, -0x9a, 0xe6, 0x39, 0x3e, 0x4e, 0x6a, 0x6c, 0x9c, 0xd8, 0xd4, 0x1a, 0x70, -0x3b, 0xb1, 0x13, 0x39, 0xce, 0x23, 0xd0, 0xd4, 0xdc, 0xf0, 0x62, 0xa4, -0xae, 0x71, 0x1b, 0x50, 0x6a, 0xa7, 0xad, 0x4a, 0xc9, 0x56, 0xfb, 0x79, -0x32, 0x99, 0x60, 0x60, 0x38, 0xc1, 0x82, 0xf2, 0x6a, 0x4a, 0x8b, 0xfc, -0x78, 0x75, 0x9d, 0xda, 0x65, 0xab, 0xe9, 0x3e, 0x7b, 0x82, 0xe8, 0xc0, -0x59, 0x00, 0x0e, 0xbe, 0xfb, 0x3e, 0x07, 0xdf, 0x7d, 0x9f, 0xc5, 0x57, -0x5e, 0xc1, 0x92, 0x25, 0x8b, 0xe8, 0xeb, 0xeb, 0xa7, 0xa3, 0xa3, 0x8b, -0x8e, 0xce, 0x1c, 0x9e, 0x40, 0x61, 0x80, 0x27, 0xee, 0x7e, 0x8c, 0x79, -0x15, 0xf3, 0x18, 0x4a, 0x8d, 0x32, 0x32, 0x96, 0xa1, 0xab, 0xef, 0x2c, -0x59, 0xc3, 0x70, 0xc3, 0x69, 0x75, 0x95, 0xdd, 0x1a, 0x70, 0x7c, 0x75, -0xaa, 0x4d, 0xbd, 0x6d, 0x46, 0x6b, 0x01, 0x76, 0xee, 0x7c, 0xe0, 0x94, -0x94, 0xaa, 0x4b, 0x4a, 0x45, 0xd6, 0x30, 0xf8, 0xb8, 0xa7, 0x9b, 0xac, -0x21, 0x99, 0x53, 0x36, 0x8d, 0xe9, 0xc1, 0x20, 0xf3, 0xcb, 0x2b, 0xb9, -0xef, 0xb6, 0x07, 0xb9, 0x74, 0xce, 0x65, 0x13, 0x3a, 0x69, 0x3f, 0x72, -0x8c, 0xa6, 0xe6, 0x97, 0x79, 0x6b, 0x4f, 0xeb, 0x04, 0xf0, 0xd5, 0x33, -0x17, 0xf0, 0xc4, 0xdd, 0x8f, 0x11, 0xae, 0x0a, 0x93, 0x1a, 0x1f, 0x23, -0x91, 0x4a, 0x91, 0x18, 0x1d, 0xa5, 0x3b, 0xda, 0x4b, 0x9e, 0xb8, 0x83, -0x8a, 0x9b, 0x80, 0xa3, 0x81, 0xa9, 0x08, 0x6c, 0x76, 0x13, 0x00, 0x50, -0x4a, 0xbd, 0x6a, 0xfb, 0xc1, 0xb9, 0xc1, 0x73, 0x9c, 0x1d, 0x1c, 0x20, -0xe4, 0x2f, 0xc2, 0xab, 0xe9, 0x14, 0x79, 0x7d, 0x54, 0x86, 0xca, 0xd8, -0xb8, 0xee, 0x61, 0xee, 0xfa, 0xea, 0x5d, 0xcc, 0xaf, 0x9a, 0x3f, 0x69, -0xa7, 0x2b, 0xae, 0xb8, 0x9a, 0xfb, 0xfe, 0xf4, 0x1e, 0x9e, 0xb9, 0xe7, -0x49, 0x66, 0xcf, 0x98, 0x43, 0x22, 0x35, 0x4a, 0x6c, 0x78, 0x98, 0x73, -0xc3, 0x49, 0x8e, 0xf7, 0xfc, 0x86, 0x9e, 0x68, 0x9f, 0xbb, 0x7a, 0x57, -0x4b, 0xcb, 0xa6, 0x21, 0x70, 0x42, 0x7a, 0xd8, 0x7e, 0xe0, 0x3e, 0xa5, -0x98, 0x74, 0x43, 0xd3, 0xd4, 0xdc, 0x70, 0x2a, 0x52, 0xd7, 0xb8, 0x19, -0xd8, 0x1c, 0xa9, 0x6b, 0x5c, 0xd7, 0xd4, 0xdc, 0xf0, 0xa2, 0x52, 0x72, -0x27, 0xe6, 0xa9, 0x31, 0xf1, 0x44, 0x92, 0xb7, 0xff, 0xe7, 0x08, 0xab, -0x97, 0xd4, 0x90, 0x19, 0x1f, 0x47, 0xd7, 0x34, 0x84, 0x10, 0x78, 0x85, -0xe0, 0xba, 0xa5, 0xd7, 0xb1, 0xea, 0x0b, 0xb5, 0xa4, 0x33, 0x29, 0x4e, -0xf7, 0x9d, 0x46, 0x58, 0x49, 0xfe, 0x95, 0xe1, 0x45, 0x28, 0xcc, 0xf0, -0x9a, 0x48, 0xa5, 0x48, 0x8f, 0x8f, 0x91, 0x4c, 0xa7, 0x19, 0x1c, 0x1d, -0xe1, 0xc3, 0x93, 0x1f, 0xf3, 0x51, 0xe7, 0xc9, 0x7c, 0x18, 0xee, 0x97, -0x1c, 0xee, 0xa3, 0x94, 0x56, 0x77, 0xa5, 0x29, 0x77, 0x64, 0x4d, 0xcd, -0x0d, 0x5b, 0xac, 0xf4, 0xb5, 0x1e, 0x78, 0xf1, 0xa5, 0x97, 0xbe, 0x77, -0x28, 0x12, 0x79, 0xac, 0x55, 0x29, 0x6a, 0x41, 0x71, 0xe2, 0x74, 0x27, -0xbd, 0xb1, 0x28, 0xe1, 0xaa, 0xd9, 0x84, 0x2b, 0x67, 0x32, 0xbd, 0xb8, -0x98, 0x02, 0x8f, 0x17, 0xaf, 0x47, 0xc7, 0xa3, 0xe9, 0xe8, 0x9a, 0xc6, -0x9c, 0xca, 0xb0, 0x99, 0x65, 0x02, 0x03, 0x23, 0x49, 0xb2, 0x86, 0x64, -0xdc, 0xc8, 0x92, 0x1e, 0x1f, 0x27, 0x91, 0x1a, 0xe5, 0xd7, 0x67, 0x7a, -0x38, 0x7e, 0xaa, 0x8b, 0xc4, 0x48, 0x72, 0x32, 0x08, 0x6e, 0xa0, 0xee, -0x13, 0xb9, 0x09, 0x27, 0xd4, 0x17, 0x7c, 0x4b, 0x09, 0x10, 0xa9, 0x6b, -0x0c, 0x59, 0x84, 0x86, 0x6e, 0xbf, 0xfd, 0xd1, 0x95, 0xf9, 0x33, 0x60, -0xb7, 0xf7, 0x7a, 0x3c, 0x84, 0x82, 0xc5, 0x94, 0x15, 0x97, 0x50, 0xe0, -0xf5, 0xa1, 0x09, 0x41, 0x45, 0xd9, 0x34, 0xa7, 0x5e, 0xdf, 0x60, 0x0c, -0x29, 0x15, 0xc3, 0xa9, 0x11, 0x06, 0x12, 0x49, 0x86, 0x86, 0x27, 0x84, -0xcb, 0x7c, 0xe9, 0x6a, 0x69, 0xd9, 0xb4, 0xc0, 0x1a, 0xbf, 0x14, 0x70, -0x87, 0xa6, 0x5a, 0xf7, 0x1b, 0xd2, 0x4f, 0x24, 0x90, 0x2f, 0xb7, 0xdd, -0xf6, 0xc8, 0x0e, 0xac, 0x90, 0x9a, 0xdf, 0xf6, 0x73, 0x7c, 0x69, 0xbe, -0xb6, 0xa5, 0x65, 0xd3, 0x6b, 0x00, 0x91, 0xba, 0xc6, 0xdd, 0xe4, 0x34, -0xd0, 0xd5, 0xd4, 0xdc, 0xb0, 0xc0, 0x5d, 0xf1, 0x13, 0x0f, 0x77, 0xf3, -0x65, 0xd7, 0xae, 0x8d, 0xeb, 0xa5, 0x94, 0x9b, 0xa5, 0x94, 0x5d, 0xee, -0x93, 0xb9, 0xcf, 0x09, 0x7c, 0x1c, 0xa8, 0x77, 0x81, 0xdf, 0xc1, 0x44, -0xf3, 0xd9, 0x90, 0xdf, 0xe0, 0x53, 0x6b, 0xc0, 0x2d, 0xb7, 0xde, 0xba, -0x65, 0x0d, 0xb9, 0xb7, 0xf7, 0x93, 0xae, 0x94, 0x17, 0x29, 0x71, 0x4c, -0xa7, 0xdd, 0xdc, 0xd2, 0xb2, 0xe9, 0x94, 0x75, 0x80, 0xbb, 0x83, 0x89, -0xe7, 0x54, 0xdb, 0x9a, 0x9a, 0x1b, 0xbe, 0x93, 0xdf, 0xf0, 0x33, 0x11, -0x70, 0xcb, 0xad, 0xb7, 0x6e, 0x09, 0x91, 0x3b, 0xbb, 0x2c, 0x75, 0x0d, -0x6e, 0xff, 0x76, 0x83, 0xb5, 0x1d, 0xb1, 0xd5, 0x2a, 0xb7, 0xb6, 0xb4, -0x6c, 0x1a, 0xb2, 0xec, 0x7d, 0x03, 0xe6, 0x7b, 0x80, 0x52, 0x57, 0xfd, -0x0d, 0xee, 0x77, 0x76, 0xff, 0x27, 0x04, 0x3e, 0x8b, 0x5c, 0x00, 0xf8, -0xab, 0x98, 0xff, 0x0e, 0x38, 0x35, 0x55, 0xdb, 0xdf, 0x39, 0x01, 0xeb, -0xe5, 0xba, 0xfd, 0x97, 0x86, 0x2e, 0xeb, 0x6a, 0x9d, 0xec, 0x4f, 0x24, -0x93, 0xc9, 0xef, 0x9c, 0xc0, 0x67, 0x95, 0xff, 0x05, 0x96, 0xea, 0xa2, -0x83, 0x62, 0xef, 0x6d, 0x06, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm deleted file mode 100644 index 3d84871078..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm +++ /dev/null @@ -1,303 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_dsp_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 249 2", -" c #3C3937", -". c #3F3C3A", -"X c #413E3C", -"o c #44413F", -"O c #464341", -"+ c #4A4745", -"@ c #4B4846", -"# c #4D4C4A", -"$ c #524F4E", -"% c #545252", -"& c #595655", -"* c #5A5857", -"= c #575959", -"- c #5D5C5B", -"; c #7D4945", -": c #7D504E", -"> c #615F5E", -", c #7C5856", -"< c #745D5B", -"1 c #7B5D5A", -"2 c #62605F", -"3 c #6F605D", -"4 c #7F605E", -"5 c #5F6363", -"6 c #656564", -"7 c #686665", -"8 c #6A6867", -"9 c #6C6B6A", -"0 c #746564", -"q c #796462", -"w c #736D6B", -"e c #7B6B6A", -"r c #67706F", -"t c #73706F", -"y c #6E7575", -"u c #747372", -"i c #7A7574", -"p c #757877", -"a c #7A7877", -"s c #777D7C", -"d c #7C7C7C", -"f c #9D1B14", -"g c #9B1E18", -"h c #A3170F", -"j c #A41A12", -"k c #AC1911", -"l c #A11F18", -"z c #B41B13", -"x c #BB1E15", -"c c #95241D", -"v c #9C221B", -"b c #BC2017", -"n c #B5251E", -"m c #BC231B", -"M c #9C2620", -"N c #952A24", -"B c #992A24", -"V c #962D28", -"C c #9D2F29", -"Z c #96322C", -"A c #9C332D", -"S c #943732", -"D c #9A3630", -"F c #933A35", -"G c #9E3934", -"H c #953F3A", -"J c #9B3F39", -"K c #A62D26", -"L c #AC2B23", -"P c #A22F29", -"I c #B42B24", -"U c #A6352E", -"Y c #AA332D", -"T c #B1312B", -"R c #A93630", -"E c #A23C35", -"W c #AA3B35", -"Q c #A43E38", -"! c #C11F17", -"~ c #C12017", -"^ c #C12119", -"/ c #8B413D", -"( c #9A413C", -") c #A3423D", -"_ c #A9413B", -"` c #884440", -"' c #834A46", -"] c #844F4C", -"[ c #9A4741", -"{ c #964A46", -"} c #9B4944", -"| c #9B4E49", -" . c #8C504C", -".. c #93524F", -"X. c #9A514D", -"o. c #825654", -"O. c #8D5653", -"+. c #965551", -"@. c #9D5753", -"#. c #9F5955", -"$. c #975E5A", -"%. c #995F5C", -"&. c #A44742", -"*. c #A34944", -"=. c #A34E49", -"-. c #AC4E48", -";. c #B14F4A", -":. c #A2524D", -">. c #A9524D", -",. c #A55954", -"<. c #A95F5B", -"1. c #93625F", -"2. c #9C615E", -"3. c #A9625E", -"4. c #B6625D", -"5. c #806562", -"6. c #826866", -"7. c #896966", -"8. c #866D6C", -"9. c #8C6B69", -"0. c #9C6562", -"q. c #9F6F6C", -"w. c #84716F", -"e. c #8C706E", -"r. c #9D716E", -"t. c #857270", -"y. c #8D7775", -"u. c #817F7E", -"i. c #897C7B", -"p. c #937B79", -"a. c #A36461", -"s. c #AB6662", -"d. c #A06966", -"f. c #AA6964", -"g. c #A76E6B", -"h. c #B06B66", -"j. c #B26D69", -"k. c #A6716E", -"l. c #AC716E", -"z. c #A17572", -"x. c #AC7672", -"c. c #AC7A76", -"v. c #AA7E7B", -"b. c #B17773", -"n. c #BC7C79", -"m. c #C1716C", -"M. c #7C807F", -"N. c #82807F", -"B. c #A5807D", -"V. c #AB817F", -"C. c #B3807C", -"Z. c #7D8382", -"A. c #848483", -"S. c #888685", -"D. c #848887", -"F. c #8A8887", -"G. c #868B8A", -"H. c #8D8B8A", -"J. c #9B8583", -"K. c #908F8E", -"L. c #91908F", -"P. c #98908F", -"I. c #8D9494", -"U. c #959493", -"Y. c #989695", -"T. c #949897", -"R. c #999897", -"E. c #959B9A", -"W. c #9C9C9B", -"Q. c #A28482", -"!. c #AB8583", -"~. c #AB8987", -"^. c #A78B89", -"/. c #B58784", -"(. c #B98682", -"). c #B28986", -"_. c #B38F8D", -"`. c #BA8F8C", -"'. c #A9918F", -"]. c #B2918E", -"[. c #A79694", -"{. c #AC9594", -"}. c #AB9896", -"|. c #A19F9E", -" X c #AA9C9B", -".X c #B39592", -"XX c #BA9491", -"oX c #B89A97", -"OX c #B49D9B", -"+X c #BA9B99", -"@X c #A1A09F", -"#X c #B5A19F", -"$X c #BBA09E", -"%X c #9DA3A3", -"&X c #A5A4A3", -"*X c #ABA6A5", -"=X c #A5A8A7", -"-X c #A9A8A7", -";X c #A5ABAA", -":X c #ACABAB", -">X c #BEA5A3", -",X c #B1AEAD", -"XkXkX0XA.dXvXkXH.", -"nXG x I i D.H.U.R.@X&X:X3X6X0XdXhXkXvXnXNX|.U.:X8X0X3X:XH.y ..b m k k.zXdXpXE `.cXkXdXN.0XkXhXF.", -"lXA x Y d H.U.R.W.&X-X:X3X6X0XdXfXkXxXnXMXK.F.:X3X3X,X&XA.9 4 m m z X.jXdXgX*.b.kXfXpXd 3XhXpXu.", -"kXC x U A.U.Y.W.&X&X-X:X3X3X6X0XdXfXhXkXMXH.u U.&X-X|.F.u 6 0 I m x J dXdXgX,.s.gXdX0Xd ,XdX3XA.", -"kXA x U D.R.W.|.&X-X-X:X1X3X3X6X0XfXvXMXSXR.6 u N.A.d w 7 > 6 Y m b A 0XdXgX<.,.sX0X3Xa :XdXR.R.", -"lXA x U F.&X@X&X&X-X-X:X:X3X6XdXkXvXMXZXAX6X- 7 8 9 8 6 2 * - Q m m A 4XdXgXs.:.9X6X-Xi 1X0Xu.GX", -"bXJ x Y S.=X&X-X-X-X:X,X3X0XdXkXvXvXnXnXMXAXu & > 2 > - & $ = ) b m C 3XdXgXf.=.5X3XW.a 3X&Xa GX", -"MX| x I i.:X:X:X:X:X:X3X6X0XdXhXkXkXkXvXZXFXdX$ % & & % $ + % ) b m A 4XdXdX3.:.2X1XS.N.3Xd |.GX", -"AXg.k m 8.;X&XW.W.&X-X,X3X0X0XdXdXfXhXMXZXAXFX1X# o + + O # Q m b A 0XdXsX,.#.:X-Xu L.Y.u GXGX", -"SX.Xj m O.D.F.K.R.&X-X:X3X8X0X0XiX0XkXMXMXZXZXSXfXi # X . @ 6 R m x ( sX0XsX&.0.;XY.9 Y.9 GXGXGX", -"GXuXv ~ J s S.K.Y.|.&X:X,X3X3X6X8XdXvXvXnXMXMXZXZXZXkX6X3XkXP.L m z @.dX0X0XE r.=Xd i u K.GXGXGX", -"GXvX[ x L t S.H.Y.W.&X-X:X3X3X3X6XhXkXvXvXnXnXMXMXnXnXnXnXcXe.n m k z.gX0X.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXhX6X6X0XsXsX0X9X9X0XsX0X8X3X3X7X:Xx.4.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXGXGXdX8X3X3X8X8X8X3X3X3X5X3X:X~.j.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXkXdX3X3X3X3X3X,X{.XXn.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c b/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c deleted file mode 100644 index 1ba72127ab..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c +++ /dev/null @@ -1,291 +0,0 @@ -static const unsigned char toolbar_plugin_gfx_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x35, -0x2f, 0x30, 0x34, 0xc1, 0xe2, 0xc4, 0xb0, 0x00, 0x00, 0x0c, 0xd7, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x7b, 0x70, 0x1d, 0xd7, 0x5d, -0xc7, 0x3f, 0xe7, 0xec, 0xbd, 0x7b, 0xaf, 0x74, 0xaf, 0xa4, 0x6b, 0x59, -0x96, 0xec, 0xc4, 0x0f, 0xc5, 0x8e, 0x49, 0x5a, 0x3b, 0xb1, 0xf2, 0x98, -0x42, 0xc0, 0xc5, 0x8a, 0x69, 0x71, 0xa0, 0xc4, 0x0e, 0x30, 0xc3, 0xa4, -0x9d, 0x0e, 0x86, 0x36, 0x81, 0x32, 0xb4, 0x83, 0x0b, 0x03, 0xc3, 0xc0, -0x80, 0x31, 0x1d, 0x9e, 0xd3, 0x69, 0x5d, 0x86, 0x76, 0x32, 0xcc, 0xa4, -0xb8, 0x33, 0xa4, 0x11, 0x7f, 0xd0, 0xa4, 0xa1, 0x21, 0x93, 0x26, 0xae, -0x95, 0x07, 0x4d, 0x6c, 0x9c, 0xc6, 0x76, 0x1c, 0x27, 0x76, 0x6d, 0x49, -0x96, 0x65, 0x57, 0x2f, 0x4b, 0xf7, 0xa1, 0x7b, 0x75, 0x1f, 0xbb, 0xe7, -0xc7, 0x1f, 0xfb, 0xd0, 0xde, 0x87, 0x12, 0x3b, 0x0d, 0xd3, 0xe1, 0x37, -0x3a, 0xda, 0x3d, 0xab, 0xdd, 0xb3, 0xdf, 0xef, 0xef, 0x75, 0x7e, 0xe7, -0xac, 0x94, 0x88, 0xf0, 0xff, 0x59, 0xf4, 0x4f, 0x1a, 0xc0, 0x8f, 0x2b, -0xb1, 0xff, 0x8b, 0x41, 0x3f, 0xfa, 0xdb, 0xff, 0xd0, 0x8f, 0xd0, 0xef, -0xf5, 0x24, 0xf8, 0x81, 0xc0, 0xda, 0x22, 0xd1, 0xfe, 0xd8, 0xe1, 0x7f, -0xfb, 0xf3, 0xb1, 0xf7, 0xfa, 0x2e, 0xf5, 0x5e, 0x5d, 0x68, 0xd7, 0x43, -0x5f, 0xec, 0x47, 0x18, 0x10, 0x18, 0x00, 0x06, 0x40, 0x32, 0x08, 0x3b, -0x9a, 0x40, 0x2f, 0xa1, 0xf7, 0xf1, 0x2e, 0xd3, 0x17, 0xc9, 0x0a, 0x9c, -0x44, 0xe4, 0x04, 0x30, 0x86, 0xc8, 0x93, 0xdf, 0x7b, 0xfc, 0x2f, 0xdf, -0x95, 0xd8, 0x35, 0x13, 0xd8, 0xf5, 0xf0, 0x97, 0xfa, 0x81, 0x41, 0x90, -0x07, 0x80, 0x1d, 0x40, 0x86, 0xba, 0x47, 0x5b, 0x83, 0x6e, 0xd2, 0x7e, -0x00, 0xbc, 0xce, 0x1a, 0x21, 0x89, 0x46, 0x4b, 0x8d, 0x89, 0xc8, 0xb7, -0x81, 0x83, 0x47, 0x86, 0xf6, 0xb7, 0x24, 0xf3, 0xae, 0x04, 0xee, 0xfb, -0x9d, 0x2f, 0x0d, 0x82, 0xda, 0x07, 0xec, 0x09, 0x81, 0x46, 0x61, 0x0b, -0x2c, 0xc6, 0x6c, 0x16, 0x63, 0x36, 0x65, 0xcb, 0x3b, 0x82, 0xe0, 0xa6, -0x3a, 0x58, 0xd4, 0x31, 0x0f, 0x94, 0x18, 0x30, 0x42, 0xdc, 0x8e, 0x23, -0x8e, 0x8b, 0x53, 0xad, 0xb0, 0x02, 0x97, 0xb8, 0x18, 0x28, 0x97, 0xb0, -0x0b, 0x59, 0x92, 0xae, 0x43, 0xd2, 0xa9, 0x79, 0xf7, 0xab, 0xa5, 0xd7, -0x88, 0x08, 0x88, 0x01, 0xe1, 0x1b, 0xc0, 0xbe, 0x23, 0x43, 0xfb, 0xb3, -0xd7, 0x44, 0xe0, 0xbe, 0xdf, 0xfd, 0xf2, 0x00, 0xf0, 0x65, 0x60, 0x10, -0x54, 0x78, 0xdd, 0xd1, 0x9a, 0xb9, 0x64, 0x07, 0x73, 0xc9, 0x4e, 0x16, -0xda, 0xd2, 0x14, 0x12, 0x29, 0xaa, 0x68, 0xd6, 0xa4, 0x6d, 0xfa, 0xda, -0xe2, 0xf4, 0xb6, 0xdb, 0xf4, 0xb4, 0xc5, 0x71, 0x8d, 0xa1, 0x3b, 0x19, -0x27, 0x93, 0x88, 0xe3, 0xb8, 0x86, 0x9a, 0x2b, 0x38, 0xc6, 0xe0, 0xb8, -0xc6, 0xef, 0xbb, 0x5c, 0xce, 0x2e, 0x50, 0xaa, 0x54, 0x29, 0x55, 0x6b, -0xcc, 0xe4, 0x17, 0xa8, 0x54, 0xab, 0xa4, 0x4d, 0x8d, 0x54, 0x21, 0x47, -0xe7, 0xc2, 0x3c, 0x49, 0x71, 0x3d, 0x42, 0x46, 0xc0, 0x75, 0x41, 0x64, -0x0c, 0xe1, 0x8e, 0x28, 0x89, 0x96, 0x41, 0xfc, 0x4b, 0x9f, 0x39, 0x38, -0xa0, 0x94, 0x3a, 0x02, 0x64, 0x02, 0xf0, 0x97, 0x53, 0xdd, 0x4c, 0xb5, -0xaf, 0x60, 0x3a, 0xb5, 0x82, 0x4c, 0x9b, 0xcd, 0xcf, 0xad, 0xed, 0xe2, -0x9e, 0x1b, 0x3b, 0xb8, 0x39, 0xd3, 0xc6, 0xa6, 0x4c, 0x1b, 0xb6, 0x56, -0x54, 0x5c, 0xa8, 0x38, 0x86, 0x8a, 0x2b, 0x94, 0x1d, 0xa1, 0xea, 0x1a, -0x26, 0xf2, 0x65, 0x7e, 0x54, 0x28, 0x23, 0x18, 0x04, 0x85, 0x31, 0x0a, -0xad, 0x15, 0xda, 0x68, 0xd6, 0x74, 0xa6, 0x71, 0x5c, 0x17, 0x4b, 0x69, -0x32, 0x1b, 0xd7, 0x51, 0x73, 0x0c, 0x0b, 0xd5, 0x2a, 0x57, 0x72, 0x79, -0x26, 0xf3, 0x39, 0xe2, 0xd5, 0x0a, 0xa9, 0xcb, 0x23, 0x24, 0x2a, 0x55, -0x70, 0x14, 0xd4, 0x9c, 0x7e, 0x44, 0xfe, 0x00, 0x38, 0xf0, 0x8e, 0x04, -0xd0, 0x6a, 0x3f, 0x4a, 0x65, 0xd0, 0x9a, 0xbc, 0xdd, 0xc6, 0xc9, 0x95, -0x1b, 0x58, 0x8c, 0xb7, 0xf1, 0xab, 0xb7, 0xac, 0xe2, 0x23, 0xeb, 0xbb, -0xd9, 0xb9, 0xbe, 0x0b, 0x01, 0x6a, 0x06, 0x1c, 0x03, 0x6f, 0xce, 0x95, -0x19, 0xcf, 0x57, 0x39, 0x3b, 0x5f, 0xe2, 0xf5, 0xc9, 0x05, 0xc4, 0xb8, -0xbc, 0x31, 0x5d, 0x00, 0x71, 0xc1, 0x18, 0x30, 0xfe, 0xf1, 0x1a, 0xfa, -0xab, 0x3b, 0xd3, 0xa4, 0xdb, 0x12, 0x74, 0xa5, 0xda, 0x59, 0xd9, 0xd7, -0xcb, 0x42, 0xdf, 0x2a, 0xca, 0xe7, 0xdf, 0x22, 0x31, 0x37, 0x87, 0x32, -0x02, 0xe2, 0xec, 0x8b, 0x12, 0x68, 0x72, 0xa1, 0xfb, 0xfe, 0xf0, 0x91, -0x15, 0xba, 0xe6, 0xcc, 0x89, 0x65, 0x31, 0x9d, 0xee, 0xe2, 0x74, 0xcf, -0x7a, 0x36, 0x76, 0xa7, 0xf9, 0xb3, 0xbb, 0x6f, 0x62, 0x55, 0xbb, 0x8d, -0x06, 0x0c, 0x70, 0x78, 0x22, 0xc7, 0x2b, 0x93, 0x05, 0x4e, 0xcd, 0x96, -0x28, 0x56, 0x8d, 0x67, 0x6a, 0xd7, 0x20, 0x01, 0x18, 0x63, 0x3c, 0xdf, -0x0d, 0xc1, 0x2d, 0x73, 0x6e, 0xdc, 0xb0, 0xff, 0xb7, 0xfa, 0x3b, 0xec, -0x4d, 0xbf, 0x49, 0xb5, 0x54, 0xe5, 0xb1, 0xea, 0x36, 0xfe, 0x7e, 0xdd, -0x27, 0x68, 0xb3, 0xe3, 0xac, 0x8d, 0xb7, 0xd3, 0x3b, 0x72, 0x96, 0xf2, -0xcc, 0x55, 0x54, 0xa9, 0x02, 0x22, 0x77, 0x1c, 0x19, 0xda, 0x7f, 0xa2, -0xa5, 0x05, 0x74, 0xcd, 0xdd, 0x23, 0x31, 0x0b, 0x49, 0xc4, 0xb9, 0xd4, -0xd3, 0xc7, 0x1d, 0x6b, 0x57, 0xf0, 0xa9, 0x5b, 0xd7, 0x53, 0x16, 0xf8, -0x61, 0xbe, 0xc6, 0x8b, 0x33, 0x39, 0x86, 0xa7, 0xb2, 0x2c, 0x56, 0x5d, -0x0f, 0x4b, 0x4c, 0x88, 0x6b, 0x41, 0x5c, 0x41, 0x1c, 0xff, 0x68, 0x40, -0x1c, 0x01, 0x63, 0x10, 0x25, 0x80, 0xf1, 0x02, 0x39, 0x68, 0xc6, 0xf8, -0x6a, 0x10, 0x94, 0x12, 0xd0, 0x70, 0xa0, 0xf2, 0x14, 0xfb, 0x3e, 0x30, -0x43, 0xf2, 0xc3, 0x7b, 0x11, 0x6d, 0xf3, 0xfb, 0x87, 0xff, 0x0b, 0x33, -0x3a, 0xc4, 0x57, 0xb6, 0x3d, 0xc4, 0x48, 0xb1, 0x48, 0x2c, 0xa6, 0x49, -0xc5, 0x62, 0xa0, 0xab, 0xe0, 0xca, 0x1e, 0xa0, 0x35, 0x01, 0xd1, 0xea, -0x5e, 0x62, 0x16, 0x65, 0x11, 0x4a, 0xed, 0x09, 0xb6, 0xac, 0xca, 0xf0, -0xa3, 0x8a, 0xcb, 0xac, 0xe3, 0xf0, 0xf4, 0xec, 0x2c, 0xf9, 0x9a, 0x8b, -0x49, 0x2a, 0xe2, 0x31, 0x0b, 0x71, 0x05, 0x63, 0x0c, 0xe2, 0xe2, 0x01, -0x77, 0x41, 0x5c, 0xe5, 0x13, 0x50, 0x88, 0xab, 0x11, 0x03, 0xf8, 0xe4, -0x30, 0x0a, 0x31, 0x0a, 0x44, 0xa1, 0xc4, 0xf2, 0x08, 0x68, 0x0b, 0xa5, -0x84, 0x5f, 0x9f, 0x7d, 0x95, 0xc4, 0x8e, 0x3f, 0xc2, 0x9d, 0x9f, 0xa1, -0xf8, 0xbd, 0xa7, 0x28, 0x5d, 0x99, 0xe3, 0x97, 0x27, 0x2b, 0x7c, 0x6d, -0xfb, 0xe7, 0x10, 0x23, 0x14, 0x3a, 0x3a, 0x49, 0xcd, 0xe7, 0x40, 0x6b, -0x70, 0xcd, 0x60, 0xe0, 0x46, 0xcd, 0x16, 0x10, 0x76, 0x1b, 0xad, 0x99, -0x75, 0x05, 0xad, 0x84, 0xa3, 0xf3, 0x59, 0x72, 0x06, 0x4e, 0x95, 0x17, -0x28, 0x8a, 0x8b, 0xb6, 0x04, 0xa5, 0x41, 0x34, 0x20, 0x0a, 0x31, 0x1a, -0x31, 0x3e, 0x78, 0xc7, 0x07, 0xef, 0xf7, 0x31, 0xca, 0x27, 0xa4, 0xc0, -0xd5, 0x88, 0x58, 0x60, 0x0c, 0xca, 0xcf, 0x91, 0x4a, 0x83, 0x52, 0xa0, -0x2c, 0xa8, 0x9d, 0xa9, 0x21, 0x02, 0x73, 0xff, 0xf1, 0x18, 0x4e, 0xa1, -0x48, 0x39, 0x5b, 0xa6, 0x56, 0xb6, 0x50, 0x71, 0x0b, 0xa5, 0x15, 0x39, -0x51, 0xac, 0x56, 0x61, 0x36, 0x1c, 0x68, 0x19, 0xc4, 0x1f, 0xfb, 0xec, -0x57, 0x07, 0xb0, 0x74, 0x06, 0xd7, 0x50, 0x34, 0x16, 0x66, 0xb1, 0xc2, -0xa5, 0xd9, 0x39, 0x2e, 0x17, 0xf2, 0xa4, 0x6a, 0x15, 0x8c, 0x9d, 0xc0, -0xd5, 0x16, 0x61, 0x5a, 0x55, 0x0a, 0x14, 0x28, 0xa5, 0x3d, 0x57, 0x88, -0x03, 0x68, 0x3f, 0xf7, 0x2b, 0x30, 0x1a, 0x31, 0xde, 0x1c, 0x20, 0x81, -0xef, 0x07, 0x8f, 0x29, 0x9f, 0x80, 0xd6, 0xa8, 0x98, 0xe2, 0xdb, 0x6b, -0x06, 0xe9, 0x7b, 0xe2, 0x09, 0x4a, 0xe3, 0x57, 0x71, 0x1d, 0x97, 0xea, -0x42, 0x95, 0x67, 0x3e, 0xf0, 0x6b, 0x98, 0x72, 0x0d, 0xb7, 0x5c, 0xa3, -0x54, 0x75, 0x90, 0xaa, 0x83, 0xf6, 0x26, 0xbb, 0xcc, 0xbd, 0x0f, 0x1e, -0xc8, 0x1c, 0x19, 0xda, 0x9f, 0xad, 0xb7, 0x80, 0x62, 0x07, 0x02, 0x6e, -0x71, 0x91, 0xb6, 0x8a, 0xc3, 0xe6, 0x33, 0x79, 0xda, 0x94, 0x40, 0xdc, -0x42, 0xb4, 0xf6, 0x6f, 0xf1, 0xb4, 0x57, 0x6c, 0x4f, 0x53, 0xb1, 0x6d, -0xca, 0x6d, 0xed, 0x54, 0x92, 0x6d, 0x94, 0x52, 0x69, 0x94, 0x56, 0x28, -0x4b, 0xa3, 0x2c, 0xe5, 0x9f, 0x2b, 0x88, 0x29, 0x14, 0xca, 0x23, 0x16, -0x68, 0x3c, 0x20, 0xae, 0x75, 0x68, 0x85, 0x47, 0x76, 0xee, 0x43, 0x9e, -0x3f, 0xc8, 0x2f, 0xe6, 0x14, 0xc6, 0xd5, 0x3c, 0x7b, 0xeb, 0x03, 0x3c, -0x72, 0xcf, 0xef, 0x51, 0x9b, 0x2b, 0x60, 0xe6, 0x8b, 0xac, 0x9e, 0x9c, -0xc2, 0xcd, 0x17, 0xd1, 0x56, 0x58, 0x7f, 0x6e, 0x03, 0x5e, 0x68, 0x70, -0x21, 0x35, 0xa0, 0x94, 0x60, 0x4a, 0x8b, 0xac, 0xc8, 0xe6, 0x21, 0x1e, -0x43, 0x2c, 0xcd, 0xe6, 0x2d, 0x37, 0x31, 0x31, 0x3e, 0xc5, 0x62, 0xa9, -0xec, 0xfb, 0x99, 0x22, 0xa5, 0xf2, 0xa4, 0x2c, 0xed, 0xf9, 0xa4, 0xa5, -0x21, 0x66, 0xb1, 0x90, 0x4a, 0x53, 0x4c, 0x77, 0x50, 0x4a, 0xa7, 0x29, -0xa6, 0xda, 0xd1, 0xbe, 0x76, 0x95, 0xf6, 0x49, 0x59, 0x1a, 0xb4, 0x02, -0x4b, 0xa3, 0x14, 0x60, 0x5c, 0x44, 0x29, 0xc4, 0x2f, 0x21, 0xbe, 0x76, -0xcf, 0x67, 0xf8, 0xe7, 0xbb, 0x1f, 0xc6, 0xd4, 0x5c, 0x4c, 0xa5, 0x46, -0x7c, 0x62, 0x9a, 0xbe, 0xe9, 0x59, 0xba, 0xa7, 0x67, 0x51, 0xc5, 0x32, -0x52, 0x73, 0x20, 0x95, 0xf4, 0x18, 0xfb, 0xd9, 0xb3, 0xd1, 0x02, 0x83, -0x88, 0xc2, 0x8a, 0xc7, 0xf8, 0xfc, 0x5f, 0x7c, 0x8a, 0xbb, 0xee, 0xdc, -0x44, 0x0a, 0x21, 0x2e, 0xa0, 0xc4, 0x9b, 0xd6, 0x45, 0x84, 0x33, 0xa3, -0x53, 0xe4, 0x0b, 0x8b, 0x9c, 0x7c, 0x73, 0x8c, 0xd1, 0xf1, 0x49, 0x2e, -0x4f, 0x4c, 0x31, 0x3f, 0x97, 0x27, 0x9d, 0x2b, 0x92, 0x8e, 0xcf, 0x42, -0x2c, 0x06, 0x96, 0x66, 0x21, 0x9d, 0xa6, 0x9c, 0x4c, 0xb2, 0xd0, 0xde, -0x86, 0x93, 0xb0, 0x29, 0xdb, 0x89, 0x25, 0x0b, 0x29, 0x15, 0xba, 0xa2, -0x57, 0x2e, 0x08, 0xba, 0xe6, 0x90, 0x58, 0x2c, 0xd3, 0x56, 0x58, 0xa0, -0x7b, 0x7e, 0x1e, 0xbb, 0x58, 0x82, 0x72, 0x0d, 0x55, 0xad, 0x61, 0x5b, -0x36, 0xc6, 0x56, 0xd1, 0x4a, 0x66, 0xb0, 0xc9, 0x02, 0x0a, 0xfa, 0x51, -0xd0, 0xd9, 0xb3, 0x92, 0x2d, 0xdb, 0x6e, 0x66, 0x95, 0x18, 0xda, 0x83, -0xf7, 0xf8, 0xa4, 0x45, 0xe0, 0xa7, 0x37, 0xf6, 0x62, 0x44, 0xd8, 0x79, -0xdb, 0x3a, 0xc4, 0x08, 0x65, 0x03, 0x63, 0x93, 0x39, 0x4e, 0x8f, 0x4c, -0xf1, 0xc6, 0xdb, 0x17, 0x19, 0x1f, 0x9f, 0xe2, 0xd2, 0xe8, 0xb8, 0x47, -0x28, 0x66, 0xd1, 0x13, 0xd3, 0x60, 0x59, 0x60, 0x69, 0xdc, 0x58, 0x8c, -0x45, 0xdb, 0xf6, 0x2c, 0x01, 0x60, 0x04, 0x8c, 0xd0, 0x56, 0x2e, 0x63, -0xd5, 0x6a, 0xe0, 0xb8, 0x50, 0x73, 0x51, 0x35, 0x07, 0x5c, 0x97, 0x1b, -0xfa, 0x56, 0xf2, 0xf3, 0x1f, 0xbe, 0x93, 0xe4, 0x96, 0x9d, 0x3c, 0xfe, -0xc5, 0x2f, 0x44, 0x8a, 0xc2, 0x86, 0x20, 0xfe, 0xd8, 0xe7, 0xbe, 0xba, -0x03, 0xa5, 0x50, 0x02, 0xab, 0xd7, 0x74, 0x63, 0x0c, 0xb4, 0x5b, 0x9e, -0xbf, 0x56, 0x50, 0xe4, 0x5d, 0x61, 0xc1, 0xd5, 0xb8, 0x46, 0x70, 0xfd, -0xfa, 0xca, 0x16, 0x83, 0x12, 0x21, 0xa5, 0x5c, 0x36, 0xf5, 0x75, 0xb2, -0xb9, 0x2f, 0xcd, 0x9e, 0x9f, 0xd9, 0x88, 0x18, 0x61, 0xbe, 0xa6, 0x79, -0xe5, 0xcc, 0x04, 0x17, 0x2e, 0x4e, 0x73, 0x71, 0x62, 0x86, 0xf9, 0x6c, -0x8e, 0x2b, 0xe3, 0xe3, 0x58, 0x5a, 0x93, 0x56, 0xa5, 0x06, 0x02, 0x06, -0x5c, 0x83, 0x72, 0x0d, 0x76, 0x3c, 0xc6, 0xa6, 0x8d, 0xeb, 0xd8, 0xba, -0xa9, 0x8f, 0xdb, 0x37, 0xf7, 0xb1, 0xee, 0xc6, 0x1e, 0xb2, 0x4e, 0x92, -0x93, 0x25, 0x9a, 0x64, 0xa4, 0xc1, 0x85, 0xfa, 0x11, 0x40, 0x09, 0x37, -0xdd, 0x74, 0x03, 0x49, 0xdf, 0x5d, 0x00, 0x2e, 0xe4, 0xab, 0x9c, 0xbf, -0x7c, 0x95, 0x2b, 0x57, 0x66, 0xb9, 0x7c, 0xe5, 0x2a, 0xd9, 0xf9, 0x02, -0x22, 0xc2, 0x27, 0xf7, 0xee, 0xc1, 0x35, 0xe0, 0x9a, 0x18, 0xae, 0x81, -0x18, 0x42, 0x12, 0x97, 0x0e, 0xed, 0xd0, 0xae, 0x5d, 0x76, 0xdd, 0xd6, -0x87, 0x6c, 0xed, 0xf5, 0xd2, 0xaa, 0x08, 0xb9, 0x9a, 0x45, 0xd5, 0x85, -0x37, 0xdf, 0x1e, 0xa7, 0x58, 0xb3, 0x30, 0x22, 0xb4, 0x5b, 0x0e, 0x16, -0x82, 0xad, 0x5c, 0x6e, 0xbf, 0xa5, 0x2f, 0x74, 0x53, 0x63, 0x4c, 0x08, -0xac, 0x68, 0x6c, 0x94, 0x82, 0x74, 0x57, 0x86, 0x85, 0xec, 0x7c, 0x70, -0x79, 0xa0, 0x3e, 0x06, 0x44, 0xfa, 0x51, 0x20, 0x28, 0x12, 0x09, 0x9b, -0x38, 0xde, 0x40, 0x87, 0x8f, 0x9d, 0xe3, 0x9f, 0x86, 0x86, 0xeb, 0xa9, -0x0b, 0x24, 0x93, 0x76, 0x60, 0x7d, 0x44, 0x20, 0x97, 0xcd, 0xf3, 0xcc, -0x53, 0x87, 0xd9, 0xbe, 0x73, 0x3b, 0xdd, 0xab, 0x56, 0xe1, 0xfa, 0x55, -0x42, 0x87, 0xe5, 0xd0, 0x69, 0xd5, 0x48, 0x69, 0x87, 0x94, 0xe5, 0x90, -0x8e, 0xd7, 0xd8, 0xbe, 0xb5, 0x0f, 0xe3, 0x03, 0x15, 0xbf, 0xda, 0x34, -0xa1, 0xc2, 0x04, 0x47, 0x14, 0x73, 0x4e, 0x3b, 0x39, 0xb7, 0x8d, 0xab, -0x4e, 0x3b, 0x55, 0x62, 0x68, 0x1d, 0x21, 0xe0, 0x29, 0x36, 0x53, 0x47, -0xc0, 0x57, 0x3e, 0x20, 0xf4, 0xae, 0xee, 0xc1, 0x12, 0xc1, 0x18, 0x21, -0xdd, 0x95, 0xf6, 0xca, 0x59, 0x55, 0x4f, 0x60, 0x71, 0xb1, 0xcc, 0xfc, -0x7c, 0x81, 0x8e, 0xce, 0x0e, 0x8c, 0xc0, 0x33, 0x4f, 0x1d, 0x66, 0xe2, -0xe2, 0x04, 0x4f, 0x7c, 0xf3, 0x09, 0xee, 0xfe, 0xd9, 0x0f, 0xb1, 0xe5, -0xce, 0x01, 0x0c, 0x30, 0x5f, 0x8b, 0x31, 0x5b, 0x8e, 0xf9, 0x96, 0xf2, -0x5a, 0x4a, 0x3b, 0x58, 0x18, 0x04, 0xe8, 0x8e, 0x57, 0xbc, 0x09, 0xac, -0x66, 0xa3, 0x80, 0xb2, 0xb1, 0xa8, 0x48, 0x6c, 0x69, 0xae, 0x50, 0xfe, -0xc2, 0x3d, 0x48, 0xbf, 0x0d, 0x12, 0xb5, 0xc0, 0xa0, 0x28, 0x8f, 0x84, -0x31, 0x90, 0x10, 0x83, 0x11, 0xc3, 0xfa, 0x0d, 0x37, 0x34, 0x05, 0x4e, -0xb0, 0xda, 0xca, 0xce, 0xe7, 0x49, 0xa5, 0x3b, 0x38, 0x7e, 0xf4, 0x24, -0x13, 0x17, 0x27, 0x40, 0xa0, 0x52, 0x2e, 0xf3, 0xf2, 0xe1, 0x17, 0x18, -0x39, 0x77, 0x81, 0x5f, 0xd8, 0xfd, 0x2b, 0x58, 0xf1, 0x44, 0xb0, 0xd8, -0x0a, 0x5b, 0xae, 0x16, 0x0b, 0x87, 0x9c, 0xab, 0xda, 0xe1, 0xb0, 0x4a, -0x79, 0xa1, 0x11, 0x1c, 0xb5, 0x5e, 0x22, 0xe1, 0xfd, 0x5d, 0x35, 0x2c, -0xa7, 0xa2, 0xbb, 0x12, 0xc1, 0x92, 0xce, 0x18, 0x86, 0x9f, 0x3f, 0xca, -0x42, 0xa9, 0xec, 0x65, 0x18, 0x17, 0xfa, 0x56, 0xaf, 0xf4, 0xfc, 0x38, -0x68, 0xbe, 0xb9, 0x9f, 0x7e, 0xf2, 0x79, 0x5e, 0x7e, 0xe1, 0x28, 0xc3, -0xcf, 0xbe, 0xe8, 0xcf, 0xbe, 0xbe, 0x1b, 0x08, 0x5c, 0x19, 0xbf, 0xc4, -0xd0, 0xbf, 0x7c, 0x9d, 0x42, 0x2e, 0x1f, 0xba, 0x59, 0xb4, 0x35, 0x4a, -0x98, 0xec, 0x7c, 0xe0, 0x3a, 0x32, 0xc5, 0x04, 0xad, 0x85, 0x01, 0x96, -0x08, 0x88, 0x0f, 0x5e, 0x44, 0x18, 0x1b, 0x99, 0xe0, 0x8f, 0xff, 0xee, -0x31, 0x5e, 0x3d, 0x35, 0xca, 0xf8, 0x4c, 0x81, 0x45, 0xaf, 0x84, 0x6d, -0x6a, 0xb9, 0xf9, 0x1c, 0xdf, 0x7f, 0xe1, 0xe8, 0x12, 0x70, 0x24, 0x5c, -0xe3, 0x8a, 0x08, 0xdd, 0xab, 0x7a, 0x48, 0xa5, 0x3b, 0xf1, 0x57, 0x94, -0xcb, 0x82, 0x0f, 0x18, 0x04, 0x9a, 0xb7, 0x94, 0x3f, 0x37, 0x7a, 0xf3, -0x23, 0x31, 0x2f, 0x03, 0x53, 0x58, 0xf2, 0xff, 0x50, 0x22, 0x59, 0xa8, -0x7e, 0xf4, 0x85, 0x52, 0x85, 0x7f, 0x3c, 0xf4, 0xdd, 0x88, 0x7e, 0x1a, -0x45, 0x1a, 0x4e, 0x83, 0x05, 0xb9, 0xf7, 0xcb, 0xb6, 0x13, 0xec, 0xbc, -0x7f, 0x77, 0x5d, 0xa0, 0x07, 0xe7, 0x4d, 0xd8, 0x1b, 0xdc, 0x46, 0x5b, -0x1e, 0xf8, 0x60, 0xa2, 0x57, 0x78, 0xcf, 0xe5, 0xe6, 0xe6, 0xa2, 0x8f, -0x0d, 0xd7, 0x13, 0x88, 0xa4, 0xcd, 0xe5, 0x20, 0xb7, 0x22, 0x20, 0xf5, -0xbf, 0xc2, 0xf3, 0xed, 0xbb, 0x76, 0x11, 0xb3, 0x13, 0xb8, 0xe6, 0x1a, -0xc0, 0xb3, 0x04, 0x3e, 0xaa, 0xf9, 0x80, 0x00, 0x80, 0x32, 0xb4, 0x34, -0xdf, 0x52, 0x16, 0x0a, 0xed, 0xeb, 0x6d, 0x09, 0xbc, 0xf3, 0x5e, 0x45, -0xab, 0xa0, 0xf6, 0x4e, 0x82, 0xbd, 0x1e, 0x63, 0x24, 0x5c, 0x98, 0x4d, -0x5e, 0xba, 0x44, 0x21, 0x97, 0x63, 0xfd, 0x2d, 0x5b, 0x5b, 0x82, 0x57, -0x81, 0xbf, 0xfb, 0xee, 0x12, 0x8b, 0xf9, 0x16, 0xb0, 0x7c, 0xbf, 0x17, -0x28, 0x16, 0x8a, 0x2d, 0x91, 0xd4, 0x59, 0x20, 0x24, 0x42, 0xa3, 0x05, -0x84, 0xa6, 0x3c, 0x1a, 0xed, 0x45, 0x08, 0x04, 0x7f, 0xfa, 0xef, 0x67, -0x9f, 0xa1, 0xbd, 0xa3, 0x8b, 0xf9, 0x99, 0xa9, 0xd0, 0x2a, 0x6b, 0xfa, -0x37, 0x13, 0x4f, 0x24, 0xbc, 0x91, 0x1a, 0xdc, 0x26, 0xf4, 0xf7, 0x18, -0xc4, 0x7d, 0x22, 0x81, 0xfb, 0x88, 0x40, 0xa9, 0xb8, 0xd0, 0x88, 0xbd, -0x7e, 0x45, 0x26, 0x22, 0xc3, 0xc0, 0xe0, 0xd2, 0x7e, 0x4c, 0x13, 0x0b, -0x00, 0x6e, 0xbd, 0x7d, 0x0b, 0xfd, 0x3f, 0xb5, 0x09, 0xdb, 0x4e, 0x32, -0x7a, 0xee, 0x3c, 0x67, 0x4f, 0x9d, 0xa6, 0x5a, 0xa9, 0xd4, 0x11, 0x10, -0xbc, 0x74, 0x5a, 0x59, 0x2c, 0x87, 0x83, 0x09, 0x90, 0x9b, 0x9d, 0x66, -0xd5, 0xda, 0x75, 0x4b, 0xd9, 0x46, 0xd5, 0x6b, 0x3e, 0x1e, 0x03, 0x3b, -0xe6, 0x13, 0xd1, 0x9e, 0x65, 0xc0, 0x9b, 0x3b, 0xae, 0x4e, 0xcd, 0x34, -0x42, 0xc9, 0xd6, 0x11, 0x08, 0x10, 0x87, 0x16, 0x88, 0x6c, 0x2e, 0x01, -0x24, 0x92, 0x09, 0x76, 0x7f, 0xfc, 0x37, 0x58, 0xd9, 0xd7, 0x1b, 0x06, -0x65, 0xef, 0x8d, 0x6b, 0xd9, 0xf4, 0xc1, 0x0f, 0xf2, 0xf4, 0xe3, 0xff, -0xee, 0x93, 0x90, 0x3a, 0x77, 0x6a, 0xdc, 0xa9, 0xcb, 0x5e, 0x9d, 0xa2, -0x6f, 0xdd, 0xba, 0x66, 0xf0, 0xda, 0x03, 0x1f, 0x36, 0xab, 0x3e, 0x78, -0x05, 0x98, 0xbe, 0x32, 0xd9, 0xd2, 0x02, 0xd1, 0x34, 0x3a, 0x2c, 0x91, -0x14, 0x19, 0xcd, 0xf7, 0x22, 0xc2, 0xd6, 0xbb, 0xee, 0x60, 0x45, 0x6f, -0xaf, 0xb7, 0x90, 0x97, 0xa5, 0x1a, 0x6c, 0x45, 0x4f, 0x2f, 0x1f, 0x1a, -0xbc, 0xb7, 0x2e, 0xbd, 0x46, 0x9f, 0x8b, 0x5e, 0xcf, 0xce, 0x4c, 0xd5, -0xf9, 0x79, 0xa0, 0x71, 0x3b, 0xee, 0xb5, 0x44, 0xdc, 0xb7, 0x40, 0x2c, -0x12, 0xc4, 0xfe, 0x04, 0x31, 0xfa, 0xd6, 0xd9, 0x3a, 0xed, 0x3f, 0x3a, -0xb4, 0x3f, 0x57, 0x47, 0x00, 0x91, 0x13, 0x2c, 0xf3, 0x62, 0x44, 0xd8, -0x72, 0xd7, 0xdd, 0x1e, 0xf0, 0xc0, 0x58, 0xbe, 0x81, 0x8c, 0xc0, 0xa6, -0x2d, 0x5b, 0x5b, 0x80, 0xf6, 0xee, 0xf0, 0xae, 0x79, 0xb1, 0x55, 0xca, -0x67, 0x89, 0x5b, 0xf5, 0xc0, 0x13, 0x91, 0x66, 0xfb, 0xa4, 0x42, 0xff, -0xf7, 0x5d, 0x78, 0xa1, 0xb0, 0xc8, 0xdc, 0xcc, 0x6c, 0x93, 0xf6, 0xeb, -0x08, 0x7c, 0xf7, 0xeb, 0x7f, 0x92, 0x13, 0x9f, 0x44, 0x48, 0x24, 0x62, -0x85, 0x78, 0x22, 0x11, 0xe2, 0x0a, 0x48, 0x08, 0x2c, 0x4d, 0xa1, 0x61, -0x16, 0x6b, 0x6d, 0x01, 0x3b, 0xe9, 0x05, 0x6f, 0x14, 0x74, 0x72, 0x19, -0xf0, 0x96, 0x5f, 0xff, 0x04, 0x0a, 0x3a, 0xf1, 0xea, 0xeb, 0x8d, 0xee, -0xf3, 0x64, 0x70, 0x52, 0xbf, 0x22, 0xf3, 0x02, 0x79, 0x40, 0x44, 0x9a, -0xe2, 0x77, 0x76, 0x72, 0x8a, 0x95, 0xab, 0xfb, 0xfc, 0x82, 0x6f, 0x89, -0xbd, 0x01, 0xaa, 0x95, 0x72, 0x64, 0x26, 0xae, 0x1b, 0x90, 0xc1, 0xfb, -0xef, 0xe7, 0x86, 0xfe, 0xf5, 0x74, 0x65, 0xba, 0xea, 0x4b, 0x03, 0x2b, -0x5c, 0x89, 0x86, 0x29, 0x33, 0xcc, 0x3a, 0xd4, 0xbb, 0xe9, 0xe9, 0xe3, -0x4d, 0x04, 0x86, 0x9b, 0x2c, 0xe0, 0xe1, 0x97, 0x43, 0x12, 0xb5, 0x40, -0x60, 0x05, 0x23, 0xbc, 0xf6, 0xd2, 0x4b, 0x21, 0xbe, 0x20, 0x0d, 0x82, -0x67, 0xe6, 0x33, 0xc7, 0xff, 0x67, 0xd9, 0x18, 0xd8, 0x72, 0xe7, 0x6d, -0xac, 0x5c, 0xd9, 0xb5, 0xe4, 0xe3, 0x41, 0xf3, 0xdd, 0x28, 0x6e, 0xd5, -0x83, 0x07, 0x90, 0xa0, 0x72, 0x75, 0xe1, 0xd8, 0xcb, 0x3f, 0x68, 0x74, -0x9f, 0xb1, 0x47, 0x87, 0xf6, 0x9f, 0x6c, 0x49, 0xe0, 0xf9, 0x6f, 0xfc, -0x69, 0xf0, 0x81, 0xa1, 0x29, 0x0e, 0x2e, 0x9e, 0x3b, 0xc7, 0x2b, 0xcf, -0x3d, 0x17, 0x6a, 0xd8, 0x5f, 0x9b, 0x73, 0xe6, 0xf8, 0x31, 0x5e, 0x7b, -0xf1, 0xa5, 0x65, 0x03, 0xf7, 0xf4, 0xd1, 0x63, 0x21, 0xe0, 0x68, 0x96, -0x89, 0x45, 0x81, 0xab, 0x40, 0x81, 0x1e, 0x70, 0xc7, 0x80, 0xe3, 0xc0, -0xcc, 0x74, 0x8e, 0xe7, 0xbe, 0xf5, 0x9f, 0x8d, 0xda, 0x0f, 0xdd, 0x67, -0x23, 0xad, 0x76, 0xe6, 0x44, 0x0e, 0x02, 0x87, 0x82, 0xdc, 0x1d, 0xf1, -0x06, 0xde, 0x38, 0x7a, 0x8c, 0xb1, 0xb7, 0xcf, 0xd2, 0xb3, 0xba, 0x0f, -0xbb, 0x2d, 0xc9, 0x95, 0xb1, 0x8b, 0x14, 0xb2, 0xb9, 0xfa, 0x9b, 0xa2, -0x15, 0x05, 0x70, 0xe4, 0x3b, 0xcf, 0x72, 0xe1, 0xad, 0xb7, 0xd9, 0xfd, -0xe0, 0x6e, 0x56, 0xf4, 0x64, 0xea, 0xca, 0xe5, 0x30, 0x53, 0xfb, 0xae, -0x12, 0x25, 0x30, 0x7a, 0xfe, 0x32, 0xdf, 0xfa, 0xd7, 0x6f, 0x36, 0xc2, -0x03, 0x38, 0x18, 0xed, 0x34, 0x6d, 0xee, 0x8e, 0x00, 0x0f, 0x7f, 0xf2, -0x6f, 0x5e, 0x67, 0x99, 0x58, 0x68, 0xe0, 0xd4, 0x7c, 0xa5, 0xf1, 0xa2, -0x3f, 0xfe, 0x86, 0x9b, 0xfb, 0xd9, 0xfb, 0xd9, 0xdf, 0xac, 0xaf, 0xef, -0x23, 0x63, 0x18, 0x81, 0x4a, 0xc5, 0x61, 0xe4, 0x87, 0xe3, 0xfc, 0xe0, -0xfb, 0xc7, 0x39, 0x7f, 0xfa, 0xad, 0x96, 0xe0, 0x1f, 0x1d, 0xda, 0xff, -0xf9, 0xa0, 0xd3, 0xd2, 0x02, 0xde, 0x3b, 0xe5, 0xb7, 0x80, 0x61, 0x05, -0x99, 0xeb, 0xfa, 0x86, 0x16, 0xb9, 0x57, 0x22, 0xd7, 0x92, 0x6d, 0x49, -0x3e, 0xfa, 0xc0, 0x2e, 0xaf, 0x98, 0x93, 0x7a, 0xe0, 0x73, 0x57, 0xf3, -0x4c, 0x5c, 0xbc, 0xcc, 0xe8, 0xd9, 0x0b, 0x9c, 0x3a, 0xfa, 0xda, 0x3b, -0x8d, 0x3e, 0x06, 0xfc, 0x55, 0x14, 0x3c, 0x2c, 0x63, 0x01, 0x80, 0x87, -0x3e, 0xf1, 0x85, 0x6d, 0x78, 0xd1, 0x9e, 0x59, 0xae, 0x88, 0x6f, 0xba, -0xba, 0xcc, 0x7d, 0x1f, 0xd9, 0x73, 0x1f, 0xeb, 0x37, 0x7b, 0xaf, 0x9c, -0x9d, 0x9c, 0x61, 0x71, 0xb1, 0xcc, 0xd8, 0xd9, 0x0b, 0x4c, 0x8c, 0x8e, -0xb1, 0x58, 0x6c, 0xb1, 0xdd, 0xd0, 0x2c, 0x59, 0x60, 0x30, 0x1a, 0xbc, -0xcb, 0x12, 0xa8, 0x23, 0xf1, 0xf1, 0xbf, 0xde, 0x00, 0x1c, 0xc2, 0xdb, -0x44, 0xe2, 0xba, 0xac, 0xf1, 0xfe, 0xc9, 0x21, 0x60, 0x5f, 0x30, 0xf3, -0xc2, 0x12, 0x78, 0x78, 0x87, 0x6f, 0x64, 0x23, 0x91, 0xf3, 0x4f, 0x3f, -0x78, 0x60, 0x2f, 0x9e, 0xf9, 0xfa, 0xdf, 0x77, 0x78, 0xad, 0xe5, 0x04, -0x1e, 0xf0, 0x43, 0x51, 0xe0, 0x50, 0x0f, 0x1e, 0xde, 0xe5, 0x2b, 0xe5, -0x48, 0x43, 0xdf, 0x27, 0xb2, 0x8f, 0xc8, 0xf6, 0xf6, 0xfb, 0x28, 0x27, -0xf0, 0x52, 0xe4, 0xa1, 0x47, 0x87, 0xf6, 0x5f, 0x6c, 0x75, 0x43, 0x23, -0x78, 0xb8, 0xc6, 0xef, 0xc4, 0x2d, 0x88, 0x6c, 0xc3, 0x73, 0xab, 0x07, -0xf0, 0xc8, 0x64, 0xae, 0x07, 0x29, 0x9e, 0x4f, 0x9f, 0xf0, 0xdb, 0x30, -0x30, 0xdc, 0xa8, 0xe9, 0x40, 0x5a, 0x81, 0x8e, 0xca, 0x75, 0x7f, 0xa9, -0x6f, 0x24, 0x03, 0xf0, 0xe9, 0x07, 0x0f, 0x6c, 0xc0, 0x73, 0xaf, 0xa0, -0xb5, 0x92, 0x61, 0xff, 0x78, 0x62, 0x39, 0xb0, 0x81, 0xbc, 0x1b, 0xe8, -0xa8, 0xbc, 0xe7, 0x7f, 0x35, 0x08, 0xa4, 0x15, 0xa1, 0xeb, 0x95, 0xeb, -0x01, 0xdc, 0x28, 0x3f, 0x36, 0x81, 0x9f, 0xb4, 0xfc, 0x2f, 0x83, 0x5f, -0xe1, 0x0b, 0x7d, 0x74, 0xae, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm deleted file mode 100644 index aa147a96a6..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm +++ /dev/null @@ -1,310 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_gfx_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 256 2", -" c #0C4F95", -". c #164C91", -"X c #1A4F91", -"o c #0E5096", -"O c #0E5298", -"+ c #135296", -"@ c #1A5395", -"# c #17589B", -"$ c #15488E", -"% c #3E6292", -"& c #145EA1", -"* c #1D5EA0", -"= c #0963A7", -"- c #0663A8", -"; c #0B65A9", -": c #0E6BAD", -"> c #0661A7", -", c #1462A4", -"< c #116BAD", -"1 c #1D6BAC", -"2 c #1566A9", -"3 c #1E70AE", -"4 c #056BB0", -"5 c #156FB0", -"6 c #0D74B4", -"7 c #0374B9", -"8 c #0A77B8", -"9 c #0A7BBB", -"0 c #0B78B7", -"q c #1372B2", -"w c #1D74B3", -"e c #157BBB", -"r c #1B7BBA", -"t c #226EAD", -"y c #2868A6", -"u c #366EA8", -"i c #396FA8", -"p c #3A6AA4", -"a c #2371AF", -"s c #3D70A9", -"d c #3572AC", -"f c #2374B3", -"g c #2579B6", -"h c #247CBB", -"j c #2B7DBA", -"k c #2976B3", -"l c #327AB5", -"z c #3D7CB3", -"x c #317EBB", -"c c #4D6B93", -"v c #446796", -"b c #567598", -"n c #4174AB", -"m c #497AAF", -"M c #4A79AE", -"N c #447DB2", -"B c #4A7EB2", -"V c #547EB0", -"C c #007DC5", -"Z c #0B80BF", -"A c #0F8CBF", -"S c #1888BA", -"D c #2C87AF", -"F c #3A87A9", -"G c #3886AA", -"H c #2488B3", -"J c #2780BE", -"K c #2B82BE", -"L c #3381BC", -"P c #3B83BD", -"I c #3D81B7", -"U c #56859E", -"Y c #708D9E", -"T c #7E959F", -"R c #4685A4", -"E c #4481B5", -"W c #4D82B5", -"Q c #4385BA", -"! c #4C85B9", -"~ c #4D8ABD", -"^ c #448ABD", -"/ c #5084B7", -"( c #5186B9", -") c #538BBD", -"_ c #5C88B7", -"` c #5485A1", -"' c #618FBC", -"] c #6D92BB", -"[ c #789BBB", -"{ c #7394A6", -"} c #0383C4", -"| c #0A82C1", -" . c #0B8DC3", -".. c #0086CA", -"X. c #018CCD", -"o. c #078CC8", -"O. c #1C85C3", -"+. c #1387C5", -"@. c #0190CE", -"#. c #1E93CF", -"$. c #1291CF", -"%. c #008FD1", -"&. c #0194D2", -"*. c #0897D4", -"=. c #0C99D6", -"-. c #0299D8", -";. c #0E9AD9", -":. c #0598D4", -">. c #1499D6", -",. c #1C9AD6", -"<. c #129AD8", -"1. c #1E9AD4", -"2. c #2485C3", -"3. c #2C86C2", -"4. c #2589C7", -"5. c #2C8BC5", -"6. c #2B8CC9", -"7. c #3386C2", -"8. c #3A86C1", -"9. c #3C8AC4", -"0. c #328EC9", -"q. c #378DC8", -"w. c #2993CE", -"e. c #3392CC", -"r. c #3B93CC", -"t. c #3393C7", -"y. c #229DD5", -"u. c #2B9DD5", -"i. c #239CD8", -"p. c #2A9FD9", -"a. c #3C99D3", -"s. c #2BA2DA", -"d. c #2CA6DA", -"f. c #34A3D7", -"g. c #34A4DA", -"h. c #3CA5DD", -"j. c #34AADC", -"k. c #3BADDE", -"l. c #428BC4", -"z. c #4D8EC3", -"x. c #538EC1", -"c. c #588FC1", -"v. c #4292CA", -"b. c #469ACE", -"n. c #5491C3", -"m. c #5B94C3", -"M. c #5F9BCB", -"N. c #499DD4", -"B. c #6999C2", -"V. c #6299C8", -"C. c #6995C0", -"Z. c #769DC3", -"A. c #53A4CF", -"S. c #41A7DF", -"D. c #44ACDE", -"F. c #4BAFDF", -"G. c #4AA4DA", -"H. c #58A8D8", -"J. c #59B0DF", -"K. c #63AED8", -"L. c #6AB1D4", -"P. c #78B7D6", -"I. c #6FA3CA", -"U. c #46AAE0", -"Y. c #4CADE2", -"T. c #52AFE3", -"R. c #4EB0E0", -"E. c #54B1E3", -"W. c #5CB5E4", -"Q. c #5EB6E8", -"!. c #61B7E4", -"~. c #65B9E6", -"^. c #6ABBE7", -"/. c #63BAEA", -"(. c #6CBDE9", -"). c #75BBE5", -"_. c #72BEE9", -"`. c #6FC1EE", -"'. c #75C1EB", -"]. c #7BC4EC", -"[. c #7DC6F0", -"{. c #8E8C8C", -"}. c #878584", -"|. c #939291", -" X c #9D9C9B", -".X c #999897", -"XX c #87989F", -"oX c #A09F9E", -"OX c #A1A09F", -"+X c #939DA7", -"@X c #849CB3", -"#X c #98A1A3", -"$X c #9CA7AA", -"%X c #85A2BF", -"&X c #99A5B4", -"*X c #A5A4A4", -"=X c #A9A7A6", -"-X c #ABA8A6", -";X c #ACABAB", -":X c #A2ACAF", -">X c #B1AEAC", -",X c #B2B0AF", -"X>X>X>X>X>X>X>X>X,X5X6X9XqXqXwXbXnXnXmXmXMXMXMXMXMXMXMXMXmXmXbXbXbX9XbXUXUXUX", -"UXUXUXUX-X:Xv % v c c c c b b b b Y T XX+X#X#X$X$X$X:X2X2X0X7XqXeXnXnXnXnXnXnXnXnXnXbXwXMX>XUXUX", -"UXUXUXUX;X&X@ $ . . . . . . . . . 9 @.o.o. . . .A A S S S H H D D F F F R R R ` ` U { bXCX;X|.UX", -"UXUXUXUX>X@X@ X @ @ @ @ @ @ @ @ @ 0 -.*.=.;.<.<.;.;.-.-.-.-.&.&.&.%.%.X.X.......} C 5.mXCX;X|.UX", -"UXUXUXUX>X[ @ @ @ @ @ @ @ @ @ # @ 5 <.,.1.i.i.i.i.i.,.>.=.:.&.&.&.&.X.X.X.X.......C t.NXCX;X|.UX", -"UXUXUXUX>XrXs n n s s s i i u u p l h.h.h.h.h.h.g.g.g.s.p.,.<.:.&.&.&.X.X.X.......C r.BXZX=X|.UX", -"UXUXUX-X>XrXn m m m B B B B B W B ( J.W.W.W.W.W.W.W.W.E.E.Y.D.k.d.d.s.s.y.y.y.1.#.$.A.CXAX*X|.UX", -"UXUXUX-X>X%Xn m N N N N N B B W W / H.W.!.!.!.!.!.!.W.W.W.E.E.R.D.k.j.j.j.g.f.f.f.u.L.ZXSX*X|.UX", -"UXUXUX-X;X[ N N N N N E E W W W / / H.~.~.~.^.^.~.~.~.!.W.W.E.E.F.D.j.j.j.g.f.f.f.u.L.AXSXOXUXUX", -"UXUXUX-X2XB.z N N E E E W ! W ( ( ( H.(.^.(.(.(.(.^.^.~.~.!.W.E.E.F.k.j.j.j.g.f.f.u.P.DXSXoXUXUX", -"UXUXUX-X5XB.z E E E E ! ! ! ( ) ) ) M.(._._._._._._.(.^.~.~.W.W.E.R.D.j.j.j.g.f.f.u.P.DXSX XUXUX", -"UXUXUX=X0XI.z E Q Q Q ! ~ ) ) ) ) ) M._.'.'.'.'.'._._.(.^.~.!.W.W.E.F.k.j.j.j.f.f.u.pXGXSX XUXUX", -"UXUXUX=X0XK.I Q Q Q Q ~ ~ ) ) c.c.m.M._.].].].].].'.'._.(.^.~.!.W.E.R.D.j.j.j.g.f.u.gXHXSX XUXUX", -"UXUXUX=X3XD.L Q ^ ^ ~ ~ ) x.n.n.m.m.m.).].].cXcX].].].'._.(.^.~.W.W.E.D.j.d.s.y.,.X.P.HXSX XUXUX", -"UXUXUX-XsX,.8 3 g L ^ ~ x.n.m.m.M.V.V.).vXvXvXvXvXcX].'._.(.~.W.E.D.h.s.;.:.&.X.X...pXKXSX XUXUX", -"UXUXUX-XiX=.} : : q w g l L P l.z.z.n.K.'.].].[.'.'.^.Q.E.Y.U.h.g.s.i.,.*.&.&.X.X...pXKXSX XUXUX", -"UXUXUX-XiX:.X.6 6 q w g g j j x L P P N./.(.`.`.(./.Q.E.T.Y.U.h.h.g.p.,.*.&.&.@.X...gXHXSX XUXUX", -"UXUXUX-XiX&.%.9 6 q w h j j L L 8.8.8.b././.(.(././.Q.E.T.Y.U.h.h.g.p.,.*.&.&.X.X...hXHXSX XUXUX", -"UXUXUX-XaX%.&.} 6 0 r h j K L 7.8.9.l.v.Q././././.Q.W.E.Y.Y.S.h.g.g.p.,.:.&.&.X.X...hXGXZX.XUXUX", -"UXUXUX>XP.X.X.X.0 0 r h J K 7.7.9.9.l.v.T.Q././.Q.W.E.E.Y.U.S.h.g.p.i.>.:.&.&.X.X...hXDXCX.XUXUX", -"UXUX-X>XL.X.X.&.Z 9 e S 2.3.7.7.q.q.v.v.F.W.W.W.W.E.E.Y.Y.U.h.h.g.p.i.>.&.&.&.X.X...xXFXCX.XUXUX", -"UXUX-X>XK...X.&.} 9 Z O.2.3.5.0.q.r.r.v.G.E.E.E.E.T.Y.Y.U.S.h.g.s.p.,.*.&.&.&.X.X...xXAXNX.XUXUX", -"UXUX-X.:.&.&.X.X.X...xXZXMX|.UXUX", -"UXUX-X5XH...X.X.@.} | | O.4.6.6.e.e.r.r.a.U.U.U.U.U.U.h.h.h.g.p.i.,.*.&.&.&.X.X...o.jXVXmX|.UXUX", -"UXUX-X2Xb.C } } ..| 9 | +.O.2.5.6.0.e.e.a.h.S.S.S.h.h.h.g.g.s.p.,.=.&.&.&.@.X.X...o.jXBXmX|.UXUX", -"UXUX-X3Xt.7 9 9 9 9 0 0 0 e r h J K K 3.3.0.e.e.e.e.e.e.w.w.w.#.$.@.@.X.X.X.X.X...o.lXMXbX|.UXUX", -"UXUX=X8XK 4 6 6 6 6 6 6 6 6 q w g g g g g j K K j j j h h h r e 0 0 0 0 8 8 8 8 7 0 4XmXbX|.UXUX", -"UXUX=X8Xj > ; ; - - > = = ; ; < < 1 1 t a f f f f f f f w w q < : < < < < < < < ; 2 &XnXbX|.UXUX", -"UXUX=X2XdXuXtXZ.Z.B.m.~ Q z l k t t 1 2 , , , , , , , , , , , , , , , , , , , & & & &XbXbX|.UXUX", -"UXUX-X=X-X;X;X,X5X5X5X3X3X3XfXfXsXyXyXyXuXtXZ.C.' _ W N d y y * # # # O o o + o + &XeXwX|.UXUX", -"UXUX-X-X-X-X-X-X-X-X-X-X-X=X=X=X-X-X;X>X,X5X0X9X9XbXzXlXlXlXlXdXiXuXrXrXZ.] _ V M p +XqX9X|.UXUX", -"UX=X*X*X*X*X*X*X=X=X=X=X=X-X-X-X-X-X-X-X;X;X;X>X,X5X5X6X7X7X7X9X9XwXwXbXbXbXkXkXmXkX2X7X9X|.UXUX", -"UXUXJXSXCXMXbX9X9X5X;X;X=X=X=X*X*X*X*X=X=X=X-X;X;X5X5X5X5X5X6X7X7X7X7X7X7X6X6X6X5X5X5X6X9X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXPXPXPXJXAXCXNXmXbXbX9X0X5X5X;X;X;X;X;X;X>X,X5X5X5X5X5X5X5X5X5X>X;X5X7X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXmXmXbXbXMXbXbXnXmXmXMXMXMXNXMXMXmXbXbX9X0X6X5X;X-X-X=X=X*X;X6X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUX6X5X;X5X6X9X;X{.{.{.{.|..X.X*X7XbXMXMXMXCXCXCXSXJXJXZXMXbX9XbX7XUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUX5X;X;X5X6X9XbXbX6X5X5X>X;X=X*X X;X9X9X6X,X;X;X;X5XbXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX>X;X;X,X5X7X9XbXmXMXCXZXAXZXZXCXMXMXbXwX9X0X5X;X;X;X;XUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX;X;X>X5X6X9XbXmXMXCXCXZXAXAXAXZXCXMXmXbX9X7X5X>X;X;X;X;XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUX;X;X;X>X5X7X9XbXmXMXCXZXAXAXSXAXZXAXCXMXmX9X9X5X,X;X;X;X;XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX>X;X>X5X7X9XbXmXCXZXAXSXSXSXSXZXSXJXCXCXmX7X6X5X;X;X;X*XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX*X5X>X5X9XqXbXMXCXZXAXSXSXSXSXAXSXKXJXMXSXmX5X5X;X>X;XUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUX;X6X5X7XqXbXMXCXZXAXSXSXSXSXAXAXKXLXSXmXLXCX;X5X6XUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUX-XwX9X9XbXmXMXCXZXAXSXSXAXZXCXJXPXPXmXMXIXJX;XUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUX{.6XmXMXMXMXCXCXZXZXZXZXZXCXSXIXIXPXmXCX5XUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX*X9XMXAXSXJXJXJXJXSXAXSXLXCX7X{.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX|. X*X=X*X X|.}.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_options.c b/Source/Core/DolphinWX/resources/toolbar_plugin_options.c deleted file mode 100644 index 13976bf5ee..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_options.c +++ /dev/null @@ -1,286 +0,0 @@ -static const unsigned char toolbar_plugin_options_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x38, 0x2f, 0x30, 0x34, 0x73, 0x4e, 0xa2, 0xdf, 0x00, 0x00, 0x0c, 0x97, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x99, 0x6b, 0x8c, 0x5d, 0xd5, -0x75, 0x80, 0xbf, 0xbd, 0xcf, 0xfb, 0xdc, 0x79, 0x5c, 0x63, 0x7b, 0x8c, -0x5f, 0x78, 0x10, 0x85, 0x16, 0xd3, 0x8a, 0x81, 0xa9, 0x11, 0x29, 0xc4, -0x0c, 0x24, 0x54, 0x51, 0xda, 0xca, 0xa6, 0xa0, 0x96, 0xaa, 0x1a, 0x33, -0x36, 0xd8, 0x40, 0x48, 0x8a, 0x93, 0x36, 0x25, 0x90, 0x84, 0x4e, 0x7e, -0xf5, 0x19, 0xd9, 0x56, 0xa8, 0xfa, 0xa3, 0x42, 0x63, 0x34, 0x4a, 0xa5, -0xb6, 0xa2, 0xc0, 0x7f, 0x5a, 0x9b, 0xa0, 0x04, 0x42, 0x6a, 0x3c, 0xd8, -0xc1, 0xd8, 0x01, 0x93, 0x19, 0xcf, 0xd8, 0xcc, 0xfb, 0xbe, 0x1f, 0xe7, -0xb5, 0x77, 0x7f, 0x9c, 0x7b, 0xaf, 0x67, 0x0c, 0xe3, 0xf8, 0x45, 0x50, -0x97, 0xb4, 0xaf, 0x8e, 0xce, 0x3d, 0x67, 0xef, 0xf5, 0xed, 0xb5, 0xf6, -0xda, 0x6b, 0xed, 0x23, 0xb4, 0xd6, 0xfc, 0x7f, 0x16, 0xf3, 0x4a, 0x77, -0xb8, 0x6d, 0xdb, 0xb6, 0x3e, 0xa0, 0x5b, 0x6b, 0xdd, 0xdd, 0xb8, 0x35, -0x02, 0x8c, 0x0e, 0x0f, 0x0f, 0x8f, 0x5c, 0xe9, 0xb1, 0x00, 0xc4, 0x95, -0xb0, 0xc0, 0xf6, 0x1d, 0x3b, 0xfa, 0xd0, 0x0c, 0x80, 0xde, 0xa2, 0x35, -0x59, 0xd0, 0x68, 0x7d, 0xb6, 0x35, 0x24, 0x0f, 0xbc, 0x00, 0xec, 0x1d, -0x1e, 0x1e, 0x1e, 0xbd, 0xec, 0x41, 0x1b, 0x72, 0x59, 0x00, 0x0f, 0x3f, -0xf2, 0x48, 0x0f, 0xb0, 0x07, 0x4d, 0x5f, 0x7a, 0x47, 0xa3, 0x35, 0x68, -0x34, 0xe8, 0xc5, 0x10, 0xe7, 0x8c, 0xb3, 0x0f, 0x18, 0x1c, 0x1e, 0x1e, -0xce, 0x5f, 0xba, 0xea, 0xa9, 0x5c, 0x16, 0xc0, 0xce, 0x5d, 0xbb, 0x0e, -0x40, 0x43, 0x79, 0x9d, 0xfe, 0xb8, 0x9e, 0x4f, 0x7b, 0x7b, 0x07, 0x8e, -0xe3, 0x62, 0x9a, 0x26, 0x4a, 0x29, 0x6a, 0xb5, 0x2a, 0x95, 0x4a, 0x99, -0x7c, 0x6e, 0x1e, 0xa5, 0x54, 0xf3, 0xf5, 0x51, 0xe0, 0xbe, 0xcb, 0x75, -0xad, 0xcb, 0x02, 0x78, 0xf4, 0xb1, 0xc7, 0xef, 0x02, 0x0e, 0xa6, 0x00, -0x1a, 0xdf, 0xcf, 0x70, 0x6b, 0x6f, 0x2f, 0x1b, 0x36, 0x6c, 0x60, 0xc5, -0x8a, 0x15, 0x78, 0x9e, 0x8f, 0x52, 0x8a, 0x72, 0xb9, 0xcc, 0xe4, 0xe4, -0x24, 0x47, 0x8e, 0xbc, 0xc3, 0x87, 0x27, 0x3f, 0xa0, 0x52, 0x29, 0x37, -0xbb, 0xc8, 0x4b, 0x29, 0xef, 0xd9, 0xbf, 0x7f, 0xff, 0xe1, 0xcf, 0x04, -0x00, 0xe0, 0xf1, 0xaf, 0x3c, 0xf1, 0x12, 0xb0, 0x15, 0xad, 0xe9, 0xe8, -0xcc, 0xf2, 0xe4, 0x93, 0x4f, 0xa2, 0x95, 0x46, 0x69, 0xc5, 0xfc, 0x7c, -0x0e, 0xd3, 0x34, 0xf0, 0x3c, 0x0f, 0xa5, 0x34, 0x41, 0x10, 0x70, 0xf8, -0xf0, 0x61, 0x7e, 0xfa, 0xd3, 0x37, 0x28, 0x97, 0x8a, 0x4d, 0xd7, 0xca, -0x9b, 0xa6, 0xf9, 0x85, 0xe7, 0x9f, 0x7f, 0xfe, 0xed, 0xcf, 0x04, 0xe0, -0x89, 0xaf, 0x7e, 0x6d, 0x03, 0x30, 0x4a, 0xc3, 0xf7, 0x6f, 0xbd, 0xe5, -0x56, 0x2c, 0xdb, 0x61, 0x7e, 0x7e, 0x9e, 0x24, 0x49, 0x50, 0x4a, 0x21, -0xa5, 0x64, 0xcd, 0x9a, 0x35, 0x6c, 0xdc, 0xb8, 0x91, 0x4c, 0x26, 0xc3, -0xcf, 0xde, 0x7a, 0x8b, 0xff, 0x3d, 0xf4, 0x33, 0x0a, 0xf9, 0x1c, 0x4a, -0x29, 0xb4, 0xd6, 0xa3, 0x9d, 0x9d, 0x9d, 0xbd, 0xfb, 0xf6, 0xed, 0x9b, -0xbf, 0xd8, 0xf1, 0xe5, 0xf9, 0xfe, 0xdc, 0xb5, 0xeb, 0xd1, 0x9e, 0xc7, -0x1e, 0x7b, 0x7c, 0xe0, 0x7c, 0xcf, 0xfc, 0xf3, 0x73, 0x3f, 0x18, 0x93, -0x52, 0xee, 0x95, 0x52, 0x22, 0xa5, 0xe4, 0xf0, 0xc8, 0x61, 0xe6, 0xe6, -0xe6, 0x90, 0x52, 0x62, 0x18, 0x06, 0x52, 0x4a, 0x92, 0x24, 0xe1, 0xd4, -0xa9, 0x53, 0xbc, 0xfa, 0xea, 0xab, 0x8c, 0x8e, 0x8e, 0xb2, 0xe9, 0xb6, -0xdb, 0xb8, 0xe5, 0x96, 0x5e, 0xfc, 0x4c, 0x06, 0xcb, 0xb2, 0x30, 0x0c, -0xa3, 0xbb, 0x58, 0x2c, 0xee, 0xb9, 0x58, 0xe5, 0xcf, 0x0b, 0xb0, 0x6b, -0xd7, 0xa3, 0x3d, 0x52, 0xca, 0x03, 0x42, 0x88, 0xa1, 0xaf, 0x3c, 0xf1, -0xd5, 0xad, 0xe7, 0xed, 0x44, 0xca, 0x41, 0x29, 0x65, 0x5e, 0x8a, 0x14, -0x62, 0x7e, 0x6e, 0x96, 0x26, 0x50, 0xb3, 0x19, 0x86, 0x01, 0xc0, 0x91, -0x23, 0x47, 0x18, 0x1f, 0x1f, 0xa7, 0xb7, 0xb7, 0x97, 0xf5, 0xeb, 0x37, -0x60, 0x59, 0x16, 0xa6, 0x69, 0x02, 0x6c, 0x7b, 0xe8, 0xa1, 0x87, 0xee, -0xbe, 0x22, 0x00, 0x3b, 0x77, 0xed, 0xea, 0x16, 0x42, 0x1c, 0x10, 0x42, -0x64, 0x85, 0x94, 0x48, 0x21, 0x87, 0xbe, 0xf6, 0x17, 0x4f, 0xf6, 0x2c, -0xd5, 0xc9, 0xbe, 0xbd, 0x7b, 0x0a, 0x2d, 0x2b, 0x08, 0x49, 0xa1, 0x58, -0x40, 0xa9, 0xe4, 0x13, 0x21, 0x2c, 0xcb, 0xe4, 0xbd, 0x63, 0xc7, 0xc8, -0xe7, 0xf3, 0xf4, 0xf6, 0xf6, 0xd2, 0xd9, 0x99, 0xc5, 0x34, 0x4d, 0x0c, -0xc3, 0x40, 0x6b, 0xfd, 0xec, 0x15, 0x01, 0x10, 0x42, 0x0c, 0x09, 0x21, -0xb2, 0x42, 0x08, 0x84, 0x10, 0x08, 0x29, 0xb2, 0x52, 0xc8, 0xa1, 0xdd, -0x5f, 0xff, 0x46, 0x76, 0xa9, 0x8e, 0xf6, 0xec, 0xf9, 0xfe, 0xf7, 0x84, -0x94, 0xa3, 0xa2, 0xa1, 0xec, 0xec, 0xec, 0x0c, 0xad, 0xf7, 0x85, 0xc0, -0x30, 0x0c, 0x4c, 0xd3, 0xc0, 0xb2, 0x2c, 0x1c, 0xd7, 0xe1, 0xc3, 0x93, -0x27, 0xe9, 0xea, 0x5a, 0x45, 0x57, 0xd7, 0xaa, 0xa6, 0x1b, 0x21, 0x84, -0xe8, 0xeb, 0xef, 0xef, 0x5f, 0x72, 0xa2, 0x2e, 0x08, 0x60, 0xe7, 0xae, -0x5d, 0x0f, 0x09, 0x44, 0xdf, 0xc2, 0xc1, 0x1b, 0xad, 0x47, 0x08, 0x39, -0x74, 0xde, 0xce, 0xa4, 0xdc, 0x2d, 0x85, 0x40, 0x08, 0x49, 0xb1, 0x50, -0x24, 0x8e, 0x63, 0x84, 0x10, 0x48, 0x29, 0x11, 0x42, 0x60, 0x9a, 0x16, -0xb6, 0x6d, 0xe3, 0x38, 0x0e, 0xa6, 0x65, 0x32, 0x3d, 0x3d, 0xc5, 0x75, -0xd7, 0xfd, 0xc6, 0x42, 0x00, 0x80, 0x87, 0x2e, 0x0b, 0x40, 0x20, 0x06, -0x9b, 0x4a, 0x3b, 0xae, 0xcb, 0xb5, 0xdd, 0xd7, 0x2e, 0x84, 0xd8, 0xfa, -0x57, 0xdf, 0x7c, 0xea, 0x6f, 0x96, 0xea, 0xec, 0xfb, 0xff, 0xf4, 0x0f, -0xaf, 0x08, 0x29, 0x0f, 0x36, 0x9f, 0x9f, 0x9b, 0x9d, 0x6d, 0xbd, 0x6b, -0x9a, 0xa9, 0x05, 0x6c, 0xdb, 0xc6, 0x75, 0x5d, 0x5c, 0xd7, 0xa5, 0x58, -0x2c, 0xb2, 0x7c, 0xf9, 0x72, 0x32, 0x99, 0x4c, 0x0b, 0x12, 0x38, 0xef, -0x7a, 0x3b, 0x2f, 0xc0, 0x23, 0x3b, 0x77, 0xf6, 0x01, 0xdd, 0x08, 0x81, -0x94, 0x06, 0xbf, 0xf7, 0xb9, 0x3b, 0x78, 0xf0, 0xc1, 0x07, 0x59, 0x7d, -0xf5, 0xea, 0x85, 0x10, 0x83, 0x4f, 0x7d, 0xeb, 0x99, 0x25, 0x07, 0x11, -0x42, 0x74, 0x0b, 0x21, 0x40, 0x08, 0x0a, 0xc5, 0x3c, 0x51, 0x14, 0x61, -0x34, 0xfc, 0xdf, 0xb6, 0x6d, 0x1c, 0xdb, 0xc6, 0x75, 0x1d, 0x1c, 0xc7, -0xc6, 0x30, 0x0c, 0x6a, 0xf5, 0x1a, 0x8e, 0xe3, 0x22, 0x65, 0x4b, 0x95, -0xee, 0xfe, 0xfe, 0xfe, 0x25, 0x5d, 0xf5, 0xbc, 0x00, 0x02, 0xb6, 0x90, -0xce, 0x02, 0x9e, 0xef, 0xb1, 0x76, 0xdd, 0x5a, 0x1c, 0xc7, 0x61, 0x60, -0x60, 0x00, 0xd7, 0xf3, 0x16, 0x42, 0x0c, 0x3d, 0xfd, 0xcc, 0x77, 0x3f, -0xe6, 0xab, 0x7f, 0xfd, 0xd4, 0x33, 0x43, 0x40, 0xb7, 0x48, 0xfb, 0x42, -0x0a, 0x49, 0x50, 0xaf, 0x23, 0x0d, 0x99, 0xba, 0x8f, 0xd5, 0x98, 0x7d, -0xc7, 0xc5, 0xb6, 0x6d, 0x2c, 0xd3, 0x24, 0x8a, 0x22, 0x2c, 0xdb, 0x3a, -0xb7, 0xab, 0x9b, 0x2f, 0x09, 0x00, 0xe8, 0x13, 0x8d, 0x0b, 0xcb, 0xb2, -0x59, 0xb7, 0x76, 0x2d, 0xc7, 0x4f, 0x9c, 0xa0, 0x5a, 0xad, 0xf2, 0xf0, -0x8e, 0xed, 0xb8, 0xae, 0xdb, 0x7c, 0x2e, 0x2b, 0x04, 0x43, 0xdf, 0xf9, -0xee, 0x60, 0x16, 0xe0, 0x99, 0x6f, 0x3f, 0xdb, 0xf7, 0xad, 0xa7, 0xbf, -0x73, 0x00, 0x18, 0x10, 0x88, 0x56, 0x67, 0xeb, 0xd6, 0xaf, 0xa7, 0x33, -0x9b, 0xc5, 0x32, 0x2d, 0x1c, 0xc7, 0xc6, 0xf5, 0x5c, 0x3c, 0xcf, 0xc3, -0x71, 0x1c, 0x2c, 0xcb, 0x42, 0x1a, 0x92, 0x30, 0x0c, 0xd3, 0x04, 0xf0, -0x12, 0x37, 0xd4, 0x45, 0x00, 0x1a, 0x7a, 0x34, 0x20, 0x84, 0x60, 0xc5, -0x8a, 0x15, 0x84, 0x51, 0xc4, 0xa1, 0x43, 0x6f, 0xf3, 0xc6, 0x1b, 0x6f, -0xd2, 0xd1, 0xd1, 0xc9, 0x03, 0x0f, 0xdc, 0x4f, 0x23, 0xd1, 0x44, 0x6b, -0x7a, 0x94, 0x52, 0x87, 0x9f, 0xf9, 0xf6, 0xb3, 0xbf, 0xd4, 0x5a, 0x1f, -0x00, 0xdd, 0x97, 0xee, 0xc5, 0x1a, 0xd7, 0xf3, 0xb8, 0xf7, 0xf7, 0xef, -0xe5, 0x9e, 0x7b, 0xbe, 0x80, 0x69, 0x9a, 0xd8, 0x8e, 0x8d, 0xe7, 0x79, -0xf8, 0x9e, 0x87, 0xeb, 0xb9, 0x2d, 0xf7, 0x01, 0xa8, 0x56, 0x2a, 0xc4, -0x71, 0xbc, 0x30, 0xc9, 0xbb, 0x28, 0x69, 0x15, 0x34, 0x3b, 0x76, 0x3c, -0xdc, 0x23, 0xa5, 0x4c, 0xe7, 0x4f, 0x6b, 0xda, 0xdb, 0x3b, 0x38, 0x7a, -0xf4, 0x28, 0x42, 0x08, 0xf2, 0x85, 0x02, 0xaf, 0xfe, 0xf7, 0xff, 0x70, -0xef, 0x17, 0xbf, 0xc8, 0xfd, 0x0f, 0xdc, 0xcf, 0x8b, 0x2f, 0xfe, 0x17, -0x5a, 0x29, 0xb4, 0x10, 0xdd, 0x82, 0x86, 0xda, 0x5a, 0xd3, 0xd5, 0xd5, -0xc5, 0xa6, 0x4d, 0xbf, 0xcb, 0x4d, 0x37, 0xdd, 0x44, 0xbd, 0x1e, 0xf0, -0xda, 0xc1, 0xd7, 0x70, 0x9a, 0xca, 0xfb, 0x3e, 0x7e, 0xc6, 0xc7, 0x73, -0x5d, 0x10, 0x82, 0x38, 0x49, 0x48, 0x12, 0x45, 0x9c, 0x24, 0xd4, 0x6b, -0x35, 0x92, 0x24, 0xb9, 0x24, 0x2b, 0x2c, 0xac, 0xc8, 0x3a, 0x9b, 0x17, -0x42, 0x4a, 0xda, 0xdb, 0xda, 0x38, 0x7d, 0xfa, 0x4c, 0x2b, 0x3a, 0xe4, -0xf3, 0x79, 0x0e, 0xbd, 0x7d, 0x88, 0xcf, 0xdd, 0x7e, 0x3b, 0x9b, 0x37, -0xdf, 0xc9, 0x8f, 0x7e, 0xf4, 0x3a, 0x68, 0x81, 0xe7, 0xba, 0xdc, 0xf0, -0x9b, 0xd7, 0xb3, 0x69, 0xd3, 0x26, 0x56, 0xae, 0x5c, 0x89, 0x52, 0x8a, -0xe9, 0xa9, 0x69, 0x8e, 0xfe, 0xfc, 0x5d, 0x12, 0x95, 0xe0, 0x79, 0x1e, -0x6d, 0x99, 0x0c, 0x6d, 0x6d, 0x19, 0x7c, 0xcf, 0xc7, 0x34, 0x4d, 0x92, -0x24, 0x26, 0x49, 0x12, 0xa2, 0x30, 0x24, 0x8a, 0x22, 0x2a, 0x95, 0x72, -0x2b, 0x6f, 0x6a, 0xc8, 0xe8, 0x45, 0x03, 0x2c, 0xa4, 0x97, 0x42, 0x10, -0x84, 0x01, 0x49, 0x92, 0x34, 0x62, 0xb4, 0x44, 0x20, 0x18, 0x1b, 0x3b, -0x85, 0x14, 0x82, 0xcf, 0xdf, 0xf9, 0x79, 0xd0, 0x90, 0xcd, 0x66, 0xb9, -0xfe, 0x86, 0xeb, 0x71, 0x1c, 0x07, 0xad, 0x34, 0x93, 0x93, 0x53, 0x9c, -0x38, 0x71, 0x82, 0x5c, 0x2e, 0x8f, 0x65, 0x99, 0xf8, 0xbe, 0x4f, 0xc6, -0xf7, 0x69, 0x6b, 0x6b, 0x23, 0x93, 0xf1, 0xb1, 0x6d, 0x1b, 0xad, 0x35, -0x61, 0x98, 0x10, 0x06, 0x21, 0x41, 0x10, 0x50, 0x28, 0xe4, 0xa9, 0xd7, -0xeb, 0x0b, 0x95, 0xcf, 0x0f, 0x0f, 0x0f, 0x8f, 0x5d, 0x82, 0x05, 0x52, -0xff, 0x85, 0x74, 0x0d, 0x14, 0x0a, 0x85, 0xc6, 0xee, 0x99, 0x6e, 0xf3, -0x86, 0x21, 0xd1, 0x1a, 0x26, 0x4e, 0x9f, 0x61, 0xe5, 0xe8, 0x2f, 0xb9, -0xe3, 0x8e, 0x3b, 0x5a, 0xef, 0x8d, 0x8d, 0x8e, 0x31, 0x3a, 0x36, 0xd6, -0x48, 0x9f, 0x4d, 0x7c, 0xcf, 0xc3, 0x71, 0x9d, 0xd6, 0xec, 0xfb, 0x19, -0x1f, 0xd7, 0x71, 0x00, 0x08, 0x82, 0x80, 0x7a, 0x10, 0x50, 0xad, 0xd5, -0xa8, 0xd5, 0xea, 0xcc, 0xce, 0xcc, 0x10, 0x45, 0xd1, 0x42, 0x17, 0x3a, -0x78, 0xa1, 0xca, 0x9f, 0x6b, 0x81, 0xd1, 0x85, 0x65, 0xe0, 0x47, 0x67, -0xce, 0xb0, 0xfe, 0x9a, 0x0d, 0x98, 0x86, 0x81, 0x65, 0x9f, 0xdd, 0x29, -0xb5, 0xd6, 0xbc, 0xfb, 0xee, 0x31, 0xe2, 0x28, 0xa1, 0x56, 0xaf, 0x32, -0x39, 0x39, 0x4d, 0x10, 0xd4, 0x11, 0x42, 0xe0, 0xfb, 0x5e, 0x9a, 0x2a, -0x38, 0x4e, 0xc3, 0xef, 0xd3, 0x85, 0x6b, 0xdb, 0x36, 0x42, 0xa6, 0x11, -0xa7, 0x1e, 0x04, 0x54, 0x2b, 0x55, 0x2a, 0x95, 0x0a, 0xb9, 0x7c, 0x8e, -0x42, 0x21, 0x7f, 0xee, 0x22, 0x7e, 0xf9, 0x62, 0x00, 0x16, 0xd5, 0x03, -0xdb, 0xb7, 0x6f, 0xd7, 0x86, 0x61, 0xe2, 0x38, 0x0e, 0xae, 0xe7, 0xb2, -0x7e, 0xfd, 0x35, 0x64, 0x3b, 0x97, 0xe1, 0xba, 0xee, 0xc7, 0x20, 0x1a, -0x79, 0xfc, 0xa2, 0x5c, 0xc7, 0xb2, 0x2c, 0x1c, 0xdb, 0x4e, 0x67, 0xdf, -0x75, 0x5b, 0xe1, 0x12, 0x01, 0x51, 0x18, 0x51, 0xa9, 0x56, 0x29, 0x16, -0x8a, 0xe4, 0xf3, 0x79, 0xf2, 0x85, 0x02, 0xc7, 0xdf, 0x3b, 0x46, 0xa9, -0x54, 0x24, 0x08, 0x02, 0x94, 0x52, 0x88, 0x38, 0x39, 0xf3, 0xc2, 0xbf, -0xfd, 0x70, 0xed, 0x25, 0x59, 0xa0, 0x61, 0x85, 0x11, 0xad, 0x75, 0x8f, -0x52, 0x09, 0x49, 0x9c, 0x90, 0xcf, 0xe7, 0x69, 0x6f, 0xef, 0x04, 0x01, -0x86, 0x61, 0xe0, 0xd8, 0x36, 0x86, 0x69, 0x20, 0xc5, 0xd9, 0xe8, 0x2b, -0x64, 0xba, 0x6b, 0x9b, 0x0d, 0x00, 0xdb, 0x4e, 0xf3, 0x1d, 0xb3, 0x91, -0xdf, 0x68, 0xad, 0x08, 0xc3, 0x88, 0x5a, 0xb5, 0x4a, 0xa9, 0x54, 0xa2, -0x58, 0x2c, 0x52, 0x2a, 0x95, 0x19, 0x3f, 0x75, 0x8a, 0x4a, 0xa5, 0x4c, -0x14, 0x45, 0xad, 0xc9, 0xe8, 0x7d, 0xeb, 0xad, 0xec, 0x4b, 0x42, 0xf6, -0xdc, 0xa7, 0xd5, 0x05, 0xd7, 0xc9, 0x8b, 0x00, 0x94, 0xd2, 0x23, 0x42, -0x24, 0x3d, 0x71, 0x22, 0x31, 0xe2, 0x88, 0x4a, 0xb9, 0x4c, 0xb1, 0x98, -0x4f, 0x95, 0xb2, 0x2c, 0x68, 0x24, 0x64, 0x96, 0x65, 0x62, 0x1a, 0x06, -0x52, 0xa6, 0x6b, 0x23, 0x4d, 0x95, 0x4d, 0x0c, 0x33, 0x05, 0x91, 0x86, -0x81, 0x00, 0x92, 0x24, 0x21, 0x0c, 0x43, 0x6a, 0xd5, 0x1a, 0xa5, 0x52, -0x89, 0x42, 0xb1, 0x48, 0xb1, 0x58, 0x64, 0x72, 0xf2, 0x23, 0x66, 0x66, -0xa6, 0x08, 0xc3, 0xb0, 0xe5, 0xfb, 0xcb, 0x72, 0x39, 0xae, 0x3f, 0x79, -0xd2, 0x57, 0x70, 0xe0, 0x15, 0x21, 0xef, 0xde, 0x72, 0x81, 0x10, 0x8b, -0x37, 0x32, 0xad, 0x0e, 0x2a, 0xa5, 0x48, 0xe2, 0x98, 0x28, 0x8e, 0x09, -0xc3, 0x80, 0xd9, 0x99, 0x69, 0xca, 0xa5, 0x12, 0xf5, 0x20, 0x20, 0x0c, -0x03, 0xe2, 0x38, 0x06, 0x4d, 0x3a, 0xeb, 0x96, 0xd9, 0x98, 0x75, 0x1b, -0xdb, 0xb6, 0x30, 0x1b, 0x2e, 0xa6, 0x92, 0x84, 0x20, 0x0c, 0xa9, 0x54, -0x2a, 0x14, 0x0b, 0x45, 0x72, 0xf9, 0x1c, 0xb9, 0x5c, 0x8e, 0x42, 0xa1, -0xc0, 0xd4, 0xd4, 0x14, 0xe3, 0xe3, 0x63, 0x04, 0x41, 0xb0, 0x28, 0xf6, -0xdf, 0xf9, 0x93, 0x9f, 0x60, 0xa3, 0xb1, 0x20, 0x6b, 0xc2, 0xd0, 0x2b, -0x42, 0x5e, 0x50, 0x3e, 0x74, 0xee, 0xc9, 0xdc, 0xcb, 0x4a, 0x29, 0x84, -0x10, 0xc4, 0x51, 0x44, 0x80, 0x00, 0x2a, 0x4c, 0x4c, 0x8c, 0x83, 0x10, -0xe9, 0x59, 0x8f, 0x5a, 0x70, 0xe6, 0xd3, 0x88, 0x5a, 0x5a, 0x93, 0x2e, -0xc2, 0x86, 0xf2, 0x71, 0x1c, 0x13, 0x84, 0x21, 0xf5, 0x5a, 0x9d, 0x4a, -0xa5, 0x42, 0xb9, 0x52, 0xa1, 0x52, 0xa9, 0x30, 0x31, 0x7e, 0x8a, 0x99, -0x99, 0xe9, 0x96, 0xf2, 0x4d, 0xd7, 0x79, 0xe4, 0xc6, 0xe5, 0xac, 0xfb, -0xa0, 0x93, 0x89, 0x37, 0x73, 0x48, 0x34, 0x20, 0x7a, 0x14, 0x0c, 0x01, -0xf7, 0xfd, 0x2a, 0x80, 0x8f, 0x15, 0xf5, 0xfd, 0xfd, 0xfd, 0x7b, 0x80, -0xdd, 0x52, 0x2e, 0x28, 0x40, 0x1c, 0x07, 0xdf, 0xcf, 0xb0, 0xea, 0xea, -0xd5, 0x5c, 0x75, 0xd5, 0x55, 0x78, 0x9e, 0x87, 0xeb, 0xa6, 0x29, 0x81, -0x65, 0x59, 0x98, 0x86, 0x99, 0xce, 0xbc, 0x56, 0x24, 0x71, 0x42, 0x18, -0x85, 0x04, 0xf5, 0x80, 0x5a, 0x23, 0x54, 0x96, 0xca, 0x25, 0xc6, 0x4f, -0x8d, 0x51, 0x2c, 0x16, 0x5a, 0x21, 0xb3, 0xa9, 0xfc, 0xce, 0x3f, 0xb8, -0x8b, 0xcd, 0x7f, 0xb4, 0x95, 0xe4, 0xc5, 0xe7, 0x78, 0xff, 0x6f, 0xff, -0x85, 0xa9, 0xe3, 0xd3, 0x84, 0x40, 0x88, 0x20, 0x84, 0xdd, 0xf7, 0x69, -0xb5, 0xef, 0x62, 0x01, 0x3a, 0x49, 0xcf, 0x33, 0xbb, 0x9b, 0x65, 0xa0, -0x69, 0x9a, 0x0d, 0x37, 0x71, 0x58, 0x76, 0xd5, 0x55, 0xac, 0x5c, 0xd9, -0x85, 0xef, 0xfb, 0xd8, 0x8d, 0x7a, 0x56, 0x36, 0xf2, 0x1a, 0xad, 0xd2, -0xd4, 0x20, 0x8e, 0xa2, 0xd4, 0x02, 0xf5, 0x34, 0xce, 0x4f, 0x4f, 0x4f, -0x12, 0x04, 0x41, 0x2b, 0x5c, 0x36, 0x43, 0xf5, 0x36, 0x77, 0x8a, 0xcd, -0x6b, 0xda, 0x71, 0xbe, 0xf9, 0xaf, 0x20, 0xa1, 0xfa, 0xdc, 0x5f, 0xf2, -0xf3, 0xbf, 0xff, 0x77, 0x8a, 0xf3, 0xb5, 0x26, 0x40, 0x3e, 0x84, 0x5b, -0xfe, 0x44, 0xab, 0xd1, 0x0b, 0x06, 0x68, 0x40, 0xdc, 0x4c, 0xba, 0xa1, -0x64, 0x9b, 0x15, 0x55, 0x0a, 0x92, 0x2e, 0x60, 0xdb, 0xb6, 0xe9, 0xe8, -0xe8, 0xa4, 0xad, 0xbd, 0x03, 0xdf, 0xf7, 0xb1, 0xcc, 0x34, 0x54, 0x6a, -0xad, 0x89, 0xe3, 0x98, 0x6a, 0xa5, 0x4c, 0xa1, 0x50, 0x20, 0x97, 0x9b, -0x27, 0x8a, 0x22, 0xe2, 0x38, 0x5e, 0x34, 0xeb, 0x9e, 0x54, 0xfc, 0xb1, -0x3d, 0xc3, 0xed, 0x22, 0x8f, 0x69, 0x18, 0x98, 0xbf, 0x7d, 0x3b, 0xce, -0x9f, 0x7f, 0x03, 0x35, 0x77, 0x9a, 0xa9, 0xa7, 0x1f, 0xe5, 0xdd, 0xff, -0x3c, 0xd2, 0x04, 0x20, 0x84, 0xfd, 0x7f, 0xaa, 0xd5, 0xf6, 0x8b, 0x02, -0x58, 0x00, 0xf1, 0x32, 0xd0, 0x0d, 0x2c, 0x8a, 0xf7, 0xcd, 0x66, 0x9a, -0xe6, 0xc2, 0x4a, 0x0a, 0xa5, 0x14, 0x4a, 0x29, 0x92, 0x24, 0x69, 0xb5, -0xe6, 0xbd, 0xe6, 0x38, 0xeb, 0x32, 0xf0, 0x67, 0xd9, 0x1c, 0xab, 0x2b, -0xf3, 0xc8, 0x7a, 0x80, 0xd4, 0x20, 0x10, 0xb8, 0x5b, 0x77, 0x60, 0x6e, -0xbc, 0x99, 0xe0, 0xf0, 0xeb, 0xfc, 0xe2, 0xd9, 0x7f, 0xe4, 0xf4, 0xb1, -0x5c, 0x13, 0x80, 0x10, 0xae, 0xdd, 0xb6, 0x84, 0x15, 0x96, 0x3c, 0x56, -0x19, 0x1e, 0x1e, 0x7e, 0x07, 0xe8, 0x69, 0x40, 0xb4, 0x36, 0xaf, 0x38, -0x8e, 0x89, 0xa2, 0x88, 0x20, 0x68, 0xfa, 0xf8, 0xd9, 0x16, 0x04, 0x01, -0xf5, 0x7a, 0x9d, 0xb0, 0x91, 0xa4, 0x35, 0x67, 0xbe, 0xa9, 0xfc, 0x1f, -0xfe, 0x4e, 0x27, 0x4f, 0xde, 0xe6, 0xb3, 0x36, 0x6b, 0x81, 0x69, 0x90, -0x68, 0x4d, 0x14, 0x85, 0x44, 0x41, 0x9d, 0xd2, 0x4b, 0xcf, 0x93, 0xcc, -0x7d, 0x84, 0xb9, 0x6e, 0x03, 0x5d, 0x9b, 0x6f, 0x04, 0x4b, 0xa0, 0x00, -0x05, 0x68, 0x58, 0xb2, 0x8c, 0xbd, 0xa0, 0x93, 0xb9, 0xfe, 0xfe, 0xfe, -0xbb, 0x80, 0x41, 0x9a, 0x07, 0xb9, 0x17, 0x29, 0x9b, 0x56, 0x09, 0xb6, -0x6c, 0xea, 0x62, 0xe5, 0x32, 0x8f, 0xa4, 0x54, 0x26, 0x3a, 0x33, 0x45, -0x74, 0x66, 0x0a, 0x35, 0x97, 0x47, 0x57, 0x6a, 0x10, 0xc7, 0x68, 0xa5, -0xf0, 0x6e, 0xdf, 0x8c, 0x7b, 0xeb, 0x6d, 0xd4, 0x3f, 0x38, 0xc6, 0xb1, -0xbf, 0x7b, 0x9e, 0xd3, 0x1f, 0xd6, 0x88, 0x48, 0xad, 0x10, 0xc1, 0xb2, -0x47, 0xb5, 0xfa, 0xd8, 0x69, 0xf6, 0x79, 0x4f, 0xe6, 0x9a, 0x32, 0x3c, -0x3c, 0xfc, 0xda, 0xf0, 0xf0, 0xf0, 0xdd, 0xa4, 0x16, 0xd9, 0xcf, 0x05, -0xa4, 0xbb, 0xfe, 0xcc, 0x0c, 0xdd, 0x1f, 0xfe, 0x82, 0x2f, 0x4f, 0x1e, -0xe7, 0x4b, 0x6d, 0x45, 0x3a, 0x54, 0x0d, 0x95, 0x24, 0x08, 0xc7, 0x46, -0xb6, 0x65, 0x10, 0x19, 0x0f, 0x65, 0x9b, 0x24, 0xa8, 0xd4, 0x0a, 0x61, -0x48, 0xf9, 0xd0, 0x9b, 0x24, 0x95, 0x3c, 0x46, 0xb6, 0x9d, 0x65, 0x37, -0x2e, 0x27, 0x06, 0x92, 0xb3, 0x6d, 0xcb, 0x27, 0x8d, 0x73, 0x51, 0x5f, -0x68, 0x1a, 0x6e, 0xb5, 0x1d, 0xa0, 0xbf, 0xbf, 0x7f, 0x03, 0xe9, 0xfa, -0x68, 0x36, 0x80, 0x91, 0x55, 0xaf, 0xff, 0xf8, 0xb1, 0xb6, 0xb1, 0xb1, -0x2f, 0x19, 0x96, 0x89, 0xd7, 0xe1, 0x11, 0xac, 0x5b, 0xc1, 0xf8, 0xfb, -0x3e, 0xd9, 0x55, 0x6d, 0x48, 0xc7, 0xc1, 0x70, 0x1d, 0x44, 0xc6, 0x43, -0xb4, 0xb7, 0x41, 0xa1, 0x84, 0x2a, 0x95, 0x89, 0x55, 0x82, 0x0e, 0x43, -0x54, 0xb5, 0x42, 0x7d, 0xf4, 0x03, 0x64, 0x9b, 0x8b, 0xb7, 0xae, 0x0b, -0xcb, 0x9f, 0xa0, 0x5e, 0x6d, 0x01, 0x6c, 0x25, 0xfd, 0x40, 0x72, 0xe9, -0x00, 0xe7, 0xc0, 0x8c, 0x01, 0x63, 0xc0, 0x6b, 0x0b, 0xef, 0x0f, 0x0a, -0x63, 0x04, 0x18, 0x51, 0x49, 0x92, 0x0d, 0x6b, 0x21, 0xe5, 0xf9, 0x32, -0xb3, 0xe3, 0x39, 0xa6, 0x4e, 0x66, 0x58, 0xe3, 0xba, 0x08, 0x23, 0x8b, -0xb0, 0x6d, 0x8c, 0xf6, 0x36, 0x64, 0x47, 0x1b, 0xba, 0x5c, 0x42, 0x55, -0x0c, 0x92, 0x5a, 0x42, 0x12, 0x45, 0x94, 0xdf, 0x3b, 0x8a, 0xff, 0x5b, -0x37, 0x20, 0xdb, 0x3d, 0xa4, 0x0d, 0x71, 0x0b, 0x40, 0x7c, 0xe2, 0x81, -0xd7, 0x05, 0xb9, 0xd0, 0xc5, 0xc8, 0xa0, 0x4e, 0xc6, 0x80, 0xbd, 0x5a, -0x69, 0xe2, 0x30, 0xa6, 0x52, 0xaa, 0x52, 0x9c, 0xce, 0x33, 0x76, 0x7c, -0x96, 0xea, 0xd4, 0x1c, 0x71, 0xb1, 0x8c, 0x56, 0x0a, 0xe1, 0xbb, 0x18, -0xd9, 0x0e, 0x64, 0x47, 0x07, 0xf8, 0x2e, 0x89, 0x69, 0x10, 0xab, 0x98, -0xb8, 0x56, 0x21, 0x2e, 0x17, 0xd0, 0x89, 0xc2, 0xf1, 0x20, 0x06, 0x62, -0x04, 0xf1, 0x59, 0x2b, 0x7f, 0xba, 0x00, 0x0d, 0x88, 0xef, 0x01, 0x23, -0x2a, 0x51, 0x44, 0xb5, 0x90, 0x52, 0xae, 0xcc, 0xec, 0xc4, 0x3c, 0x27, -0x8f, 0xce, 0x10, 0xce, 0xcc, 0x12, 0x97, 0x4a, 0xa0, 0x14, 0xc2, 0x75, -0x30, 0xda, 0x7d, 0x84, 0xef, 0x81, 0x65, 0x82, 0x61, 0xa4, 0xad, 0x11, -0x96, 0x73, 0xe5, 0x96, 0xf2, 0x24, 0x4b, 0x8c, 0x75, 0xc5, 0xbf, 0x52, -0x2e, 0x90, 0x01, 0xb4, 0x3e, 0x98, 0xc4, 0x49, 0xb6, 0x5e, 0xae, 0x53, -0x98, 0x2d, 0x32, 0xf1, 0xbe, 0x89, 0x6d, 0x09, 0xba, 0x37, 0x26, 0x98, -0xed, 0x6d, 0x80, 0x46, 0x98, 0x26, 0x86, 0xeb, 0x62, 0xb8, 0x0e, 0x49, -0xc5, 0xc4, 0xe9, 0x5a, 0x01, 0x40, 0x65, 0xe2, 0x23, 0xe6, 0x4a, 0x82, -0x04, 0x9a, 0x00, 0x9f, 0xf8, 0x3d, 0xed, 0x53, 0x03, 0x18, 0xd4, 0xc9, -0x3b, 0x83, 0xc2, 0xd8, 0xad, 0x13, 0xb5, 0x3f, 0x0e, 0x22, 0xaa, 0x85, -0x0a, 0x42, 0x80, 0x52, 0x9a, 0x38, 0x08, 0xb9, 0xf6, 0xfa, 0x0e, 0xa4, -0x6d, 0xa3, 0xc2, 0x10, 0xad, 0x12, 0x10, 0x02, 0xf7, 0x9a, 0xb5, 0x98, -0xd9, 0x0e, 0xc2, 0xb9, 0x1c, 0x23, 0xaf, 0x4d, 0x10, 0x71, 0x36, 0x0a, -0xc5, 0x4b, 0x94, 0x9a, 0x9f, 0xa6, 0x05, 0x18, 0xd4, 0xc9, 0x0b, 0x83, -0xc2, 0xe8, 0x53, 0x4a, 0x0f, 0x44, 0xf5, 0x88, 0x4a, 0xbe, 0x42, 0x92, -0x68, 0x82, 0x6a, 0x40, 0x79, 0xae, 0xc4, 0x75, 0xd7, 0x58, 0x18, 0x12, -0x92, 0x6a, 0x0d, 0x67, 0xf5, 0xd5, 0xb8, 0xeb, 0xd6, 0x50, 0x19, 0x9d, -0xe0, 0xc7, 0xff, 0xf1, 0x36, 0x1f, 0x4d, 0x27, 0x24, 0xa4, 0x1b, 0x59, -0xc3, 0x7d, 0x3e, 0xb1, 0xd4, 0xbc, 0x22, 0xdf, 0x89, 0x7f, 0x25, 0x88, -0x30, 0x86, 0x10, 0x62, 0x40, 0x4a, 0x81, 0x61, 0x5b, 0x58, 0xae, 0x85, -0xed, 0x3b, 0xd8, 0x8e, 0xc5, 0xea, 0x65, 0xb0, 0x6c, 0x4d, 0x16, 0xd3, -0x73, 0x99, 0x3a, 0x3e, 0xc1, 0x87, 0x27, 0x72, 0x04, 0xa1, 0x42, 0x69, -0xcd, 0x82, 0xa3, 0xae, 0x91, 0x41, 0x9d, 0xdc, 0xf2, 0x99, 0x01, 0xb4, -0x20, 0x60, 0x40, 0x48, 0x81, 0x90, 0x12, 0x69, 0xca, 0xb4, 0x72, 0x93, -0x8d, 0x3a, 0x23, 0x51, 0xc4, 0x51, 0x92, 0x1e, 0x98, 0xa9, 0x45, 0x3a, -0xe5, 0x81, 0x9e, 0x46, 0x74, 0xfb, 0x98, 0xfc, 0xda, 0x00, 0x00, 0x06, -0x85, 0xb1, 0x07, 0xd8, 0xdd, 0x1a, 0x5c, 0x8a, 0x45, 0xff, 0x9f, 0xa3, -0x38, 0xa4, 0x69, 0xfd, 0xc0, 0xa0, 0x4e, 0xde, 0x59, 0xaa, 0xcf, 0x4f, -0x25, 0x8c, 0x2e, 0x25, 0x83, 0x3a, 0xf9, 0x3a, 0x69, 0x3e, 0x35, 0x02, -0xa9, 0xc2, 0x0b, 0xdb, 0x39, 0xb2, 0x17, 0xe8, 0x3b, 0x9f, 0xf2, 0xf0, -0x6b, 0xb6, 0xc0, 0x42, 0x19, 0x14, 0xc6, 0x16, 0x60, 0x80, 0x34, 0xbf, -0xea, 0x6e, 0xdc, 0x3e, 0x48, 0x0a, 0xb7, 0x77, 0x29, 0x97, 0x39, 0x57, -0x3e, 0x33, 0x80, 0x2b, 0x25, 0xff, 0x07, 0x5d, 0xc7, 0x73, 0x8e, 0xf4, -0x50, 0x34, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm deleted file mode 100644 index d858e78f13..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm +++ /dev/null @@ -1,112 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_options_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 58 1", -" c #666463", -". c #696665", -"X c #6E6B6A", -"o c #706D6C", -"O c #767372", -"+ c #797776", -"@ c #7A7877", -"# c #7D7B7A", -"$ c #817F7E", -"% c #82807F", -"& c #858382", -"* c #888786", -"= c #8A8887", -"- c #8C8B8A", -"; c #908E8D", -": c #92908F", -"> c #959392", -", c #999796", -"< c #999897", -"1 c #9D9B9A", -"2 c #A19F9E", -"3 c #A2A09F", -"4 c #A4A2A1", -"5 c #A9A7A7", -"6 c #A9A8A7", -"7 c #ADACAB", -"8 c #B0AFAE", -"9 c #B1B0AF", -"0 c #B5B4B3", -"q c #B8B7B6", -"w c #B8B8B7", -"e c #BCBCBB", -"r c #C0BFBF", -"t c #C0C0BF", -"y c #C4C4C3", -"u c #C8C7C6", -"i c #C7C8C7", -"p c #C8C8C7", -"a c #CCCCCB", -"s c #D0CFCF", -"d c #D0D0CF", -"f c #D4D3D3", -"g c #D8D7D7", -"h c #D8D8D7", -"j c #DCDBDB", -"k c #E0DFDF", -"l c #E0E0DF", -"z c #E4E3E3", -"x c #E8E7E7", -"c c #E8E8E7", -"v c #ECEBEB", -"b c #F0EFEF", -"n c #F0F1EF", -"m c #EFF0F0", -"M c #F4F4F4", -"N c #F8F8F7", -"B c #FDFDFD", -"V c None", -/* pixels */ -"VVVVVVVVVVVVVVVVVVVVV%&&***VVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVVyfaaaaVVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVV=XVVVVVyjfappVVVVV+6VVVVVVVVVVVVVV", -"VVVVVVVVVVVV#0j1VVVVVujfsaaVVVVVexjVVVVOyM&VVVV", -"VVVV4zxy=VVVXyMBBBBMzgdffgjjfaauefMOVVV8xfafVVVV", -"VVV#avMMzq#XefbBBNhyepfhjjjzvzsuyfBxO>zze99z1VVV", -"VVV0jzvMNMjufvBBveejvMMMbvxzzMMhyefBNxu0q00ejVVV", -"VV-fjzxvMMNvvBBjqgNBBNMvvvczjjvBzyeffwwwwq08x7VV", -"VVo2ajzcvMMNNBjqzBBNzfuuajvvzjfzBzyeeeeww0ykt+VV", -"VVVV@0jxvMMMNxwzBBvp711<14qzNxgfzBfeteeqtjf-VVVV", -"VVVVVV-pzvMNMtfBBxe1>VVVVVV>yBvfsxMueeefj4VVVVVV", -"VVVVVVV.yzvNhyNBve,VVVVVVVVVV0BzffMjetzjXVVVVVVV", -"VVVVVVVVazvvujBNa1VVVVVVVVVVVVyNhfjcuezzVVVVVVVV", -"VVVVVVV-zzvzpvNz0dweeyupafgzcxvM7VVVVVVVVVVVVVVBjajMzzMc1VVVVVVVVVVVV>7jnzefjff&VVVVVVV", -"VVVVVVVVvvafMvzcBuVVVVVVVVVVVVqzMvefczf0.VVVVVVV", -"VVVVVV5zgypafNMkxMMw>VVVVVV>OzBjsfjjgsafggdyeejNBBxy8X@0hzzhu#VVV", -"VVVVhsfc8VVVOvhafhjzzhdaaahcNBBBBvwXVVV=ejh4VVVV", -"VVVV*NuOVVVV;zuaffjzxvMNNNBBBBBBBBg+VVVV.,wOVVVV", -"VVVVV+VVVVVVhaypafxxzxvMMNMxhhBBBBN0VVVVVVXVVVVV", -"VVVVVVVVVVV6jwyupjffjjvvMNfy07cBBBBz*VVVVVVVVVVV", -"VVVVVVVVVVOleeryafXV*fcvMNa$V eBBBBNe.VVVVVVVVVV", -"VVVVVVVVVVedqeerjaj0VVVVVyjkzvyVVVVV1j0#VVVVVVVVVVVV", -"VVVVVVVVVVVVVV2OVVVVVyhjzvyVVVVVX*VVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVVydffgyVVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVV&&&%%$VVVVVVVVVVVVVVVVVVVVV" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c b/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c deleted file mode 100644 index 0c21d7c26f..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c +++ /dev/null @@ -1,239 +0,0 @@ -static const unsigned char toolbar_plugin_pad_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x31, 0x2f, 0x30, 0x34, 0x0e, 0x46, 0xed, 0x55, 0x00, 0x00, 0x0a, 0x6a, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5f, 0x8c, 0x5c, 0xd7, -0x5d, 0xc7, 0x3f, 0xe7, 0xdc, 0x7b, 0xe7, 0xde, 0x99, 0xd9, 0x3f, 0xb3, -0xb1, 0xbd, 0x76, 0xdc, 0x84, 0xac, 0x31, 0xa4, 0x89, 0xe8, 0x9f, 0x15, -0x15, 0x22, 0x45, 0x21, 0xb1, 0x1b, 0x25, 0x8a, 0x02, 0x28, 0xe6, 0x89, -0x07, 0x5a, 0x39, 0x7d, 0xe1, 0x01, 0x24, 0x12, 0x1e, 0x10, 0x52, 0xd5, -0x07, 0xf3, 0x08, 0xa8, 0x28, 0x41, 0x6a, 0xc0, 0x48, 0x34, 0x81, 0x8a, -0x06, 0x90, 0x4a, 0x8c, 0x10, 0x14, 0x89, 0x56, 0x5d, 0x22, 0x51, 0xda, -0xaa, 0x21, 0x9b, 0xe0, 0xa4, 0x69, 0x12, 0xdb, 0xeb, 0x64, 0xbd, 0xf6, -0xee, 0x7a, 0xff, 0xcd, 0xee, 0xcc, 0xce, 0xcc, 0x39, 0xbf, 0xf3, 0xe3, -0xe1, 0xdc, 0xd9, 0x5d, 0x68, 0xa5, 0xcc, 0xce, 0x5a, 0xa9, 0x7a, 0xa5, -0x9f, 0xe6, 0xce, 0x8e, 0xe6, 0xde, 0xef, 0xe7, 0xfc, 0xbe, 0xe7, 0xf7, -0x3b, 0xe7, 0xce, 0x1a, 0x55, 0xe5, 0x27, 0xf9, 0xb0, 0x3f, 0x6e, 0x01, -0x07, 0x3d, 0xd2, 0x5b, 0x75, 0xa1, 0xb5, 0xbf, 0xf8, 0x54, 0x43, 0x24, -0x9c, 0xf1, 0x5e, 0xce, 0x78, 0x91, 0x8f, 0x3b, 0x2f, 0x53, 0xce, 0x0b, -0xde, 0xcb, 0x9c, 0xf3, 0xf2, 0xaa, 0xf7, 0x72, 0xc1, 0x79, 0xb9, 0x70, -0xdf, 0x1f, 0xbf, 0xb9, 0x7e, 0xab, 0xee, 0x09, 0x60, 0x6e, 0x85, 0x85, -0xda, 0x5f, 0x7a, 0xe4, 0x9c, 0x97, 0xf0, 0xa4, 0xf7, 0xd2, 0xf0, 0x5e, -0x70, 0x65, 0xfc, 0xd0, 0xb9, 0x93, 0x75, 0xe7, 0xe5, 0x99, 0xfb, 0xff, -0xf4, 0xad, 0x73, 0x07, 0x97, 0x1e, 0x8f, 0x03, 0x01, 0xf8, 0x2f, 0x3f, -0xd6, 0xc0, 0x98, 0x17, 0x45, 0xe4, 0xd4, 0x1e, 0x91, 0x38, 0x2f, 0x24, -0x63, 0x35, 0xbc, 0x17, 0x36, 0x17, 0xd7, 0x76, 0x20, 0x5c, 0xf9, 0xb9, -0xf7, 0x32, 0xe3, 0xbc, 0xfc, 0xfa, 0xc3, 0xcf, 0xce, 0x1d, 0x38, 0x1b, -0x43, 0x03, 0x74, 0x9e, 0x7f, 0xb4, 0x91, 0xa5, 0xc9, 0x37, 0x8d, 0x35, -0xd3, 0xbe, 0x14, 0x6d, 0x8e, 0x1f, 0xa1, 0x72, 0xd7, 0x31, 0xd2, 0xd1, -0xdb, 0x40, 0x2b, 0xe0, 0xba, 0xb0, 0x75, 0x93, 0xce, 0xb5, 0x6b, 0x2c, -0x5e, 0x5a, 0xe0, 0xc6, 0xfc, 0x6a, 0x1f, 0x00, 0xe7, 0x65, 0xd6, 0x79, -0x7f, 0xfa, 0xb1, 0xbf, 0x9c, 0x3f, 0x10, 0xc4, 0xd0, 0x73, 0x20, 0xa8, -0xbe, 0x28, 0x21, 0x4c, 0x13, 0x20, 0xa4, 0x96, 0xe2, 0x97, 0x3f, 0x41, -0x32, 0xf9, 0x61, 0x28, 0x7e, 0x1e, 0xd2, 0x11, 0xa0, 0x0b, 0x74, 0x80, -0x0e, 0xc5, 0xcf, 0x5c, 0xe3, 0xae, 0x3b, 0xff, 0x8b, 0x89, 0x8b, 0xaf, -0xf2, 0xc6, 0xec, 0x55, 0xbc, 0x17, 0x80, 0x69, 0xe0, 0x45, 0xe0, 0xf4, -0x41, 0x00, 0x86, 0xca, 0xc0, 0xfa, 0xf9, 0x4f, 0x9d, 0x4d, 0x92, 0xe4, -0xf9, 0xc4, 0x1a, 0x4c, 0x96, 0x91, 0x3f, 0xfc, 0x4b, 0xd8, 0xc9, 0x5f, -0x05, 0x7b, 0x72, 0x57, 0xf8, 0xf6, 0x65, 0x68, 0x5f, 0x03, 0xe9, 0x40, -0x5e, 0x83, 0xf1, 0x06, 0x5c, 0xbb, 0x48, 0xeb, 0x3f, 0xfe, 0x95, 0x57, -0x5e, 0xbe, 0x4a, 0xbb, 0xdd, 0xeb, 0xdb, 0xea, 0x89, 0x33, 0xcf, 0x5d, -0xff, 0xeb, 0x61, 0x01, 0x86, 0xca, 0x80, 0x48, 0x38, 0x07, 0x10, 0x82, -0xa1, 0xfe, 0xe0, 0x2f, 0x60, 0x27, 0x1f, 0x01, 0xfb, 0x51, 0xd0, 0x4d, -0xd8, 0xfe, 0x6f, 0xd8, 0xf8, 0x2e, 0xb4, 0x9b, 0xd0, 0xe9, 0x40, 0xb7, -0x1b, 0x23, 0x00, 0x77, 0xde, 0x4b, 0xfd, 0x93, 0x0f, 0xf0, 0x91, 0xce, -0x37, 0xf8, 0xee, 0xcb, 0x73, 0xf1, 0x62, 0xaa, 0xe7, 0x80, 0xa1, 0x01, -0xf6, 0xdd, 0x07, 0x16, 0x9e, 0xbe, 0xff, 0x71, 0x2f, 0x61, 0xca, 0xfb, -0x80, 0x99, 0x18, 0x23, 0x3d, 0x7a, 0x0f, 0xd8, 0x7b, 0x41, 0x5b, 0xb0, -0xf5, 0x55, 0xd8, 0xfa, 0x0e, 0xf8, 0x0e, 0xa8, 0xc6, 0x08, 0x21, 0xbe, -0x8a, 0x83, 0xcb, 0xb3, 0xd0, 0xde, 0xa4, 0x71, 0xcf, 0x49, 0x0e, 0xdd, -0x36, 0x82, 0xa2, 0xa8, 0x32, 0xf5, 0x0f, 0xbf, 0x79, 0xe4, 0xf1, 0x0f, -0x0c, 0xa0, 0xac, 0xf5, 0x38, 0x2f, 0x54, 0x4e, 0x1c, 0x87, 0xec, 0x6e, -0xa0, 0x07, 0x9b, 0xff, 0x08, 0xdb, 0x0b, 0xe0, 0x7d, 0x0c, 0x91, 0x28, -0xbe, 0x0f, 0x60, 0x2d, 0x24, 0x09, 0xac, 0xde, 0x00, 0xf1, 0xdc, 0x75, -0x47, 0x03, 0x8c, 0x45, 0x55, 0x51, 0xd5, 0x33, 0xc3, 0x02, 0xec, 0xdb, -0x42, 0x5e, 0x64, 0xda, 0xaa, 0xc5, 0x06, 0xa5, 0x98, 0x3c, 0x02, 0xf9, -0xed, 0xd0, 0x7e, 0x0d, 0xb6, 0xae, 0x44, 0xb1, 0x7d, 0x80, 0x7e, 0xf4, -0x01, 0x8c, 0x81, 0x34, 0x8d, 0x20, 0xce, 0x71, 0xf8, 0xe8, 0x38, 0x58, -0x4b, 0x88, 0x00, 0xd3, 0xc3, 0x02, 0xec, 0x3b, 0x03, 0x5e, 0xc2, 0xb4, -0xf7, 0x42, 0x32, 0x5e, 0x07, 0x33, 0x02, 0xf4, 0xe0, 0xe6, 0x7f, 0xee, -0xfa, 0xbd, 0xd7, 0x8b, 0xe1, 0xdc, 0x2e, 0x40, 0x5f, 0x7c, 0xa5, 0x02, -0x45, 0x11, 0x23, 0xcb, 0x38, 0xd4, 0x28, 0x50, 0x20, 0x1c, 0x00, 0x60, -0xff, 0x19, 0xf0, 0x82, 0x35, 0x06, 0x71, 0x3e, 0xd6, 0x79, 0xb7, 0x0c, -0xad, 0x9b, 0xf1, 0x43, 0xd5, 0x68, 0x9d, 0xbd, 0x36, 0x52, 0x8d, 0xd6, -0xa9, 0x54, 0x20, 0xcf, 0xe3, 0x39, 0x44, 0x20, 0x63, 0x08, 0x41, 0x09, -0x61, 0xf8, 0x66, 0x3a, 0x14, 0x80, 0xb1, 0x06, 0xf1, 0x25, 0x40, 0x6b, -0x21, 0x8e, 0x3c, 0xec, 0x99, 0xb0, 0xa5, 0xff, 0xfb, 0x42, 0xb3, 0x0c, -0xaa, 0xd5, 0x08, 0x60, 0x4c, 0xcc, 0x0e, 0x10, 0x24, 0x10, 0x42, 0x38, -0x10, 0xc0, 0x30, 0x16, 0x9a, 0xf1, 0x3e, 0xb0, 0x71, 0x73, 0x03, 0xb6, -0x56, 0x61, 0x6b, 0x61, 0xd7, 0x2e, 0x7b, 0x85, 0x5b, 0x1b, 0x85, 0x17, -0x05, 0xd4, 0x6a, 0x31, 0x8a, 0x62, 0x37, 0x03, 0x22, 0xdc, 0xb8, 0xd9, -0x8a, 0x00, 0x1a, 0x66, 0x3e, 0x30, 0x00, 0xe7, 0x65, 0xce, 0x97, 0xeb, -0x9e, 0xf6, 0xc2, 0x42, 0xbc, 0x42, 0x5f, 0x78, 0xbf, 0xd2, 0xa4, 0x69, -0x1c, 0xed, 0x5a, 0x0d, 0xea, 0x75, 0x18, 0x1d, 0x8d, 0x19, 0x48, 0xd3, -0x98, 0xa1, 0x6e, 0x97, 0xcd, 0xb5, 0x2d, 0x9c, 0x73, 0x88, 0x28, 0x21, -0xe8, 0xdc, 0x07, 0x06, 0xe0, 0xbd, 0xcc, 0xf4, 0xcb, 0xe8, 0xcd, 0x77, -0x97, 0x61, 0xe9, 0x52, 0xfc, 0xa0, 0x6f, 0x95, 0xa2, 0x88, 0xa2, 0x47, -0x46, 0xa2, 0xf0, 0xd1, 0xd1, 0x08, 0x52, 0xa9, 0x44, 0xf1, 0xbd, 0x1e, -0xb4, 0x5a, 0x5c, 0x9d, 0x5b, 0x46, 0x7a, 0x3e, 0x66, 0x40, 0x86, 0xcf, -0xc0, 0x30, 0x73, 0xe0, 0x82, 0x31, 0x66, 0xdd, 0x18, 0xd3, 0xb8, 0x3e, -0xbf, 0xc2, 0xf1, 0xa5, 0xeb, 0xa4, 0x13, 0xe3, 0xbb, 0xe2, 0xf3, 0x3c, -0x9e, 0xf7, 0x81, 0x92, 0x64, 0xd7, 0xf7, 0xdd, 0x2e, 0x6c, 0x6e, 0xe2, -0x56, 0xd6, 0x78, 0xeb, 0xf2, 0x12, 0x5e, 0x04, 0x09, 0x61, 0x3d, 0xa8, -0x5e, 0x18, 0x16, 0x60, 0xdf, 0x19, 0x78, 0xe0, 0xe9, 0x77, 0x36, 0xbc, -0x97, 0x0b, 0xde, 0x0b, 0x9d, 0xed, 0x1e, 0x6f, 0xbf, 0x72, 0x09, 0x36, -0x9b, 0x71, 0x0e, 0x18, 0x13, 0x05, 0x67, 0xd9, 0xae, 0x78, 0x88, 0xe2, -0xdb, 0x6d, 0x68, 0x36, 0x61, 0x65, 0x85, 0xef, 0x7d, 0xef, 0x32, 0xad, -0xcd, 0x0e, 0x22, 0x01, 0x91, 0x70, 0xe1, 0xb7, 0xfe, 0xb9, 0xbd, 0xf1, -0x81, 0x01, 0x00, 0x38, 0x91, 0x73, 0xce, 0x0b, 0xbd, 0x9e, 0x67, 0xe1, -0xda, 0x1a, 0x8b, 0x97, 0x16, 0x60, 0x63, 0x23, 0x8a, 0xec, 0xf7, 0x00, -0xe7, 0x62, 0x6f, 0x68, 0xb5, 0xa2, 0xf0, 0xb5, 0x35, 0x58, 0x5a, 0xe2, -0xbd, 0xef, 0xbf, 0xcb, 0xe5, 0xcb, 0x4b, 0x38, 0xe7, 0x11, 0x09, 0x00, -0xe7, 0x86, 0x15, 0x3f, 0x34, 0xc0, 0x23, 0xcf, 0x5e, 0xbd, 0xfa, 0xd6, -0x68, 0xb8, 0xe0, 0xbd, 0xd0, 0xeb, 0xf6, 0x98, 0x9d, 0x7d, 0x8f, 0xf9, -0xd7, 0xaf, 0xc0, 0xf5, 0xeb, 0xb0, 0xb4, 0x04, 0xab, 0xab, 0x51, 0xf0, -0xda, 0x1a, 0xac, 0xac, 0xc0, 0x8d, 0x1b, 0x30, 0x3f, 0xcf, 0xa5, 0x57, -0xde, 0xe1, 0xa5, 0x6f, 0xbd, 0x4d, 0xb7, 0xeb, 0x10, 0x09, 0x7c, 0xe3, -0x28, 0x7c, 0xee, 0xa3, 0x7c, 0xf6, 0x20, 0x00, 0x43, 0x2d, 0xa7, 0x4f, -0xbf, 0x70, 0xe2, 0x09, 0x55, 0x7d, 0xee, 0xd3, 0xdf, 0x71, 0x4c, 0x6e, -0x29, 0x60, 0xb0, 0x89, 0x61, 0xf2, 0xc8, 0x18, 0x77, 0xff, 0xec, 0x24, -0x8d, 0x23, 0xe5, 0x9c, 0x00, 0x70, 0x8e, 0x95, 0xc5, 0x75, 0x2e, 0xbe, -0x7e, 0x8d, 0x77, 0xdf, 0x5b, 0xc1, 0x79, 0x41, 0xbc, 0x70, 0xbd, 0x80, -0x2f, 0x7e, 0xd8, 0x94, 0x55, 0x28, 0xcc, 0x8a, 0xe8, 0xe9, 0x8d, 0x3f, -0xe9, 0xec, 0x7b, 0x73, 0xb3, 0x6f, 0x80, 0x87, 0xfe, 0xfe, 0xa7, 0x9f, -0x00, 0x9e, 0x0b, 0x41, 0xc9, 0x7a, 0x81, 0xcf, 0xbe, 0xd4, 0x25, 0x77, -0xca, 0xce, 0x55, 0xac, 0xa1, 0x5e, 0x2f, 0xa8, 0xd7, 0x52, 0x42, 0x50, -0x9a, 0x9b, 0x5d, 0x36, 0x9a, 0xdb, 0x88, 0xf3, 0x71, 0xd2, 0x4a, 0xa0, -0x93, 0xc2, 0xd3, 0x1f, 0x49, 0x68, 0xa1, 0xfd, 0x32, 0x8a, 0x48, 0x98, -0x0d, 0x41, 0x4f, 0x6f, 0x7e, 0xa1, 0xbb, 0x2f, 0x88, 0x7d, 0x01, 0x9c, -0x7e, 0xe1, 0xc4, 0xb4, 0xb5, 0xe6, 0x9b, 0x40, 0x23, 0x04, 0xc5, 0x26, -0x86, 0xa9, 0x4a, 0xca, 0x03, 0x2f, 0x39, 0xf2, 0x1b, 0x4d, 0x50, 0xe2, -0xea, 0x12, 0x83, 0x6a, 0x29, 0x4c, 0xc3, 0xff, 0xe9, 0xb8, 0xcb, 0x87, -0x2c, 0x5f, 0x7b, 0xb0, 0xc2, 0x7c, 0xaa, 0xb8, 0x05, 0xa1, 0xd7, 0x94, -0x72, 0x32, 0x2b, 0x21, 0xe8, 0xcc, 0xe6, 0x17, 0xba, 0xfb, 0xda, 0xa1, -0xed, 0x6b, 0x0e, 0x84, 0xa0, 0xcf, 0x89, 0x68, 0x43, 0x44, 0xc9, 0xf2, -0x84, 0xa9, 0x7b, 0x1a, 0x3c, 0xfa, 0xc9, 0xdf, 0xe1, 0x57, 0xfe, 0x70, -0x86, 0x3b, 0x1e, 0xfe, 0x4c, 0xb9, 0xc3, 0x0a, 0x38, 0xe7, 0x63, 0x78, -0x8f, 0x2f, 0xf7, 0xc0, 0x21, 0x28, 0xaf, 0x7e, 0x2c, 0xe7, 0xab, 0xbf, -0x56, 0x65, 0xf5, 0x70, 0x4a, 0x3e, 0x9e, 0x51, 0xbd, 0x3b, 0x23, 0xbf, -0x33, 0xc3, 0x5a, 0xd3, 0xbf, 0xc5, 0xa9, 0xda, 0x53, 0x95, 0xb3, 0xfb, -0xd1, 0x34, 0x70, 0x06, 0xee, 0xff, 0x9b, 0x9f, 0x7a, 0xd2, 0x18, 0xf3, -0xb4, 0x31, 0x50, 0x54, 0x53, 0x4e, 0xde, 0x7b, 0x1b, 0x9f, 0xfe, 0xd0, -0xe7, 0xf9, 0xc5, 0xb1, 0xc7, 0xe8, 0x69, 0x8f, 0xd7, 0xb7, 0xbe, 0xcd, -0xd7, 0xdf, 0xfc, 0x2b, 0xda, 0x5f, 0x9f, 0x61, 0x62, 0x6e, 0x9b, 0xb1, -0x1b, 0x3d, 0x82, 0x2a, 0x6b, 0x47, 0x52, 0xae, 0xdf, 0x91, 0xf1, 0xda, -0xc7, 0x2a, 0xac, 0xd5, 0xc0, 0xc7, 0xe5, 0x33, 0xc6, 0x58, 0xc0, 0xe2, -0x83, 0xd0, 0x5c, 0xec, 0xd0, 0x7e, 0xbb, 0x8b, 0x73, 0x81, 0x10, 0x74, -0x3d, 0x84, 0x70, 0xa2, 0xf3, 0x67, 0x7e, 0x20, 0x2b, 0x0d, 0xd4, 0xc8, -0xee, 0xfb, 0xd2, 0x1d, 0x0d, 0x63, 0xcc, 0x39, 0x63, 0x20, 0x49, 0x0d, -0x47, 0xa7, 0x46, 0x78, 0xe8, 0xd0, 0x67, 0xf8, 0xc4, 0xd8, 0xc3, 0x78, -0x1c, 0xff, 0x7e, 0xf3, 0x05, 0xfe, 0x6e, 0xfe, 0x19, 0xbc, 0x0d, 0xf8, -0x87, 0xc6, 0x71, 0x32, 0x82, 0x0b, 0x01, 0x2f, 0x01, 0x27, 0x01, 0x1f, -0x04, 0x27, 0x01, 0x95, 0x80, 0x86, 0x80, 0xb1, 0x09, 0x49, 0x92, 0x90, -0x25, 0x29, 0xd6, 0xe4, 0x98, 0x63, 0x16, 0x59, 0x0b, 0xf8, 0x1b, 0x3d, -0x20, 0x34, 0x54, 0x79, 0x9c, 0x01, 0xb7, 0x99, 0x03, 0x01, 0x84, 0xa0, -0x67, 0x8d, 0xa1, 0x61, 0x8c, 0xd2, 0x38, 0x52, 0xe3, 0x58, 0xed, 0x04, -0xa7, 0x0e, 0xff, 0x06, 0xed, 0xd0, 0xe2, 0xcb, 0xef, 0xfe, 0x11, 0xdf, -0x5a, 0xfd, 0x37, 0x24, 0x28, 0x12, 0x02, 0x3e, 0x84, 0xf2, 0x3c, 0x46, -0xd0, 0xe8, 0xfd, 0xa0, 0xbb, 0x61, 0x51, 0x52, 0x6b, 0xa9, 0xa4, 0x19, -0x79, 0x96, 0x91, 0xa6, 0x09, 0xbd, 0x93, 0x42, 0x67, 0xd5, 0xe1, 0xdb, -0x40, 0xec, 0x0d, 0x03, 0x01, 0x0c, 0x34, 0x07, 0x44, 0xf4, 0x29, 0x11, -0x85, 0xc4, 0x90, 0x37, 0x12, 0x1e, 0x3d, 0x7a, 0x96, 0x6d, 0x69, 0xf3, -0xb5, 0xc5, 0xaf, 0x30, 0xb3, 0xfc, 0x2f, 0x74, 0xbd, 0xa7, 0xe7, 0x3d, -0x3d, 0x11, 0x7a, 0x22, 0xb8, 0x20, 0x78, 0x89, 0x30, 0x3e, 0x28, 0x7e, -0x07, 0x28, 0x20, 0xaa, 0x44, 0xd7, 0x5a, 0xf2, 0x2c, 0xa5, 0x5e, 0x14, -0x8c, 0x55, 0xeb, 0x8c, 0x8f, 0xd6, 0xc8, 0x6f, 0xcf, 0x00, 0x83, 0x2a, -0x53, 0xe9, 0x6f, 0xdb, 0x81, 0x36, 0x39, 0xef, 0x9b, 0x81, 0xe9, 0x67, -0x8f, 0x4d, 0x1b, 0x63, 0xa6, 0x8c, 0x51, 0xf2, 0xdb, 0x32, 0x3e, 0x54, -0xdc, 0xcd, 0xf1, 0xda, 0x49, 0xde, 0xde, 0xba, 0xc8, 0xdf, 0x5e, 0xf9, -0x62, 0x7f, 0x63, 0x5e, 0x8e, 0x6e, 0xd8, 0x15, 0x1a, 0xb4, 0x04, 0x08, -0x31, 0x33, 0x12, 0x5f, 0x43, 0x09, 0x90, 0x24, 0x96, 0x4a, 0x96, 0x51, -0xcb, 0x73, 0x82, 0x2a, 0x1d, 0xef, 0xc8, 0x27, 0x9b, 0xd8, 0x2b, 0x1d, -0xbc, 0x57, 0x54, 0x79, 0x10, 0x98, 0x3d, 0x30, 0x80, 0x88, 0x3e, 0x6e, -0x4c, 0x5c, 0xe6, 0x68, 0x55, 0xf9, 0xb9, 0xc6, 0x7d, 0xb4, 0xa5, 0xc5, -0x57, 0xae, 0xfc, 0x39, 0x1d, 0xe7, 0x50, 0xd8, 0x03, 0x50, 0x46, 0x39, -0xd2, 0x7d, 0xf1, 0x12, 0x34, 0x02, 0x94, 0x05, 0xc3, 0x5a, 0x4b, 0x25, -0x49, 0xa9, 0x56, 0x72, 0x6a, 0x79, 0x0e, 0x40, 0xd7, 0x79, 0xf2, 0x5a, -0x86, 0x29, 0x2c, 0xda, 0x15, 0x54, 0x39, 0x05, 0x3c, 0x73, 0x60, 0x80, -0x10, 0xf4, 0x94, 0x31, 0x8a, 0xad, 0x59, 0x9c, 0x06, 0x8e, 0xd5, 0xa6, -0xf8, 0x9f, 0xb5, 0x97, 0x79, 0x63, 0xed, 0x22, 0xfd, 0x0a, 0x56, 0xee, -0x6b, 0x63, 0xed, 0xd7, 0x5d, 0xef, 0xef, 0xcd, 0x46, 0x28, 0x37, 0xf6, -0x59, 0x92, 0x52, 0x54, 0x2a, 0xd4, 0x8a, 0x82, 0xb1, 0x6a, 0x95, 0x91, -0xa2, 0x40, 0x24, 0x50, 0xc9, 0x32, 0x2a, 0x69, 0x86, 0xa9, 0x02, 0x1b, -0x8a, 0xaa, 0x4e, 0xbd, 0x9f, 0xb6, 0x81, 0x00, 0x44, 0x74, 0xca, 0x18, -0x30, 0x05, 0xf8, 0x00, 0x79, 0x5a, 0xe5, 0xdb, 0xf3, 0x2f, 0x11, 0x94, -0xb2, 0x51, 0x29, 0xaa, 0x01, 0x51, 0xca, 0xdd, 0x95, 0xee, 0xd8, 0xa4, -0x0f, 0x85, 0x31, 0x58, 0x6b, 0x49, 0x93, 0x84, 0x6a, 0xa5, 0x60, 0xac, -0x56, 0x67, 0xa2, 0x3e, 0xc2, 0x58, 0xad, 0x4e, 0xad, 0x52, 0xa1, 0xe3, -0x1c, 0xa9, 0xb5, 0x24, 0xd6, 0x62, 0xaa, 0xb6, 0x9c, 0x23, 0xdc, 0x9a, -0x39, 0x10, 0x42, 0x98, 0x02, 0x83, 0x0d, 0x71, 0xb9, 0xd0, 0xd5, 0x6d, -0xde, 0xdb, 0xbe, 0x4c, 0x9a, 0x66, 0x88, 0x04, 0x34, 0x08, 0x12, 0x4c, -0xf9, 0xe8, 0x04, 0x50, 0xc5, 0x98, 0x78, 0x1e, 0x17, 0xd3, 0x86, 0xc4, -0x5a, 0xb2, 0x34, 0xa5, 0xc8, 0x2a, 0x8c, 0x56, 0x6b, 0x4c, 0x8c, 0x8c, -0x70, 0x68, 0x74, 0x94, 0xb1, 0x5a, 0x8d, 0xc4, 0x18, 0x7a, 0xde, 0xef, -0xc0, 0x6b, 0xd9, 0xcd, 0x07, 0x3d, 0x06, 0xc9, 0x00, 0xc6, 0x28, 0xbe, -0x6b, 0xc1, 0x58, 0x7e, 0xd0, 0xbc, 0x88, 0x37, 0x1d, 0x46, 0x8a, 0x2a, -0x12, 0x02, 0x4e, 0x04, 0x5f, 0x56, 0x9d, 0xa0, 0x71, 0xe9, 0x40, 0xf9, -0x18, 0xc8, 0x60, 0x49, 0x12, 0xbb, 0x63, 0x9b, 0x7a, 0x5e, 0x30, 0x56, -0xab, 0x31, 0x51, 0xaf, 0x33, 0x56, 0xab, 0x92, 0x67, 0x95, 0x58, 0xbd, -0xbc, 0x67, 0xdb, 0x39, 0xba, 0xce, 0x21, 0x1d, 0x19, 0x58, 0xfc, 0xa0, -0x00, 0x73, 0xc6, 0x30, 0x65, 0xda, 0x42, 0xd7, 0x0b, 0x3f, 0xd8, 0x78, -0x8d, 0x6a, 0x25, 0x27, 0x4b, 0x53, 0x8c, 0x31, 0xd1, 0xe3, 0x22, 0x3b, -0x15, 0x27, 0x8e, 0x5e, 0xec, 0xb4, 0x89, 0x4d, 0xc8, 0xd2, 0x84, 0x3c, -0x8d, 0xd5, 0xa6, 0x9e, 0xe7, 0xd4, 0x8b, 0x9c, 0x5a, 0xf9, 0x7d, 0x09, -0x81, 0x76, 0xb7, 0xcb, 0xc6, 0xf6, 0x36, 0x1b, 0xad, 0x16, 0xad, 0x4e, -0x07, 0xb7, 0x26, 0x7d, 0x0b, 0xcd, 0xdd, 0x12, 0x80, 0x10, 0xc2, 0x2c, -0x98, 0x29, 0xda, 0x81, 0xed, 0xe5, 0x2e, 0x6f, 0xe4, 0xdf, 0xe7, 0x78, -0xe3, 0x30, 0x69, 0x92, 0x90, 0x67, 0x29, 0xd6, 0xd8, 0x58, 0xa1, 0xe2, -0xaa, 0x1a, 0x00, 0x4b, 0xe9, 0x79, 0x6b, 0x49, 0x92, 0x84, 0x4a, 0x9a, -0x92, 0xa5, 0x69, 0x7c, 0x4d, 0x12, 0x4c, 0x69, 0x9b, 0x56, 0xa7, 0xc3, -0xca, 0xe6, 0x26, 0xcb, 0xcd, 0x26, 0x8b, 0xcd, 0x26, 0x9b, 0x0b, 0x1d, -0x64, 0x3b, 0xf4, 0x6f, 0xfd, 0xbe, 0x25, 0x74, 0x20, 0x00, 0x11, 0xbd, -0x00, 0x7a, 0x26, 0x04, 0x08, 0xd7, 0x61, 0x29, 0xdb, 0x40, 0x55, 0x99, -0x1c, 0x1f, 0x07, 0x53, 0xa3, 0xc8, 0x2c, 0x59, 0x92, 0x90, 0xd8, 0x84, -0xc4, 0x5a, 0xac, 0xd9, 0x23, 0xbe, 0x0c, 0x5b, 0xfe, 0xdd, 0x00, 0xae, -0xb4, 0xcc, 0x56, 0xb7, 0xcb, 0xfa, 0xd6, 0x16, 0x8b, 0xcd, 0x26, 0xd7, -0x56, 0x57, 0x59, 0x5e, 0xdc, 0x60, 0xfb, 0x52, 0x6f, 0xaf, 0xff, 0x07, -0xda, 0x27, 0x0f, 0x04, 0x60, 0x0c, 0xeb, 0x40, 0x43, 0xbb, 0x9e, 0xf4, -0x8a, 0xb2, 0xd8, 0x5a, 0xa7, 0x79, 0x7b, 0x87, 0xc3, 0x63, 0x63, 0x4c, -0xd4, 0xeb, 0x8c, 0xe4, 0x39, 0x45, 0xa5, 0xb2, 0x33, 0xc2, 0x18, 0x13, -0x6b, 0x7e, 0x7f, 0x62, 0x8a, 0x10, 0x42, 0xc0, 0x8b, 0xd0, 0x75, 0x8e, -0x56, 0x69, 0x9b, 0x9b, 0xcd, 0x26, 0x8b, 0x1b, 0x1b, 0xac, 0x5c, 0xdb, -0xa4, 0xf5, 0x66, 0x87, 0xe0, 0x76, 0x46, 0x7f, 0x7d, 0x50, 0x80, 0x81, -0x56, 0xa3, 0x93, 0x9f, 0x1f, 0x79, 0x10, 0x98, 0x31, 0x7d, 0x8b, 0x58, -0x43, 0x52, 0x4b, 0x31, 0x93, 0x86, 0x62, 0x22, 0x67, 0xb4, 0x5e, 0x65, -0xb4, 0x5a, 0xa5, 0x9e, 0xe7, 0xd4, 0x4a, 0x90, 0x24, 0x49, 0xb0, 0xc4, -0x1e, 0xd1, 0x9f, 0xec, 0x9d, 0x5e, 0x8f, 0xad, 0x6e, 0x97, 0xcd, 0x76, -0x3b, 0xfa, 0x7e, 0xbd, 0xc5, 0xd6, 0x3b, 0x5d, 0x3a, 0x4b, 0x8e, 0x10, -0xc2, 0xde, 0x5b, 0x9e, 0xd1, 0xf3, 0xfa, 0x4f, 0xb7, 0x0c, 0x00, 0xe0, -0xf0, 0xe7, 0x6a, 0x67, 0x81, 0xe7, 0x77, 0xbe, 0x68, 0xc0, 0x18, 0x83, -0xb5, 0x09, 0x66, 0xdc, 0x60, 0x47, 0x13, 0xb2, 0x7a, 0x42, 0x3a, 0x92, -0x90, 0xa5, 0xe9, 0x8e, 0x9d, 0x20, 0xf6, 0x03, 0x27, 0x42, 0xcf, 0x7b, -0xba, 0x5b, 0x8e, 0xce, 0x6a, 0x8f, 0xee, 0xb2, 0xa7, 0xb7, 0x1a, 0xf7, -0xc6, 0xff, 0x4f, 0xc2, 0x53, 0x7a, 0x5e, 0xdf, 0xb7, 0x03, 0xef, 0x1b, -0x00, 0x60, 0xe2, 0x0f, 0xaa, 0x1f, 0x2f, 0x21, 0x76, 0x9a, 0x4c, 0xff, -0xc9, 0x79, 0x84, 0x32, 0x3b, 0x11, 0x6a, 0xfd, 0xb6, 0x50, 0x76, 0xe7, -0x6d, 0x25, 0x74, 0x04, 0xef, 0xcb, 0xa5, 0xc6, 0x0f, 0x0b, 0x07, 0x78, -0x42, 0xcf, 0xeb, 0xbe, 0x7e, 0xad, 0x19, 0x6a, 0x53, 0x3f, 0xfe, 0xfb, -0xc5, 0x93, 0xaa, 0x9c, 0x03, 0x1a, 0xa0, 0x3b, 0x42, 0xfa, 0x4d, 0xa8, -0x5f, 0x95, 0xfa, 0xef, 0xe3, 0x33, 0xdf, 0x72, 0x59, 0x1d, 0x7e, 0x64, -0xa3, 0x9a, 0x2d, 0xc5, 0xbf, 0xba, 0x5f, 0x2d, 0x07, 0xfa, 0x9d, 0xb8, -0xfe, 0x7b, 0x95, 0xb3, 0xc0, 0x19, 0xe0, 0x4c, 0xbc, 0xcc, 0x6e, 0x27, -0xdd, 0x0b, 0xd0, 0x7f, 0xff, 0x23, 0x9e, 0x42, 0xcf, 0x00, 0xcf, 0xef, -0x77, 0xd4, 0xf7, 0x1e, 0xb7, 0xe4, 0x97, 0xfa, 0xe2, 0x77, 0xd3, 0x71, -0x55, 0xa6, 0x81, 0x53, 0xaa, 0x9c, 0x2a, 0x05, 0x9f, 0xda, 0x05, 0x51, -0x88, 0x8d, 0x69, 0x8e, 0x38, 0xda, 0xb3, 0xc0, 0x8c, 0x9e, 0xd7, 0xab, -0x07, 0xbd, 0xf7, 0x2d, 0x01, 0xf8, 0x71, 0x1e, 0x3f, 0xf1, 0xff, 0xad, -0xf2, 0xbf, 0xbd, 0x42, 0x09, 0x81, 0x50, 0xaf, 0xf9, 0xba, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm deleted file mode 100644 index ea09e14ab3..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm +++ /dev/null @@ -1,228 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_pad_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 174 2", -" c #78110C", -". c #6D1511", -"X c #7F332E", -"o c #763E3B", -"O c #8D0C05", -"+ c #8A140D", -"@ c #961A14", -"# c #A50500", -"$ c #A90000", -"% c #AC0C03", -"& c #B60300", -"* c #BB0600", -"= c #B70E05", -"- c #BB0A00", -"; c #A3160E", -": c #AA170E", -"> c #AB180F", -", c #A41911", -"< c #AF1C12", -"1 c #AC1F18", -"2 c #B51D14", -"3 c #BA1E16", -"4 c #92221C", -"5 c #9D241D", -"6 c #A3241C", -"7 c #AC241A", -"8 c #B1241C", -"9 c #BA241B", -"0 c #B32C1E", -"q c #BB2A1F", -"w c #8F2F29", -"e c #922721", -"r c #9F2620", -"t c #9F2E27", -"y c #993029", -"u c #9C3B35", -"i c #A22E27", -"p c #A6322B", -"a c #A9342D", -"s c #B23222", -"d c #B1362B", -"f c #BA3029", -"g c #B43829", -"h c #A83D36", -"j c #C6261D", -"k c #CA251C", -"l c #D2251D", -"z c #A7433D", -"x c #8C5552", -"c c #9E5551", -"v c #A04843", -"b c #AC4943", -"n c #A74E48", -"m c #AB4E49", -"M c #BC4640", -"N c #B44B45", -"B c #BB4C45", -"V c #A1534E", -"C c #AF524C", -"Z c #BB544A", -"A c #BF5B49", -"S c #AA5651", -"D c #B05A54", -"F c #9B6F6D", -"G c #AC6661", -"H c #AC6B67", -"J c #B96762", -"K c #BE6862", -"L c #AE726F", -"P c #B9706B", -"I c #B57673", -"U c #B27D79", -"Y c #BA7F7B", -"T c #C5564F", -"R c #C46756", -"E c #C36861", -"W c #C06E69", -"Q c #C27D7A", -"! c #B3817E", -"~ c #CF8577", -"^ c #C3837F", -"/ c #CA837C", -"( c #979695", -") c #9D9C9C", -"_ c #AF8481", -"` c #AF8C8A", -"' c #B68582", -"] c #BE8581", -"[ c #BC8987", -"{ c #B38C8A", -"} c #BD8D89", -"| c #B2918F", -" . c #B9918E", -".. c #A09F9E", -"X. c #BC9592", -"o. c #B99A97", -"O. c #BA9A98", -"+. c #A1A09F", -"@. c #B1A09F", -"#. c #A4A3A3", -"$. c #A8A7A7", -"%. c #A9A8A7", -"&. c #ACABAB", -"*. c #B3A5A4", -"=. c #B0AFAF", -"-. c #BFACAB", -";. c #B1B0AF", -":. c #B3B2B2", -">. c #BAB5B5", -",. c #B8B8B7", -"<. c #BCBBBB", -"1. c #CB8481", -"2. c #CC8A81", -"3. c #C48E8A", -"4. c #C69592", -"5. c #CB9693", -"6. c #CB9895", -"7. c #CA9B99", -"8. c #DA9A97", -"9. c #D49D9B", -"0. c #DAA89D", -"q. c #C4A4A2", -"w. c #CBAAA9", -"e. c #D3AEAC", -"r. c #C6B4B3", -"t. c #CAB6B5", -"y. c #C2BFBE", -"u. c #CABBBA", -"i. c #D5B6B4", -"p. c #DBB3B0", -"a. c #DFBBB7", -"s. c #D2BDBC", -"d. c #D9BBB9", -"f. c #E1BEB8", -"g. c #C2C0BF", -"h. c #E4C0B6", -"j. c #C4C3C3", -"k. c #C9C7C6", -"l. c #C7C9C9", -"z. c #CCCBCB", -"x. c #D2C4C3", -"c. c #DCC4C3", -"v. c #D1CFCE", -"b. c #DECECD", -"n. c #DBD0CF", -"m. c #CFD3D3", -"M. c #D4D3D3", -"N. c #D8D7D7", -"B. c #D8D8D7", -"V. c #D5DADA", -"C. c #DBDBDB", -"Z. c #E1C7C5", -"A. c #E0D0CF", -"S. c #E4D4D3", -"D. c #E9D5D3", -"F. c #E1DFDE", -"G. c #E9D9D8", -"H. c #EBE1DF", -"J. c #DDDFE0", -"K. c #DDE2E2", -"L. c #E3E3E3", -"P. c #E9E6E5", -"I. c #EBE8E6", -"U. c #E0E7E8", -"Y. c #E6E9EA", -"T. c #ECECEC", -"R. c #F0EFEF", -"E. c #ECEFF0", -"W. c #EDF2F3", -"Q. c #EEFCFD", -"!. c #F3F3F4", -"~. c #F4FBFB", -"^. c #FAFDFD", -"/. c None", -/* pixels */ -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/././././././././././././././././././././.!././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././.T./././././././.C.N.M.k.z./././././././././././././././.", -"/././././././././././././././././././.L./././././././.M.B.C.J.K.U.L.L.P.I.!././././././././././.", -"/./././././././././././././././././.P././././././././.v.M.M.] N D c.T.T.W.W.W./././././././././.", -"/././././././././././././././././././././././././././.g.l.m.u - O w.~.H./ W d.W././././././././.", -"/././././././././././././././././.N./././././././././.<.M.K.k.` -.T.^.X.& & n T.!./././././././.", -"/././././././././././././././././.M././././././.C.z.&.<.N.s.b.!.!.!.~.C.L G s.!.T./././././././.", -"/././././././././././././././././.l./././.T.L.C.M.M.:.j.I k 3 7.~.~.~.^.^.^.~.T.T./././././././.", -"/././././././././././././././././.j.T.I.P.L.L.L.K.C.,.j.F 1 6 q.~.Z.T N p.^.!.R.T.!././././././.", -"/././.L.C.M.l././././././././.T.I.P.I.I.I.I.T.Y.C.n.k.<.V.,.g.W.^.U * # G ^.!.T.T.T././././././.", -"/./.C.L.L.C.M.C././././.F.C.L.P.I.T.W.T.T.!.u.M f } L.<.' b h D c.U.o.X.L.!.T.T.T.T.!./././././.", -"/.B.L.F.C.L.T.Y.L.P.L.C.N.C.L.I.W.F.H.!.!.~.y.v 9.Y.K.! ; 2 9 : t x.~.~.!.T.I.T.T.T.T./././././.", -"/.z.M.N.L.b.] e.W.W.W.I.L.L.I.I.8.6 P ^.~.!.T.C.V.L.j.z 3 k k j : ' V.P.L.L.I.T.T.T.T.!././././.", -"/.j.N.L.N.a # ^ ^.d.5.T.I.L.E.t.C G A.!.C.M.B.Y.T.M.*.4 k l l k 2 S V.z.N.L.L.T.T.T.T.T././././.", -"M.z.B.P.W.{ @ 3.D.k 7 S.W.L.V.r.{ .x.C.L.!.G.6.S.V.@.. 9 k k j < Z K.z.M.C.L.P.T.T.T.T.!./././.", -",.M.K.x.J Q | F.O.y w b.T.l._ 5 , , r X.K.!.B $ H V.v.X + 8 q 0 s 2.U.j.k.M.C.L.I.T.T.T.T./././.", -",.M.L.*.% = i.4.D C.Y.!.l.>.i 2 j j 3 p k.K.} V x.z.M.s.h 7 g R 0.P.L.<.<.z.N.L.L.T.T.T.T.!././.", -">.M.F.M.u 1.Q.m * B !.L.j.F , j l l k : Y C.W.W.T.z.&.C.P.a.f.H.W.L.C.,.:.k.M.C.L.P.T.T.T.T././.", -":.M.B.L.V.E.W.c d [ !.C.l.o @ k l l j > K K.C.C.B.M.$.&.l.C.U.J.B.B.C.:.&.<.z.M.C.L.I.T.T.T.!./.", -",.y.B.C.I.T.T.L.U.~.!.C.M.x 8 j j q 0 / U.M.M.M.M.:.&.<.k.z.M.N.B.C.$.#.:.j.z.N.L.L.T.T.T.T./.", -"<.+.z.C.L.P.I.T.T.T.T.L.V.t.e ; 7 g A ~ S.L.k.<.j.j.%.=.<.k.M.M.N.B.C.#.( &.>.k.M.C.L.P.T.T.T.!.", -";.) &.j.M.F.L.P.P.P.L.L.j.V.c.E Z ~ h.I.Y.C.,.j././.%.&.<.k.M.M.N.B././.) ) &.<.z.M.C.L.I.T.T.T.", -"/.+.%.;.,.j.z.M.N.N.N.C.z.%.M.Y.P.T.T.L.B.C./././././.<.<.k.M.M.C././././.#.#.:.y.z.N.L.L.T.T.T.", -"/...&.:.<.j.z.v.M.M.N.C.B.&.&.<.z.N.M.M.B.F././././././././././././././././.$.#.>.k.M.C.L.P.T.T.", -"/.) &.:.<.j.z.M.M.M.N.B.C.g.&.<.k.M.M.N.N.L./././././././././././././././././.=.%.<.z.M.C.L.I.!.", -"/.#.%.:.<.j.z.M.M.M.N.B.C.z.;.<.k.M.M.N.N.T././././././././././././././././././.<.&.<.z.N.C.P./.", -"/.&.%.:.<.j.z.M.M.M.N.B.C.M.&.,.k.M.M.M.L./././././././././././././././././././././.j.z.N.P././.", -"/.&.$.:.<.j.z.M.M.M.N.B.C.L./.j.k.M.C./././././././././././././././././././././././././././././.", -"/.=.%.:.<.j.z.M.M.M.N.B.B.T././././././././././././././././././././././././././././././././././.", -"/.<.$.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/.v.#.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.%.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.L./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.L./././././././././././././././././././././././././././././././././././.", -"/./.,.=.<.j.z.M.M.M.N.B././././././././././././././././././././././././././././././././././././.", -"/./.k.&.<.j.z.M.M.M.N.B././././././././././././././././././././././././././././././././././././.", -"/././.:.,.j.z.M.M.M.N.L././././././././././././././././././././././././././././././././././././.", -"/./././.,.j.z.M.M.M.B./././././././././././././././././././././././././././././././././././././.", -"/././././.k.z.M.M.C././././././././././././././././././././././././././././././././././././././.", -"/./././././.B.N././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c b/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c deleted file mode 100644 index 03188b6dff..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c +++ /dev/null @@ -1,174 +0,0 @@ -static const unsigned char toolbar_plugin_wiimote_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, -0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xF9, -0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7C, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0B, 0x12, 0x00, 0x00, 0x0B, -0x12, 0x01, 0xD2, 0xDD, 0x7E, 0xFC, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6F, -0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x4D, 0x61, 0x63, 0x72, 0x6F, 0x6D, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x20, 0x4D, 0x58, 0x20, 0x32, -0x30, 0x30, 0x34, 0x87, 0x76, 0xAC, 0xCF, 0x00, 0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, -0x72, 0x65, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x00, 0x39, 0x2F, 0x31, -0x31, 0x2F, 0x30, 0x34, 0x0E, 0x46, 0xED, 0x55, 0x00, 0x00, 0x0A, 0x05, 0x49, 0x44, 0x41, 0x54, -0x78, 0x9C, 0xD5, 0x9A, 0x59, 0x6C, 0x5C, 0x57, 0x19, 0xC7, 0x7F, 0xE7, 0xDE, 0x3B, 0xE3, 0xF1, -0x32, 0xF6, 0x38, 0x8B, 0xB3, 0x37, 0x4E, 0x93, 0x66, 0x81, 0x46, 0x75, 0xD3, 0x06, 0x4A, 0xD5, -0x25, 0xA9, 0x68, 0x84, 0x2A, 0x44, 0x52, 0x21, 0xCA, 0x26, 0x91, 0xF4, 0xA1, 0x88, 0x17, 0x48, -0x49, 0x85, 0x90, 0x78, 0xC1, 0x12, 0x0F, 0x88, 0x4A, 0x94, 0x14, 0x50, 0x04, 0x3C, 0xD0, 0x20, -0xDE, 0x80, 0x36, 0x2E, 0x81, 0x8A, 0xAD, 0xAA, 0x8B, 0x44, 0x4B, 0xB7, 0xC4, 0x69, 0xB6, 0x36, -0x8D, 0x13, 0x27, 0xB1, 0x1D, 0xC7, 0xF1, 0x32, 0xB6, 0x67, 0xC6, 0x33, 0x73, 0xCF, 0x39, 0x1F, -0x0F, 0xE7, 0xDE, 0x8C, 0xDB, 0x20, 0x75, 0x3C, 0xB6, 0x52, 0xF5, 0x4A, 0xC7, 0x73, 0x67, 0xF1, -0xBD, 0xFF, 0xDF, 0xF9, 0xFE, 0xDF, 0x77, 0xCE, 0xE7, 0xB1, 0x12, 0x11, 0x3E, 0xCE, 0x87, 0xF7, -0x51, 0x0B, 0x98, 0xEB, 0x11, 0xCC, 0xD7, 0x85, 0xC6, 0x7F, 0xF5, 0x40, 0xC6, 0x18, 0xBB, 0x4B, -0x6B, 0xB3, 0x4B, 0x1B, 0x73, 0x5B, 0xA8, 0x4D, 0x7B, 0xA8, 0x0D, 0x5A, 0x9B, 0xBE, 0x50, 0x9B, -0x63, 0x5A, 0x9B, 0xAE, 0x50, 0x9B, 0xAE, 0xBB, 0x9E, 0x7C, 0x27, 0x3B, 0x5F, 0xF7, 0x04, 0x50, -0xF3, 0x61, 0xA1, 0xC2, 0x6F, 0x77, 0x74, 0x6A, 0x63, 0xF7, 0x6A, 0x6D, 0x32, 0x5A, 0x1B, 0xC2, -0x68, 0x5C, 0x77, 0x1E, 0x9A, 0x6C, 0xA8, 0xCD, 0xD3, 0xF7, 0x3C, 0x75, 0xA6, 0x73, 0xEE, 0xD2, -0xDD, 0x31, 0x27, 0x00, 0xFD, 0xFB, 0x87, 0x32, 0x28, 0x75, 0xC8, 0x18, 0xB3, 0x6D, 0x86, 0x48, -0x42, 0x6D, 0xF0, 0x9B, 0x1B, 0xD0, 0xDA, 0x30, 0x75, 0x65, 0xFC, 0x1A, 0x44, 0x18, 0xBD, 0xAF, -0xB5, 0xE9, 0x0E, 0xB5, 0x79, 0xF8, 0xC1, 0x03, 0x7D, 0x73, 0x8E, 0x46, 0xCD, 0x00, 0xC5, 0x83, -0x9F, 0xCB, 0x24, 0x02, 0xFF, 0x25, 0xE5, 0xA9, 0x0E, 0x1D, 0x89, 0x56, 0xCB, 0x17, 0x93, 0x5C, -0xBD, 0x94, 0x20, 0xBD, 0x00, 0x24, 0x09, 0x61, 0x09, 0x72, 0x23, 0x14, 0x07, 0x06, 0xB8, 0xD2, -0x3B, 0xC8, 0x50, 0xFF, 0x58, 0x0C, 0x40, 0xA8, 0x4D, 0x4F, 0xA8, 0xF5, 0xF6, 0x87, 0x7E, 0xD3, -0x3F, 0x27, 0x88, 0x9A, 0x73, 0xC0, 0x8A, 0x1C, 0x32, 0xD6, 0x76, 0x60, 0xC1, 0x06, 0x1E, 0xA9, -0x7B, 0xEF, 0xC0, 0x6F, 0xDB, 0x00, 0xA9, 0x2D, 0x10, 0x34, 0x01, 0x25, 0xA0, 0x08, 0x14, 0x49, -0xAD, 0x1B, 0x60, 0xF5, 0xAA, 0x57, 0x69, 0x3D, 0x71, 0x8C, 0x53, 0x3D, 0x17, 0xD0, 0xDA, 0x00, -0x74, 0x00, 0x87, 0x80, 0xED, 0x73, 0x01, 0xA8, 0x29, 0x02, 0xD9, 0x5F, 0x3F, 0xB0, 0xDB, 0xF7, -0xFD, 0x83, 0xBE, 0xA7, 0x50, 0x89, 0x04, 0x75, 0x0F, 0xDE, 0x8D, 0xD7, 0xF6, 0x79, 0xF0, 0xD6, -0x56, 0x84, 0x4F, 0x9F, 0x83, 0xC2, 0x00, 0x98, 0x22, 0xD4, 0x35, 0x40, 0x4B, 0x06, 0x06, 0x4E, -0x90, 0x7F, 0xF9, 0x05, 0x8E, 0xBE, 0x75, 0x81, 0x42, 0xA1, 0x1C, 0xDB, 0x6A, 0xCF, 0xAE, 0x67, -0x2E, 0xFF, 0xAE, 0x56, 0x80, 0x9A, 0x22, 0x60, 0x8C, 0xED, 0x04, 0xB0, 0x56, 0xD1, 0x78, 0xFF, -0x56, 0xBC, 0xB6, 0x1D, 0xE0, 0x6D, 0x06, 0x99, 0x82, 0xE9, 0x23, 0x30, 0xF1, 0x3A, 0x14, 0x26, -0xA1, 0x58, 0x84, 0x52, 0xC9, 0x0D, 0x0B, 0xAC, 0xDA, 0x44, 0xE3, 0x67, 0xEE, 0xE3, 0xD6, 0xE2, -0x8B, 0xBC, 0xFE, 0x56, 0x9F, 0xBB, 0x98, 0x48, 0x27, 0x50, 0x33, 0xC0, 0xAC, 0xD7, 0x81, 0xC1, -0xFD, 0xF7, 0xEC, 0xD4, 0xC6, 0xB6, 0x6B, 0x6D, 0x51, 0xAD, 0xCD, 0x04, 0x4B, 0x36, 0x82, 0xB7, -0x09, 0x24, 0x0F, 0xB9, 0x67, 0x21, 0xF7, 0x1A, 0xE8, 0x22, 0x88, 0xB8, 0x61, 0xAD, 0x7B, 0x34, -0x21, 0x9C, 0xEB, 0x81, 0xC2, 0x14, 0x99, 0x8D, 0x6B, 0x59, 0xB8, 0xA0, 0x09, 0x41, 0x10, 0xA1, -0xFD, 0x0F, 0x5F, 0x5F, 0xBC, 0xF3, 0x86, 0x01, 0x44, 0xB5, 0x9E, 0x50, 0x1B, 0x92, 0x6B, 0x96, -0x43, 0x62, 0x3D, 0x50, 0x86, 0xA9, 0xE7, 0x60, 0x7A, 0x10, 0xB4, 0x76, 0xC3, 0x18, 0x27, 0x3E, -0x06, 0xF0, 0x3C, 0xF0, 0x7D, 0x18, 0x1B, 0x02, 0xA3, 0x59, 0xBD, 0x32, 0x03, 0xCA, 0x43, 0x44, -0x10, 0x91, 0x5D, 0xB5, 0x02, 0xCC, 0xDA, 0x42, 0xDA, 0x98, 0x0E, 0x4F, 0x3C, 0x3C, 0x2B, 0xA4, -0xDA, 0x16, 0x43, 0xDD, 0x32, 0x28, 0xBC, 0x0D, 0xB9, 0xF3, 0x4E, 0x6C, 0x0C, 0x10, 0x8F, 0x18, -0x40, 0x29, 0x08, 0x02, 0x07, 0x12, 0x86, 0x2C, 0x5A, 0xD2, 0x02, 0x9E, 0x87, 0x75, 0x00, 0x1D, -0xB5, 0x02, 0xCC, 0x3A, 0x02, 0xDA, 0xD8, 0x0E, 0xAD, 0x0D, 0x7E, 0x4B, 0x23, 0xA8, 0x26, 0xA0, -0x0C, 0x23, 0xFF, 0xA9, 0xF8, 0xBD, 0x5C, 0x76, 0x23, 0x0C, 0x2B, 0x00, 0xB1, 0xF8, 0x64, 0x12, -0x52, 0x29, 0x37, 0x12, 0x09, 0x16, 0x66, 0x52, 0x08, 0x60, 0xE7, 0x00, 0x30, 0xFB, 0x08, 0x68, -0x83, 0xA7, 0x14, 0x26, 0xD4, 0xAE, 0xCE, 0x87, 0x57, 0x21, 0x3F, 0xE2, 0xDE, 0x14, 0x71, 0xD6, -0x99, 0x69, 0x23, 0x11, 0x67, 0x9D, 0x64, 0x12, 0xEA, 0xEA, 0xDC, 0x39, 0x38, 0x20, 0xA5, 0xB0, -0x56, 0xB0, 0xB6, 0xF6, 0xC5, 0xB4, 0x26, 0x00, 0xE5, 0x29, 0x8C, 0x8E, 0x00, 0xF2, 0x83, 0x6E, -0xE6, 0x61, 0x46, 0xC2, 0x46, 0xFE, 0x8F, 0x85, 0x26, 0x12, 0x50, 0x5F, 0xEF, 0x00, 0x94, 0x72, -0xD1, 0x01, 0xAC, 0xB1, 0x58, 0x6B, 0xE7, 0x04, 0x50, 0x8B, 0x85, 0xBA, 0xB5, 0xB6, 0x4C, 0x8C, -0x4C, 0x40, 0x6E, 0x0C, 0x72, 0x83, 0x15, 0xBB, 0xCC, 0x14, 0xEE, 0x79, 0x4E, 0x78, 0x2A, 0x05, -0x0D, 0x0D, 0x6E, 0xA4, 0x52, 0x95, 0x08, 0x18, 0xC3, 0xD0, 0x48, 0xDE, 0x01, 0x88, 0xED, 0xBE, -0x61, 0x00, 0xA1, 0x36, 0x7D, 0x3A, 0xDA, 0xF7, 0x14, 0x06, 0x07, 0xDD, 0x15, 0x62, 0xE1, 0x71, -0xA5, 0x09, 0x02, 0x37, 0xDB, 0x0D, 0x0D, 0xD0, 0xD8, 0x08, 0xE9, 0xB4, 0x8B, 0x40, 0x10, 0xB8, -0x08, 0x95, 0x4A, 0x4C, 0x8D, 0xE7, 0x08, 0xC3, 0x10, 0x63, 0x04, 0x6B, 0xA5, 0xEF, 0x86, 0x01, -0x68, 0x6D, 0xBA, 0xE3, 0x32, 0x3A, 0x72, 0xF1, 0x2A, 0x0C, 0xF7, 0xBA, 0x37, 0x62, 0xAB, 0xA4, -0x52, 0x4E, 0x74, 0x53, 0x93, 0x13, 0x9E, 0x4E, 0x3B, 0x90, 0x64, 0xD2, 0x89, 0x2F, 0x97, 0x21, -0x9F, 0xE7, 0x42, 0xDF, 0x55, 0x4C, 0x59, 0xBB, 0x08, 0x98, 0xDA, 0x23, 0x50, 0x4B, 0x0E, 0x74, -0x29, 0xA5, 0xB2, 0x4A, 0xA9, 0xCC, 0xE5, 0xFE, 0x51, 0x96, 0x0F, 0x5F, 0x26, 0x68, 0x6D, 0xA9, -0x88, 0xAF, 0xAB, 0x73, 0xE7, 0x31, 0x90, 0xEF, 0x57, 0x7C, 0x5F, 0x2A, 0xC1, 0xD4, 0x14, 0xE1, -0xE8, 0x38, 0x67, 0xCE, 0x0D, 0xA3, 0x8D, 0xC1, 0x58, 0x9B, 0xB5, 0x22, 0x5D, 0xB5, 0x02, 0xCC, -0x3A, 0x02, 0xF7, 0xED, 0x3F, 0x3B, 0xA1, 0xB5, 0xE9, 0xD2, 0xDA, 0x50, 0x9C, 0x2E, 0xF3, 0xDE, -0xD1, 0x5E, 0x98, 0x9A, 0x74, 0x39, 0xA0, 0x94, 0x13, 0x9C, 0x48, 0x54, 0xC4, 0x83, 0x13, 0x5F, -0x28, 0xC0, 0xE4, 0x24, 0x8C, 0x8E, 0xF2, 0xE6, 0x9B, 0xE7, 0xC8, 0x4F, 0x15, 0x31, 0xC6, 0x62, -0x8C, 0xED, 0xFA, 0xE6, 0xE1, 0xC2, 0xC4, 0x0D, 0x03, 0x00, 0x08, 0x8D, 0xE9, 0x0C, 0xB5, 0xA1, -0x5C, 0xD6, 0x0C, 0x0E, 0x8C, 0x73, 0xA5, 0x77, 0x10, 0x26, 0x26, 0x9C, 0xC8, 0x78, 0x0D, 0x08, -0x43, 0xB7, 0x36, 0xE4, 0xF3, 0x4E, 0xF8, 0xF8, 0x38, 0x0C, 0x0F, 0x73, 0xE9, 0xF4, 0x45, 0xCE, -0x9D, 0x1B, 0x26, 0x0C, 0x35, 0xC6, 0x58, 0x80, 0xCE, 0x5A, 0xC5, 0xD7, 0x0C, 0xB0, 0xE3, 0xC0, -0x85, 0x0B, 0x7A, 0x78, 0x51, 0x97, 0xD6, 0x86, 0x72, 0xA9, 0x4C, 0x4F, 0xCF, 0x25, 0xFA, 0x4F, -0x9E, 0x87, 0xCB, 0x97, 0x61, 0x78, 0x18, 0xC6, 0xC6, 0x9C, 0xE0, 0xF1, 0x71, 0x18, 0x1D, 0x85, -0xA1, 0x21, 0xE8, 0xEF, 0xA7, 0xF7, 0xE8, 0x59, 0xFE, 0xFD, 0xCA, 0x7B, 0x94, 0x4A, 0x21, 0xC6, -0x58, 0xF4, 0xE5, 0x0D, 0x14, 0x8F, 0x7D, 0xE1, 0xD1, 0xB9, 0x00, 0xD4, 0xB4, 0x9D, 0x7E, 0x71, -0xFD, 0xBE, 0x3D, 0x82, 0x3C, 0x53, 0xDC, 0xF2, 0x77, 0x6C, 0x63, 0x16, 0x50, 0x78, 0xBE, 0xA2, -0x6D, 0x71, 0x33, 0xEB, 0x6F, 0x69, 0x23, 0xB3, 0x38, 0xCA, 0x09, 0x80, 0x30, 0x64, 0xF4, 0x4A, -0x96, 0x13, 0x27, 0x07, 0xB8, 0x78, 0x69, 0x94, 0x50, 0x1B, 0x8C, 0x36, 0xD8, 0x42, 0x33, 0xFA, -0xCC, 0x76, 0x0C, 0x16, 0x2B, 0xD2, 0x63, 0xB1, 0xDB, 0xF7, 0x5D, 0xFA, 0xE3, 0xAC, 0x9B, 0x9B, -0x59, 0x03, 0xBC, 0xB4, 0xE1, 0x89, 0x3D, 0xC0, 0x33, 0x56, 0x04, 0xE3, 0x97, 0xC8, 0x6F, 0xF9, -0x33, 0xE2, 0x97, 0xB9, 0x76, 0x15, 0x4F, 0xD1, 0xD8, 0x98, 0xA2, 0xB1, 0x21, 0xC0, 0x5A, 0x61, -0x72, 0xAA, 0xC4, 0xC4, 0xE4, 0x34, 0x26, 0xD4, 0x2E, 0x69, 0x8D, 0x45, 0xD9, 0x24, 0xFA, 0xF4, -0x0E, 0xAC, 0x0E, 0xB0, 0x58, 0x8C, 0x08, 0x16, 0xDB, 0x63, 0x44, 0xB6, 0x7F, 0xAF, 0xFF, 0x4F, -0xB3, 0x82, 0x98, 0x55, 0x15, 0x7A, 0x71, 0xFD, 0xBE, 0x0E, 0x4F, 0xA9, 0x9F, 0xC5, 0xCF, 0x1B, -0x9A, 0x17, 0xB3, 0x61, 0xE3, 0x53, 0xBC, 0x33, 0xFC, 0x0B, 0xC6, 0x47, 0x4F, 0x82, 0x80, 0x88, -0x50, 0x2A, 0x86, 0x8C, 0x8E, 0xB8, 0x2D, 0x82, 0x11, 0xFB, 0xBE, 0x15, 0x77, 0x61, 0x6A, 0x1D, -0xDB, 0xDA, 0x9E, 0xA0, 0xD4, 0x9C, 0xE0, 0x8D, 0x77, 0x8F, 0x70, 0x71, 0x74, 0xC0, 0x95, 0xD7, -0x1A, 0x3B, 0xB4, 0x59, 0x45, 0xE0, 0x5F, 0xEB, 0xBF, 0x7B, 0x54, 0xB9, 0x1B, 0xD1, 0xB4, 0x62, -0x29, 0x77, 0x7C, 0xE7, 0x51, 0x82, 0x4D, 0x2D, 0x84, 0x8B, 0x8A, 0x1C, 0x3B, 0xF4, 0x13, 0x4E, -0xFF, 0xE3, 0x40, 0xD4, 0x06, 0x08, 0x22, 0x82, 0x15, 0x89, 0xF6, 0x3A, 0x6E, 0x75, 0xDE, 0xBC, -0xE4, 0x11, 0xEE, 0x58, 0xF8, 0x0D, 0x92, 0x52, 0x07, 0xA1, 0x85, 0xB2, 0xE6, 0xED, 0xDE, 0xE3, -0xBC, 0x74, 0xFA, 0x55, 0x8C, 0xD5, 0x71, 0x24, 0xF6, 0x7C, 0xBF, 0xFF, 0xB9, 0xAA, 0x1B, 0x9C, -0xAA, 0x01, 0xFE, 0x76, 0xCB, 0xDE, 0xBD, 0x0A, 0xF6, 0x2B, 0xA5, 0x48, 0xAF, 0x58, 0xCA, 0xD6, -0x7D, 0x8F, 0x11, 0xDC, 0x99, 0x81, 0x36, 0x1F, 0x0C, 0x30, 0x6A, 0xC8, 0x1D, 0x3F, 0xCB, 0xC9, -0x97, 0x0F, 0x70, 0x79, 0xE0, 0x55, 0x46, 0xC6, 0x4E, 0x62, 0x45, 0x58, 0xD8, 0xBC, 0x91, 0xE5, -0x2D, 0x5B, 0xD8, 0xBC, 0xF4, 0xCB, 0x34, 0xA9, 0x85, 0x50, 0xD6, 0x4E, 0xBC, 0x58, 0x30, 0x02, -0xA1, 0xE6, 0xDD, 0x73, 0xA7, 0x79, 0xE1, 0x78, 0x37, 0x5A, 0x6B, 0x2C, 0x36, 0x6B, 0x44, 0xD6, -0xFC, 0x60, 0xE0, 0x50, 0x55, 0x56, 0xAA, 0xCA, 0x42, 0x7F, 0x5D, 0xF7, 0xED, 0x8C, 0x52, 0x74, -0x2A, 0x14, 0xC9, 0x54, 0x1D, 0x1D, 0x8F, 0x7D, 0x8D, 0x60, 0x53, 0x33, 0x2C, 0xF2, 0x5D, 0xAB, -0x38, 0x64, 0xE1, 0x5C, 0x99, 0x26, 0x59, 0xCE, 0xA7, 0xEF, 0xFA, 0x21, 0x94, 0x34, 0x94, 0x42, -0xF7, 0x58, 0x8E, 0x1E, 0xE3, 0x73, 0x00, 0x5F, 0x81, 0xF8, 0x90, 0x50, 0x50, 0x17, 0xB0, 0x61, -0xCD, 0x26, 0x7A, 0xAF, 0x5E, 0xE2, 0xD4, 0xC0, 0xBB, 0x88, 0x90, 0x01, 0x76, 0x52, 0x65, 0x9B, -0x59, 0x55, 0x19, 0x35, 0xD8, 0xDD, 0x46, 0x24, 0x63, 0x45, 0xB8, 0x79, 0xC7, 0xFD, 0xD4, 0xAF, -0x5C, 0x00, 0x4B, 0x02, 0x28, 0x0B, 0x9C, 0xD1, 0x70, 0xBE, 0x0C, 0x26, 0xEA, 0xBE, 0xAC, 0xB8, -0x11, 0xB7, 0x94, 0x42, 0x34, 0x66, 0x3C, 0x47, 0x81, 0xEF, 0x41, 0x22, 0x80, 0x86, 0x3A, 0x68, -0xA9, 0xE7, 0xB3, 0xB7, 0xDE, 0x43, 0x7D, 0xAA, 0x11, 0x00, 0x41, 0x3A, 0xAB, 0xD1, 0x55, 0x35, -0x80, 0x45, 0x1E, 0xB7, 0x08, 0x75, 0x99, 0x34, 0x6B, 0xEE, 0xDA, 0x0A, 0xCB, 0x93, 0x4E, 0xFC, -0xC5, 0x32, 0xF4, 0x4F, 0xC3, 0x74, 0x19, 0x8A, 0x61, 0x64, 0x0F, 0x03, 0xDA, 0x80, 0xB6, 0x0E, -0x2A, 0x1E, 0x31, 0x98, 0x15, 0x67, 0x1F, 0xA5, 0x20, 0xE1, 0x43, 0x7D, 0x12, 0x9A, 0xEA, 0x49, -0x66, 0x9A, 0xB9, 0x73, 0xD5, 0x27, 0xE3, 0x5B, 0xB6, 0xFF, 0x68, 0xC5, 0xCE, 0xAA, 0x9A, 0x9C, -0x0F, 0x05, 0x78, 0x76, 0xED, 0xB7, 0x3A, 0xAC, 0xD8, 0x76, 0x2B, 0x96, 0xF5, 0xF7, 0xDE, 0x0D, -0x29, 0x05, 0x29, 0x1F, 0xC6, 0x42, 0x38, 0x3D, 0x05, 0x85, 0x12, 0x14, 0xCA, 0x15, 0x88, 0xD2, -0x0C, 0x90, 0x18, 0xC6, 0xC4, 0x23, 0x02, 0x11, 0xC0, 0x07, 0x92, 0x3E, 0xA4, 0x12, 0x2E, 0x0A, -0xE9, 0x14, 0x9F, 0x58, 0xB6, 0x0E, 0xE5, 0xFB, 0x51, 0xB3, 0x2F, 0xF7, 0xCF, 0x0B, 0x80, 0x11, -0xBB, 0xD3, 0x20, 0x18, 0x2C, 0xCB, 0xD6, 0xDC, 0x0C, 0x99, 0x04, 0x94, 0x2C, 0x9C, 0x9A, 0x88, -0xC4, 0x97, 0xFE, 0x3F, 0x44, 0x0C, 0x52, 0x36, 0x6E, 0xC4, 0x30, 0xF1, 0xEC, 0xFB, 0x3E, 0xD4, -0x25, 0x20, 0x95, 0x84, 0x86, 0x24, 0x34, 0xD4, 0x91, 0x6E, 0x4C, 0xD3, 0x9A, 0x6A, 0x8A, 0x5D, -0xB7, 0xAD, 0x1A, 0x80, 0x0F, 0x4D, 0x62, 0x8B, 0x6C, 0x53, 0x22, 0xB4, 0xAD, 0x58, 0x49, 0x42, -0x7C, 0x48, 0x05, 0x70, 0x65, 0x1A, 0x86, 0xA6, 0x9C, 0x10, 0x45, 0xC5, 0xE3, 0x56, 0xDC, 0x2C, -0x6B, 0xEB, 0x66, 0x3C, 0x16, 0x5D, 0x8E, 0x22, 0x60, 0x05, 0x94, 0xE7, 0xAC, 0x93, 0x72, 0xA2, -0x69, 0x48, 0xBA, 0xCF, 0x27, 0x03, 0x08, 0x7C, 0xDA, 0xEA, 0x5B, 0x19, 0xCA, 0x8D, 0x21, 0x48, -0xFB, 0xBC, 0x00, 0x18, 0xB1, 0xED, 0xCA, 0xF3, 0x58, 0xBC, 0x74, 0x05, 0x84, 0x1A, 0xF0, 0xE0, -0x62, 0xD6, 0x89, 0x82, 0x4A, 0x62, 0x5E, 0x4B, 0xE0, 0x0F, 0x78, 0x5F, 0x9B, 0x19, 0xB6, 0xF1, -0x20, 0xF0, 0x9D, 0xF0, 0xA6, 0x94, 0x1B, 0x75, 0x81, 0xAB, 0x50, 0x9E, 0x02, 0x81, 0x25, 0xC9, -0xE6, 0x78, 0x55, 0xAF, 0x2A, 0x07, 0xAA, 0x89, 0x40, 0xBB, 0x92, 0xA8, 0xC2, 0x68, 0x03, 0x65, -0x0B, 0xD9, 0xE9, 0xA8, 0xFF, 0xA5, 0x92, 0x94, 0xD7, 0xC4, 0xCB, 0xFB, 0xAB, 0x11, 0xCA, 0x19, -0x35, 0xF0, 0x21, 0xF0, 0xDC, 0xCC, 0xA7, 0x53, 0xD0, 0xDC, 0x00, 0x8D, 0x51, 0x8F, 0x5C, 0x8A, -0x93, 0x5F, 0x23, 0xD6, 0x42, 0x65, 0x63, 0x32, 0x77, 0x00, 0x23, 0x16, 0xA5, 0x3C, 0x72, 0xB9, -0x49, 0x37, 0xA3, 0x23, 0x05, 0xD0, 0xE2, 0x4A, 0x60, 0xFC, 0x87, 0x2B, 0xE3, 0x39, 0x08, 0x2F, -0x7A, 0x54, 0xDE, 0xFB, 0xB3, 0xCB, 0xF3, 0x20, 0xE1, 0x55, 0x12, 0xB6, 0x31, 0xE5, 0xC4, 0x27, -0x03, 0x97, 0x27, 0xA5, 0xD0, 0xE5, 0x51, 0xBE, 0xCC, 0x58, 0x29, 0x57, 0xB5, 0xF8, 0xAA, 0x00, -0x2C, 0xD2, 0xA7, 0xAC, 0x69, 0x1F, 0x1C, 0x1A, 0x70, 0x09, 0x3A, 0x9C, 0x73, 0xB3, 0x99, 0xF0, -0x9D, 0xFF, 0x2D, 0x15, 0x7F, 0x1B, 0x3B, 0xA3, 0xD6, 0xE3, 0x6C, 0xE1, 0x45, 0x9E, 0x4F, 0x06, -0x0E, 0x20, 0x95, 0x70, 0xC9, 0x1B, 0xF8, 0xEE, 0xF3, 0xF9, 0x12, 0x64, 0x0B, 0x30, 0x96, 0x87, -0xA9, 0x02, 0xE7, 0xF3, 0x57, 0x88, 0x76, 0x07, 0x7D, 0xF3, 0x02, 0x60, 0xC4, 0xF6, 0x28, 0xA5, -0xDA, 0xB3, 0xB9, 0x2C, 0x67, 0xDE, 0x79, 0x9B, 0xF5, 0xC9, 0xDB, 0x61, 0x41, 0xDA, 0x89, 0x4A, -0x04, 0x4E, 0x24, 0x89, 0xEB, 0x7F, 0x51, 0x45, 0xE2, 0xFD, 0xA8, 0xE2, 0x04, 0x5E, 0xC5, 0x46, -0xE0, 0x56, 0xE5, 0x5C, 0x09, 0x46, 0x26, 0xE1, 0x4A, 0x16, 0x86, 0xB2, 0x9C, 0x18, 0xEE, 0x65, -0xAC, 0x34, 0x15, 0x5F, 0xA1, 0x67, 0x5E, 0x00, 0x2C, 0xD2, 0x85, 0xC8, 0x2E, 0x6B, 0x84, 0xD7, -0x8E, 0xBF, 0x41, 0xA6, 0x21, 0x43, 0xDB, 0x9A, 0x76, 0x68, 0x6D, 0x82, 0x46, 0x81, 0x64, 0xC2, -0xD9, 0xC3, 0xF3, 0x2A, 0x33, 0xAE, 0x98, 0xF1, 0x5C, 0x45, 0xD5, 0x4A, 0x45, 0xC2, 0xA3, 0x6D, -0x45, 0xBE, 0x08, 0x63, 0x39, 0x18, 0x9A, 0x80, 0x81, 0x31, 0xAE, 0x0E, 0x0E, 0xF0, 0xC2, 0xD0, -0x11, 0x66, 0xEC, 0xCD, 0xAA, 0xEA, 0x93, 0xAB, 0x89, 0x40, 0x97, 0x52, 0x2A, 0x8B, 0x48, 0x26, -0x57, 0xCC, 0xF1, 0xFC, 0x2B, 0x7F, 0xE1, 0x53, 0x57, 0xB7, 0x70, 0xDB, 0xC6, 0xDB, 0xA1, 0xB5, -0x01, 0xD2, 0xF5, 0x6E, 0x35, 0x8D, 0x6D, 0x11, 0xC4, 0x30, 0x32, 0xA3, 0xCC, 0xCA, 0xB5, 0x8D, -0x1B, 0xC5, 0x10, 0x72, 0x45, 0x67, 0x9B, 0x91, 0x49, 0xB8, 0x32, 0xC1, 0xD9, 0xC1, 0x5E, 0x0E, -0xF5, 0xFF, 0x97, 0x69, 0x5D, 0x8A, 0x6F, 0x9B, 0xAD, 0x16, 0xA0, 0xAA, 0xDD, 0xE8, 0x2F, 0x6F, -0xFA, 0xEA, 0xFD, 0x40, 0xB7, 0x9B, 0x43, 0x85, 0xE7, 0xFB, 0xB4, 0xA6, 0x33, 0x6C, 0x5D, 0xBD, -0x99, 0x9B, 0x96, 0xAD, 0x26, 0xD1, 0xDC, 0xE8, 0x12, 0xB3, 0x3E, 0xE9, 0x3C, 0x1E, 0xF8, 0xAE, -0x64, 0x82, 0xCB, 0x8D, 0x78, 0x2D, 0x98, 0x2E, 0xC1, 0x54, 0x11, 0xA6, 0x0A, 0x30, 0x31, 0xCD, -0xE4, 0xD8, 0x18, 0xFF, 0x1C, 0x38, 0xC2, 0xC9, 0x89, 0x0B, 0x58, 0x63, 0x66, 0xDE, 0x72, 0x57, -0xE7, 0xE0, 0xE1, 0xE7, 0xE7, 0x0D, 0x00, 0xE0, 0xE7, 0x37, 0x7D, 0x65, 0x37, 0x70, 0xB0, 0xF2, -0x9B, 0x0A, 0xCF, 0xF3, 0xF0, 0x82, 0x80, 0xB5, 0xAD, 0x2B, 0x58, 0xD9, 0xBC, 0x84, 0x45, 0xE9, -0x05, 0x2C, 0x49, 0x2F, 0xAC, 0x44, 0x21, 0x06, 0x30, 0xD6, 0x95, 0xC9, 0xB2, 0x66, 0x34, 0x37, -0xCE, 0xA5, 0xC9, 0x21, 0x4E, 0x8D, 0x5F, 0xA2, 0x37, 0x7F, 0x19, 0x6B, 0x0C, 0x1F, 0xD0, 0xF0, -0x78, 0xE7, 0xE0, 0xE1, 0xA7, 0xAB, 0x12, 0x35, 0x1B, 0x00, 0x80, 0xFD, 0xAB, 0x1E, 0xB9, 0x2D, -0x82, 0xE8, 0x80, 0x19, 0xD5, 0x5A, 0x29, 0xD4, 0x0C, 0xAF, 0x2B, 0xCF, 0x63, 0x65, 0x6A, 0x01, -0x28, 0x85, 0xE0, 0x1A, 0x9A, 0x6C, 0x58, 0x60, 0x3C, 0xCC, 0xA1, 0x8D, 0x8E, 0xFF, 0x9C, 0xF8, -0x41, 0xE1, 0x00, 0x7B, 0x3A, 0x07, 0x0F, 0xCF, 0xEA, 0xDB, 0x9A, 0x9A, 0x9A, 0xFA, 0x9F, 0xAE, -0xFA, 0xD2, 0x5E, 0xA0, 0x53, 0x44, 0x32, 0xF1, 0x6B, 0x12, 0xFD, 0x14, 0x40, 0x94, 0xAA, 0x9C, -0x03, 0x22, 0x16, 0x4B, 0xA5, 0x4B, 0x93, 0xEB, 0x17, 0xAA, 0x9E, 0x48, 0xFC, 0xB1, 0xD9, 0x6A, -0x99, 0xD3, 0xF7, 0xC4, 0x4F, 0xAE, 0xFC, 0xE2, 0x6E, 0x60, 0x97, 0xC0, 0xAE, 0x6B, 0x82, 0x25, -0x46, 0x71, 0xAF, 0xC8, 0x8C, 0xD7, 0xED, 0xF5, 0xC2, 0xBB, 0x81, 0x83, 0xB3, 0x9D, 0xF5, 0x99, -0xC7, 0xBC, 0x7C, 0x53, 0xFF, 0xE3, 0x15, 0x0F, 0xB7, 0x08, 0x74, 0x80, 0x6C, 0x13, 0xD8, 0x16, -0x89, 0xDE, 0x26, 0x22, 0xD7, 0x40, 0x70, 0x0B, 0x53, 0x1F, 0x6E, 0xB6, 0x7B, 0x80, 0xEE, 0xCE, -0xC1, 0xC3, 0x17, 0xE6, 0x7A, 0xEF, 0x79, 0x01, 0xF8, 0x28, 0x8F, 0x8F, 0xFD, 0x7F, 0xAB, 0xFC, -0x0F, 0x31, 0xEC, 0x4B, 0xC9, 0x60, 0x91, 0x6E, 0xE5, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_refresh.c b/Source/Core/DolphinWX/resources/toolbar_refresh.c deleted file mode 100644 index 30ed5bedd6..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_refresh.c +++ /dev/null @@ -1,306 +0,0 @@ -static const unsigned char toolbar_refresh_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x30, 0x2f, 0x30, 0x34, 0xb6, 0xfa, 0x8a, 0x30, 0x00, 0x00, 0x0d, 0x8f, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9a, 0x7b, 0x70, 0x5c, 0xd5, -0x79, 0xc0, 0x7f, 0xe7, 0xdc, 0x7b, 0xf7, 0xee, 0x43, 0x4f, 0x5b, 0x46, -0xb2, 0x8d, 0xf1, 0x82, 0x4d, 0x31, 0x31, 0x83, 0xd7, 0x35, 0xa4, 0xc0, -0x34, 0xb5, 0x30, 0x34, 0x9d, 0x90, 0x92, 0x38, 0x0d, 0x9d, 0x96, 0x86, -0x26, 0xea, 0x3f, 0x5a, 0x13, 0xa7, 0x18, 0x93, 0xb4, 0x03, 0x34, 0xc4, -0x32, 0xd3, 0xa6, 0xd3, 0x32, 0xc5, 0xf6, 0xd0, 0x92, 0xec, 0x86, 0x06, -0x98, 0x4e, 0x4b, 0xa7, 0x21, 0x05, 0x3c, 0x93, 0xc4, 0x34, 0x0c, 0x96, -0x0b, 0xc5, 0x6d, 0x20, 0xb0, 0x56, 0x81, 0xd6, 0xef, 0x15, 0x46, 0x92, -0x1f, 0xb2, 0xb4, 0x5a, 0x69, 0x1f, 0x77, 0xef, 0xe3, 0xeb, 0x1f, 0x77, -0x57, 0x96, 0xfc, 0x80, 0x64, 0xac, 0x94, 0xe9, 0x4c, 0xbf, 0x9d, 0x33, -0x7b, 0x57, 0xf7, 0x9e, 0x7b, 0xbe, 0xdf, 0xf9, 0xbe, 0xf3, 0x9d, 0xef, -0x9c, 0x23, 0x25, 0x22, 0xfc, 0x5f, 0x16, 0xfd, 0x51, 0x2b, 0x70, 0xb1, -0x62, 0x7e, 0xd8, 0x03, 0x6a, 0x93, 0x4a, 0xa2, 0x59, 0x5f, 0x2f, 0x4b, -0xd1, 0x24, 0xd1, 0x80, 0x26, 0x8f, 0x62, 0x1f, 0x9a, 0x7e, 0x34, 0x4f, -0x49, 0x9f, 0x14, 0x7e, 0xf1, 0xea, 0x9e, 0x47, 0xbf, 0x0b, 0xb9, 0x90, -0xfa, 0x8a, 0x6a, 0x43, 0xd3, 0x87, 0x66, 0x53, 0x5d, 0xe1, 0x33, 0x45, -0x9d, 0xf5, 0x3b, 0x2c, 0x4f, 0xa3, 0xe9, 0x93, 0x3f, 0x91, 0xfc, 0xff, -0x8a, 0xe6, 0x0d, 0x3d, 0xcf, 0x07, 0xa0, 0x36, 0xaa, 0x36, 0x34, 0xbb, -0x51, 0xa4, 0xb0, 0x80, 0x76, 0x58, 0x71, 0xc5, 0x0a, 0x6e, 0x5c, 0x7e, -0x03, 0xf3, 0xa3, 0xed, 0x58, 0x86, 0xc1, 0xc9, 0xa9, 0x93, 0xbc, 0x79, -0xec, 0x0d, 0x0e, 0x0f, 0x1d, 0xa5, 0x58, 0xa8, 0x34, 0x20, 0x0a, 0x68, -0xb6, 0xca, 0x03, 0xb2, 0xfd, 0x03, 0x1b, 0xfd, 0xb6, 0xea, 0x01, 0x72, -0xb2, 0x41, 0x72, 0xbf, 0x28, 0x80, 0xb7, 0xd0, 0xa4, 0xb0, 0x61, 0xc5, -0x9a, 0xab, 0xd8, 0xf6, 0x9b, 0xdb, 0x59, 0xd2, 0xbc, 0x04, 0x8d, 0xc6, -0xc0, 0x40, 0xd7, 0x3f, 0x06, 0x06, 0xef, 0x4d, 0x1d, 0xe5, 0x07, 0xf9, -0xef, 0x93, 0xdd, 0xf3, 0x14, 0xe3, 0x85, 0xa9, 0x06, 0x48, 0x3f, 0x9a, -0xcf, 0xc9, 0x1f, 0xcd, 0x76, 0x2b, 0xf5, 0xd7, 0x2a, 0x89, 0xe6, 0x49, -0x14, 0xdd, 0x28, 0x7a, 0x64, 0x83, 0x3c, 0x3d, 0xe7, 0x00, 0x6a, 0x83, -0xda, 0x86, 0xe6, 0x5e, 0x2c, 0xf8, 0xcc, 0xed, 0x9f, 0xe1, 0xe1, 0x5b, -0x1f, 0xc6, 0xc0, 0xe0, 0xa5, 0xfc, 0x8b, 0x1c, 0x2c, 0xbc, 0xc3, 0xa4, -0x3f, 0x86, 0x6d, 0x46, 0xb0, 0x0c, 0x83, 0xcb, 0x9b, 0xaf, 0x64, 0xcd, -0xbc, 0x9b, 0xb8, 0xba, 0x79, 0x15, 0xc3, 0xe5, 0x41, 0x1e, 0xdd, 0xf7, -0xa7, 0x3c, 0xfb, 0xea, 0x8b, 0xd4, 0x7c, 0x0f, 0x34, 0x39, 0x34, 0x37, -0xcb, 0xd7, 0x42, 0x08, 0xb5, 0x43, 0xf5, 0xa1, 0xd8, 0x82, 0x22, 0x74, -0x41, 0xe8, 0x93, 0xaf, 0xc8, 0xd6, 0x39, 0x05, 0x50, 0x69, 0x95, 0x42, -0xf1, 0x16, 0x1a, 0xae, 0x5b, 0xbb, 0x86, 0xec, 0xef, 0x7c, 0x87, 0x81, -0x13, 0xfb, 0xd8, 0xf1, 0xd3, 0x47, 0xa8, 0xa9, 0x49, 0xda, 0xe2, 0x71, -0xe2, 0xb6, 0x4d, 0xd4, 0xb2, 0xb0, 0x4c, 0x13, 0x53, 0x6b, 0xb4, 0xd6, -0xcc, 0xb7, 0x16, 0x70, 0x5b, 0xe7, 0x9d, 0xdc, 0xd0, 0x7a, 0x2b, 0x4f, -0x1e, 0x79, 0x94, 0x87, 0x7f, 0xb0, 0x8d, 0x62, 0xa9, 0x1c, 0x42, 0x28, -0xb6, 0xa2, 0xd9, 0x82, 0x22, 0xd5, 0x1a, 0x6d, 0xe5, 0xf7, 0xaf, 0xff, -0x3c, 0xff, 0xf4, 0xee, 0xb3, 0x9c, 0x2c, 0x14, 0xb7, 0xcb, 0x26, 0xd9, -0x7c, 0xb1, 0x00, 0x67, 0x87, 0xd1, 0x6d, 0x08, 0x90, 0x80, 0xfb, 0x6e, -0xfd, 0x2a, 0xbb, 0x0e, 0xff, 0x90, 0x07, 0xfe, 0xf5, 0x3e, 0x5c, 0x35, -0xc9, 0xbc, 0xa6, 0x26, 0x9a, 0xa3, 0x51, 0x22, 0xe6, 0x99, 0xc0, 0x65, -0x1a, 0x06, 0xf1, 0x48, 0x84, 0x9a, 0x39, 0xc5, 0xce, 0xd3, 0xdf, 0xe1, -0x89, 0x91, 0x87, 0xb9, 0x2b, 0xb9, 0x91, 0x17, 0x7a, 0xfe, 0x91, 0xae, -0xf6, 0x56, 0x08, 0x48, 0x11, 0xf0, 0x1c, 0x3e, 0xa9, 0x55, 0xf3, 0x57, -0xb1, 0xf7, 0x8b, 0xaf, 0xf0, 0xb9, 0x6b, 0x7f, 0x9d, 0x98, 0x69, 0x83, -0x47, 0xea, 0x62, 0x95, 0x9f, 0x05, 0xa0, 0xd2, 0x2a, 0x09, 0x74, 0x03, -0xdc, 0x7e, 0xcb, 0xed, 0x94, 0xdc, 0x29, 0x76, 0xbc, 0xf1, 0x08, 0x2d, -0xb1, 0x18, 0x2d, 0xf1, 0x38, 0x11, 0xd3, 0xa4, 0x52, 0x73, 0xc9, 0x1f, -0x3c, 0xc9, 0xbf, 0xbf, 0x7c, 0x88, 0x57, 0x7e, 0xfc, 0x5f, 0x0c, 0xe4, -0xde, 0x63, 0xac, 0x50, 0x02, 0x11, 0x2c, 0xd3, 0xe4, 0x7d, 0xef, 0x00, -0xdb, 0x8e, 0xdf, 0xc3, 0x92, 0xe8, 0x15, 0x3c, 0x7b, 0xd7, 0x33, 0x2c, -0x9c, 0xd7, 0x0e, 0x3e, 0xa4, 0x3a, 0x52, 0xbc, 0x72, 0xd7, 0x1e, 0x96, -0x37, 0xad, 0xc0, 0xd0, 0x1a, 0xe5, 0x03, 0xde, 0x5c, 0xa8, 0x3f, 0xdb, -0x02, 0x9b, 0x00, 0x94, 0x0d, 0xbf, 0x77, 0xfd, 0x9d, 0x3c, 0xfa, 0x1f, -0x7f, 0x41, 0x53, 0x34, 0x4a, 0x73, 0x2c, 0x86, 0x65, 0x18, 0x4c, 0x95, -0x2b, 0x1c, 0x7c, 0x7d, 0x84, 0x43, 0xfb, 0x8e, 0x73, 0xfa, 0x54, 0x91, -0xd1, 0x53, 0x93, 0xfc, 0xf7, 0x3b, 0x43, 0xbc, 0xf4, 0xe2, 0x00, 0xaf, -0xff, 0xf4, 0x30, 0xa5, 0x8a, 0x03, 0x80, 0x23, 0x15, 0xbe, 0x7b, 0xfa, -0x61, 0x16, 0x45, 0x92, 0x3c, 0xb2, 0x7e, 0x2b, 0x1f, 0x5f, 0xb4, 0x86, -0xfe, 0x2f, 0xbd, 0xcc, 0xa4, 0x1a, 0x65, 0x77, 0xed, 0xef, 0x59, 0xa4, -0xae, 0xe4, 0xb2, 0xae, 0x05, 0xe0, 0x87, 0x9d, 0x35, 0x97, 0x00, 0xeb, -0x01, 0x16, 0x2e, 0x5b, 0xc4, 0xab, 0xc7, 0x5e, 0x61, 0xd2, 0x2b, 0xd0, -0x14, 0x8b, 0x11, 0x8f, 0x44, 0xa8, 0xb8, 0x2e, 0xef, 0xbd, 0x35, 0xca, -0xc9, 0xa1, 0x22, 0x4e, 0xd5, 0x23, 0xf0, 0x04, 0xf1, 0x04, 0xaf, 0xe6, -0x53, 0x9a, 0xac, 0xf2, 0xce, 0xc0, 0x31, 0x76, 0xbe, 0xf0, 0x3a, 0xc7, -0x86, 0x4f, 0x53, 0xf3, 0x3c, 0xa6, 0xdc, 0x49, 0xb2, 0xa3, 0x5b, 0xb8, -0xb1, 0xfd, 0x16, 0x76, 0x7d, 0x71, 0x17, 0xb9, 0x5a, 0x3f, 0xdf, 0x2e, -0xdc, 0xcf, 0x81, 0xf2, 0x00, 0xae, 0x78, 0x78, 0xae, 0x3f, 0xb7, 0x16, -0xa8, 0xbb, 0x4f, 0x12, 0xe0, 0xfa, 0xab, 0xd7, 0xf0, 0xf2, 0xe0, 0xbf, -0x90, 0xb0, 0x6d, 0x9a, 0x6c, 0x1b, 0xad, 0x14, 0x85, 0x91, 0x12, 0x85, -0xe3, 0x65, 0xbc, 0x9a, 0x0f, 0x01, 0xb3, 0x8a, 0xf8, 0xe0, 0x3a, 0x3e, -0xe3, 0x63, 0x25, 0x76, 0xfd, 0xf0, 0x2d, 0x06, 0xde, 0x1e, 0xa4, 0xe2, -0xba, 0x4c, 0xd4, 0x8a, 0x3c, 0x33, 0xba, 0x83, 0x17, 0x0a, 0x7f, 0xcb, -0x3f, 0x9f, 0x7e, 0x82, 0xc9, 0x72, 0x99, 0xc3, 0x53, 0xfb, 0xd1, 0xd8, -0x61, 0x10, 0xf2, 0x41, 0x7d, 0x43, 0x5d, 0xf4, 0x38, 0x68, 0x58, 0x60, -0x2d, 0x80, 0x52, 0xa0, 0x62, 0x9a, 0x49, 0x77, 0x9c, 0x44, 0x34, 0x4a, -0xdc, 0xb6, 0x11, 0xa0, 0x34, 0x5a, 0xc5, 0x75, 0x3c, 0xf0, 0x81, 0x80, -0x1c, 0x3e, 0xc9, 0xcc, 0xb6, 0x5e, 0x95, 0xf9, 0xab, 0x5e, 0x85, 0x4f, -0x1f, 0x3e, 0x85, 0xc0, 0x15, 0x9c, 0x8a, 0xcb, 0x4f, 0x5e, 0x3b, 0xc4, -0xde, 0xd7, 0xf6, 0xe3, 0xd4, 0x6a, 0xe4, 0x4b, 0x87, 0xf8, 0xb7, 0xf1, -0x1f, 0x53, 0xaa, 0x56, 0x99, 0x74, 0x1c, 0x8a, 0x95, 0x0a, 0x45, 0xb7, -0x40, 0xa2, 0xc9, 0x0e, 0x2d, 0xe0, 0xd3, 0x7a, 0xb1, 0x00, 0x8d, 0x90, -0x12, 0xf6, 0x44, 0xb3, 0x62, 0xb4, 0x7c, 0x82, 0x98, 0x6d, 0x93, 0xb0, -0x6d, 0x62, 0x91, 0x08, 0x8e, 0xeb, 0xe2, 0x4c, 0xb8, 0xf8, 0x6e, 0x3d, -0xdc, 0x0a, 0x7d, 0xf2, 0x2d, 0x19, 0x9c, 0x7e, 0xc3, 0x36, 0xb6, 0xa6, -0x37, 0x65, 0xb7, 0xa3, 0xc8, 0x21, 0x24, 0x03, 0x84, 0x53, 0xc3, 0x93, -0x14, 0x27, 0x2a, 0xb4, 0xb4, 0xc6, 0x08, 0x82, 0x00, 0x3f, 0x08, 0xf0, -0x7d, 0x9f, 0x40, 0x84, 0x11, 0x67, 0x88, 0x8a, 0x53, 0x6b, 0xb8, 0x50, -0x12, 0xd8, 0x73, 0x31, 0x00, 0x0d, 0x0b, 0xa4, 0x00, 0x94, 0x52, 0xe4, -0x27, 0x8e, 0x10, 0xb5, 0x2c, 0xe2, 0x91, 0x08, 0xb6, 0x65, 0x21, 0x80, -0x37, 0xe5, 0x23, 0x22, 0x20, 0x90, 0xf9, 0x56, 0xef, 0x0b, 0x8d, 0xca, -0x59, 0xd2, 0xe1, 0x85, 0xcf, 0x76, 0x15, 0x90, 0x34, 0x95, 0xc1, 0xc2, -0x85, 0xed, 0xfc, 0xda, 0x6f, 0xac, 0xa0, 0xbd, 0x3d, 0x81, 0x69, 0x18, -0x28, 0xa5, 0x10, 0x11, 0xdc, 0x20, 0xa0, 0xea, 0xba, 0x1c, 0x99, 0xda, -0xcf, 0x82, 0xa6, 0x4e, 0x54, 0x00, 0xf8, 0xa1, 0xdb, 0x5e, 0x8c, 0x34, -0x2c, 0xd0, 0x06, 0xa0, 0x9b, 0xe1, 0xd2, 0x96, 0xc5, 0x78, 0x56, 0x91, -0x68, 0x24, 0x42, 0xc4, 0x34, 0xd1, 0x4a, 0x11, 0x04, 0x17, 0x7e, 0x41, -0x7a, 0x43, 0xb6, 0x47, 0x69, 0x7a, 0x4c, 0xc3, 0x60, 0xc9, 0xf2, 0x0e, -0x56, 0x5e, 0x77, 0x29, 0x2d, 0x89, 0x38, 0xb6, 0x65, 0x11, 0x88, 0x84, -0xca, 0xd7, 0x21, 0x3c, 0xdf, 0xe7, 0x50, 0xf1, 0x00, 0xf3, 0x12, 0x0b, -0x42, 0x0b, 0x48, 0xd8, 0xee, 0x5c, 0x00, 0x4c, 0x5b, 0xa0, 0xea, 0x57, -0x88, 0xc7, 0x4c, 0x6c, 0xd3, 0xc4, 0x32, 0x8c, 0xfa, 0x6c, 0x7b, 0x01, -0xe5, 0xd3, 0xd9, 0x6e, 0xe0, 0x49, 0x02, 0x45, 0xeb, 0xe5, 0x09, 0xe6, -0x5d, 0x99, 0xc0, 0x27, 0xa0, 0xe4, 0x38, 0x78, 0x41, 0x50, 0x87, 0x0f, -0xc2, 0x22, 0x82, 0x17, 0x04, 0x1c, 0x2a, 0x1e, 0xa4, 0xc3, 0x5a, 0x0c, -0x9e, 0x02, 0x91, 0xf3, 0x0e, 0xe2, 0x69, 0xcb, 0xce, 0x90, 0x5e, 0x32, -0x1f, 0x08, 0x10, 0x8a, 0x52, 0x8c, 0x56, 0x4f, 0x71, 0x45, 0x6b, 0x27, -0x96, 0x61, 0x84, 0x00, 0xa6, 0x89, 0x19, 0x33, 0x50, 0x13, 0x61, 0x2f, -0x4e, 0x3f, 0x9a, 0x56, 0x29, 0xe0, 0xb9, 0xf0, 0x97, 0x30, 0x71, 0xa4, -0xc4, 0xa1, 0x09, 0x8f, 0x91, 0xe6, 0x02, 0x89, 0x76, 0x1b, 0x3b, 0x62, -0x11, 0x6f, 0x8b, 0x60, 0x18, 0x06, 0x66, 0xdc, 0x00, 0x25, 0xd4, 0x3c, -0x8f, 0x8a, 0xeb, 0x12, 0x4f, 0xcc, 0x27, 0x92, 0x30, 0x70, 0x26, 0xce, -0x8d, 0xa5, 0x59, 0xd2, 0xa4, 0x37, 0x66, 0xdb, 0x08, 0x58, 0x8f, 0x90, -0x44, 0x28, 0x00, 0xfd, 0x64, 0xc8, 0x9d, 0x0f, 0x44, 0x89, 0x08, 0x2a, -0xad, 0x04, 0x20, 0x72, 0x99, 0x49, 0xd7, 0xd5, 0x6d, 0x2c, 0xeb, 0xec, -0x64, 0x49, 0x47, 0x07, 0x09, 0xdb, 0x66, 0x78, 0x6c, 0x8c, 0xd7, 0x5f, -0x3e, 0xcc, 0xf1, 0xc3, 0x13, 0x04, 0xa1, 0x2f, 0xad, 0x06, 0xf2, 0xc0, -0x6e, 0x98, 0x9d, 0x0e, 0x28, 0xa5, 0x50, 0x4a, 0xa1, 0xf5, 0xec, 0x6f, -0x15, 0x26, 0x6f, 0xe8, 0xa8, 0x02, 0x53, 0xe1, 0x2b, 0x1f, 0xb7, 0xe8, -0xe1, 0x57, 0x05, 0xc9, 0x88, 0x9a, 0xa5, 0xfc, 0xa6, 0x6c, 0x8a, 0x80, -0xe7, 0x14, 0x24, 0x15, 0x0a, 0xf1, 0x01, 0x11, 0x24, 0xa0, 0x1f, 0xd8, -0x9a, 0xc9, 0xf4, 0xf6, 0xcf, 0x84, 0x98, 0x0d, 0xb0, 0xd8, 0xa4, 0xf3, -0x9a, 0x36, 0xae, 0xec, 0xea, 0x62, 0x69, 0x47, 0x07, 0x4d, 0xb1, 0x18, -0xa7, 0x8a, 0x45, 0xde, 0xd8, 0x7b, 0x98, 0xc1, 0xdc, 0x29, 0x5c, 0xd7, -0x07, 0xe8, 0x96, 0x8c, 0xec, 0x51, 0x69, 0xb5, 0x94, 0x30, 0x8a, 0xa4, -0x08, 0xc7, 0x50, 0x77, 0xfd, 0xfb, 0x82, 0xb1, 0x5d, 0xa9, 0x33, 0xd7, -0x0d, 0x63, 0xce, 0x04, 0x50, 0x5f, 0x55, 0x29, 0x02, 0x76, 0x2b, 0x54, -0x5b, 0x34, 0x66, 0x11, 0x9d, 0x1f, 0x41, 0x5c, 0xa1, 0x7a, 0xb2, 0x46, -0xcd, 0x09, 0x27, 0x50, 0x60, 0x87, 0x64, 0xe4, 0xde, 0x46, 0x9d, 0x86, -0x0b, 0xe5, 0x81, 0xa4, 0x94, 0x05, 0x09, 0x02, 0x04, 0x50, 0x5a, 0x63, -0x6a, 0x4d, 0xc2, 0xb6, 0x69, 0xee, 0x88, 0x61, 0x18, 0xc6, 0x34, 0x00, -0xb0, 0x47, 0x32, 0x32, 0x08, 0x0c, 0x72, 0x26, 0x0c, 0x4e, 0xa7, 0xc6, -0x33, 0xe0, 0x1a, 0x25, 0x05, 0xb4, 0x89, 0x9c, 0x9b, 0x3e, 0xa8, 0xb4, -0x4a, 0x49, 0x46, 0x72, 0x59, 0xd2, 0xa0, 0x79, 0x52, 0x69, 0xda, 0x6c, -0xcb, 0x62, 0xd1, 0xea, 0x79, 0x74, 0x5e, 0xd2, 0x8a, 0x88, 0x30, 0x3a, -0x56, 0xe4, 0xf8, 0x3b, 0x13, 0x94, 0x8e, 0x3b, 0x04, 0x5e, 0xb0, 0x49, -0xa5, 0x55, 0xab, 0x64, 0xe4, 0x0f, 0xce, 0x05, 0xa8, 0x0a, 0xbe, 0x08, -0x41, 0x10, 0x20, 0x22, 0x28, 0xa5, 0x88, 0x47, 0x22, 0xb4, 0xce, 0x8f, -0x11, 0x89, 0x18, 0x38, 0x0e, 0x88, 0x90, 0xca, 0x92, 0xbe, 0xe0, 0xa0, -0xaa, 0xf7, 0xea, 0xd9, 0x70, 0x33, 0x15, 0x6e, 0xad, 0x03, 0x35, 0xe0, -0xc6, 0x01, 0xd2, 0x0f, 0x64, 0xd7, 0x62, 0x90, 0x52, 0x28, 0x12, 0x0b, -0x6d, 0x96, 0x2c, 0x9c, 0xc7, 0x65, 0x0b, 0x16, 0x20, 0x22, 0xb4, 0xc4, -0xe3, 0x04, 0x26, 0x8c, 0xe8, 0x31, 0x2a, 0x43, 0x35, 0x24, 0xa0, 0x47, -0xa5, 0xd5, 0x66, 0xc9, 0x48, 0xa1, 0x01, 0x90, 0x03, 0xba, 0x03, 0x07, -0x6a, 0x8e, 0x47, 0xb5, 0x56, 0xa3, 0xe6, 0xba, 0xb8, 0x9e, 0x87, 0x00, -0xb6, 0x1d, 0x21, 0xd2, 0x6e, 0xc2, 0xa4, 0x02, 0xce, 0x1f, 0x39, 0x7e, -0x56, 0x91, 0x8c, 0x4c, 0xd4, 0xc1, 0x66, 0xc3, 0x69, 0xf2, 0x48, 0xe3, -0x52, 0x11, 0x8d, 0x44, 0x68, 0x8e, 0xc5, 0x50, 0x80, 0x1f, 0x04, 0x14, -0x9a, 0x9a, 0x28, 0x2c, 0x2d, 0x51, 0x3d, 0xee, 0x21, 0x12, 0x80, 0xf0, -0x59, 0xe0, 0xe9, 0x46, 0x80, 0xcc, 0x01, 0x88, 0x04, 0x54, 0x8e, 0x38, -0x9c, 0x9e, 0x9a, 0x62, 0xac, 0x54, 0x62, 0xa2, 0x52, 0x61, 0xaa, 0x5a, -0xa5, 0xe6, 0xba, 0x88, 0x35, 0xed, 0xc3, 0xc9, 0x74, 0x3a, 0x9b, 0xbc, -0x18, 0x88, 0xf3, 0x49, 0xe6, 0xcf, 0x7a, 0x07, 0xd1, 0xe4, 0x45, 0x09, -0x4e, 0xd1, 0xc3, 0xa9, 0xb9, 0x68, 0x20, 0x62, 0x9a, 0xd8, 0x96, 0x15, -0xce, 0x4b, 0xb6, 0x89, 0x8e, 0x42, 0x7d, 0x55, 0x97, 0x82, 0x33, 0x2e, -0xf4, 0x7c, 0x08, 0x00, 0xd5, 0x11, 0x8f, 0x93, 0xba, 0x88, 0x89, 0x66, -0xb2, 0x52, 0x41, 0x6b, 0xcd, 0xf1, 0x53, 0x05, 0x2a, 0x27, 0x6a, 0x33, -0xc3, 0xe8, 0x52, 0x20, 0xaf, 0xfe, 0x52, 0x25, 0xd1, 0xf4, 0xa0, 0xc8, -0xd7, 0x4b, 0x2e, 0xb3, 0xb9, 0xf7, 0x43, 0xb7, 0x57, 0xce, 0xe7, 0x7e, -0xbd, 0x64, 0x48, 0xab, 0x6c, 0x4e, 0x20, 0x59, 0xf3, 0x3c, 0x26, 0x0a, -0x15, 0x2a, 0x0b, 0xdd, 0xe9, 0xd9, 0x5c, 0x6b, 0x8d, 0xa1, 0x14, 0xca, -0x56, 0x50, 0x3e, 0x0b, 0x40, 0x32, 0x32, 0xa1, 0xd2, 0xea, 0x29, 0xa0, -0x27, 0x08, 0x02, 0xa6, 0x86, 0xaa, 0xbc, 0x37, 0x3e, 0xca, 0xa9, 0xce, -0x22, 0xca, 0xd6, 0x54, 0x86, 0x1d, 0xaa, 0xa5, 0x5a, 0x23, 0x72, 0xe4, -0x24, 0x23, 0xa1, 0xf9, 0x0d, 0x5a, 0x51, 0x6c, 0x69, 0x6c, 0xb5, 0x28, -0x05, 0xe9, 0xc7, 0xb2, 0x10, 0xba, 0x47, 0x01, 0x21, 0x87, 0x90, 0x47, -0xc8, 0x13, 0x90, 0xcf, 0xdc, 0xd7, 0x9b, 0x87, 0xd9, 0x13, 0xd5, 0x2c, -0x18, 0x4d, 0x8e, 0x80, 0xf5, 0x7e, 0xe0, 0x33, 0x59, 0xac, 0x50, 0x72, -0x1c, 0x62, 0x91, 0x48, 0x38, 0x1e, 0x09, 0x03, 0x8b, 0xb2, 0x55, 0xc3, -0x02, 0x49, 0x38, 0x77, 0x4d, 0xbc, 0x0d, 0xb8, 0x17, 0xc2, 0x98, 0x6e, -0x18, 0xe1, 0x93, 0xe1, 0x6c, 0x2a, 0x00, 0x05, 0xc2, 0x30, 0xba, 0x6f, -0xba, 0xce, 0x76, 0x25, 0x4a, 0x83, 0xb6, 0x34, 0x86, 0xa1, 0xc3, 0xb8, -0x5f, 0xbf, 0x27, 0x02, 0xe2, 0x0b, 0x12, 0x08, 0x81, 0x2f, 0xe1, 0xb5, -0x2f, 0x39, 0x09, 0x98, 0x40, 0xe8, 0x27, 0xa0, 0x40, 0x40, 0x8e, 0x80, -0xbc, 0x3c, 0x24, 0x79, 0xb5, 0x45, 0xad, 0x25, 0xa0, 0x5f, 0xa3, 0x59, -0xb8, 0xb8, 0x8d, 0xeb, 0x7e, 0x65, 0x19, 0x8b, 0xdb, 0xdb, 0x29, 0x39, -0x0e, 0xef, 0x8d, 0x8e, 0x72, 0xe8, 0xc4, 0x09, 0x4e, 0x1c, 0x2c, 0x50, -0x3b, 0xe6, 0x85, 0xa9, 0xfc, 0xe3, 0xa2, 0x66, 0xcd, 0xc4, 0x92, 0x91, -0xcd, 0x2a, 0xad, 0x9e, 0x07, 0xfa, 0x44, 0xa4, 0xdb, 0xf3, 0x66, 0xed, -0x58, 0xe4, 0x81, 0xf5, 0x33, 0x95, 0x0f, 0x09, 0xc0, 0x30, 0x35, 0xdd, -0x57, 0x7d, 0x82, 0xc3, 0x13, 0xef, 0x12, 0xb3, 0x6d, 0x22, 0xa6, 0x19, -0x8e, 0x47, 0x01, 0xd7, 0xf5, 0x71, 0x3d, 0x8f, 0xaa, 0xe3, 0x52, 0xad, -0xba, 0x54, 0x2a, 0x4e, 0xaa, 0x5a, 0xae, 0xe1, 0xbb, 0xc1, 0xda, 0x19, -0x6f, 0xcf, 0xa9, 0xad, 0xaa, 0x1b, 0x28, 0xa0, 0x40, 0x24, 0x4c, 0xcd, -0xab, 0xae, 0x8b, 0x1b, 0x04, 0x78, 0xf5, 0x54, 0x64, 0xd6, 0x0e, 0x4a, -0xbd, 0x97, 0xce, 0xd9, 0x5a, 0x94, 0x8c, 0xec, 0xc9, 0x92, 0xbe, 0x39, -0x9d, 0xce, 0xae, 0xe2, 0xcc, 0xe4, 0x94, 0x07, 0x9e, 0xaf, 0x47, 0x90, -0xb3, 0x2a, 0xd0, 0xef, 0xfb, 0xd2, 0x1d, 0x8f, 0x44, 0x68, 0x49, 0x24, -0x68, 0x8e, 0x46, 0x69, 0x8a, 0x46, 0xc3, 0x41, 0x67, 0x18, 0x98, 0x86, -0x41, 0x20, 0x82, 0xe3, 0xba, 0x14, 0xcb, 0x65, 0x4e, 0x4e, 0x4c, 0x30, -0x74, 0x62, 0x9c, 0xf1, 0x93, 0xa5, 0x90, 0x30, 0xb4, 0x6a, 0x8f, 0x6c, -0x91, 0x89, 0x2c, 0xe9, 0x7d, 0xe9, 0x87, 0xb2, 0x48, 0x20, 0x78, 0x8e, -0x8f, 0xe7, 0x79, 0x78, 0x9e, 0x87, 0xeb, 0xfb, 0x78, 0xf5, 0x74, 0x7c, -0x1a, 0x42, 0x2e, 0x00, 0x00, 0xa1, 0x5f, 0xf6, 0x66, 0x32, 0xfb, 0x80, -0x7d, 0xe7, 0xbb, 0x3f, 0x4b, 0x82, 0xf0, 0x6d, 0x51, 0xcb, 0x66, 0x55, -0xc7, 0x6a, 0x06, 0xcb, 0xfb, 0xd1, 0x4a, 0x61, 0x6a, 0x4d, 0xb4, 0x9e, -0x92, 0x6b, 0xa5, 0xc2, 0x75, 0x85, 0xeb, 0x32, 0x59, 0xa8, 0x32, 0x79, -0xba, 0x0a, 0x41, 0x98, 0x9e, 0x23, 0xac, 0x97, 0x87, 0x42, 0xab, 0xf6, -0x92, 0x21, 0x4d, 0x36, 0x7c, 0xad, 0x1f, 0x26, 0x7f, 0xae, 0xef, 0x53, -0x73, 0x5d, 0x6a, 0x75, 0x88, 0xce, 0x96, 0x2e, 0xde, 0x67, 0x68, 0xba, -0xf9, 0x8b, 0xdf, 0x9d, 0x0e, 0x57, 0x68, 0x38, 0x6e, 0x99, 0xe5, 0xad, -0x57, 0x61, 0x1a, 0x06, 0xa2, 0x14, 0x7e, 0x3d, 0x7d, 0xf6, 0x3c, 0x0f, -0xc7, 0x75, 0x99, 0x28, 0x95, 0x79, 0xf7, 0xc0, 0x10, 0x43, 0xc3, 0xe3, -0x78, 0x35, 0x0f, 0x09, 0x97, 0xa4, 0x3d, 0x99, 0xaf, 0xf7, 0x4e, 0xcf, -0x07, 0x59, 0xd2, 0x0d, 0x28, 0x54, 0x7d, 0xec, 0x39, 0x9e, 0x47, 0xb5, -0x0e, 0xef, 0xfa, 0x3e, 0x09, 0xbf, 0xa9, 0xf1, 0x4c, 0x6e, 0x6e, 0x00, -0x7c, 0x0a, 0xe2, 0xc3, 0x60, 0xf1, 0x08, 0x97, 0xc6, 0x17, 0x87, 0x6e, -0x03, 0x20, 0x82, 0xef, 0xfb, 0x38, 0x9e, 0xc7, 0x58, 0xb1, 0xc4, 0x9b, -0x6f, 0x1f, 0x65, 0x68, 0x64, 0x0c, 0xcf, 0x99, 0x56, 0xfe, 0xa9, 0xcc, -0xd7, 0x7b, 0x9f, 0x3e, 0x27, 0xa4, 0x06, 0xa0, 0x44, 0x61, 0x46, 0x42, -0xd5, 0x6a, 0xae, 0x4b, 0xd9, 0x71, 0xa8, 0xd6, 0x6a, 0xac, 0x9c, 0x7f, -0x0d, 0x07, 0x86, 0x0e, 0x34, 0x00, 0x0a, 0x73, 0x05, 0x90, 0xc7, 0x83, -0x98, 0x15, 0x61, 0x59, 0xf3, 0x55, 0xc4, 0x6c, 0x1b, 0xdb, 0xb6, 0xb1, -0x4c, 0x13, 0xad, 0xc3, 0xa8, 0x14, 0x8d, 0x84, 0xeb, 0x8b, 0xfa, 0x9a, -0x3a, 0xac, 0xe3, 0xb3, 0x19, 0xce, 0x84, 0xd4, 0x2c, 0x69, 0xd2, 0x0f, -0x66, 0x3f, 0x4b, 0x00, 0x5a, 0x29, 0x22, 0x71, 0x0b, 0xa5, 0x35, 0x95, -0x3a, 0x40, 0xb9, 0x56, 0xe3, 0xf2, 0xb6, 0xe5, 0x30, 0x25, 0x73, 0x6c, -0x01, 0x8f, 0x3c, 0x3e, 0x04, 0xae, 0xd0, 0x62, 0xb6, 0xd1, 0x1c, 0x8b, -0xd1, 0x5c, 0x5f, 0x53, 0x5f, 0xd3, 0xba, 0x9a, 0xae, 0xf8, 0x22, 0x9a, -0x62, 0x51, 0x6e, 0x5c, 0x73, 0x15, 0x2b, 0x97, 0x5f, 0x4a, 0x44, 0x9b, -0xa8, 0x40, 0x25, 0xf1, 0x39, 0x9a, 0x7e, 0x28, 0xdb, 0x37, 0xad, 0xfc, -0x03, 0xd9, 0x24, 0x01, 0x7d, 0x4a, 0xc0, 0x32, 0x4c, 0x5a, 0x3a, 0x62, -0x68, 0xa0, 0xec, 0x38, 0x4c, 0x39, 0x0e, 0x95, 0x5a, 0x8d, 0x84, 0x4a, -0xd4, 0xd3, 0x6b, 0xa0, 0x9e, 0x3d, 0x7c, 0xe8, 0x01, 0xc7, 0x87, 0x8a, -0x1f, 0x9a, 0xd2, 0xad, 0x7a, 0xf8, 0xd4, 0x58, 0xd2, 0xb4, 0x84, 0x62, -0x70, 0x9a, 0x75, 0x2d, 0x77, 0xb0, 0xae, 0xe5, 0x0e, 0x86, 0x6b, 0x47, -0x79, 0xe2, 0xc4, 0x56, 0x2a, 0x41, 0x89, 0x1b, 0xd6, 0xfc, 0x12, 0x8b, -0x3a, 0xdb, 0xd9, 0xbb, 0xf7, 0x00, 0x93, 0x93, 0x95, 0x36, 0x3f, 0x08, -0xb6, 0xa4, 0x1f, 0xc8, 0x6e, 0x69, 0xf8, 0x3d, 0x01, 0x68, 0xad, 0x69, -0x6b, 0x8f, 0x33, 0xaf, 0xb3, 0x89, 0x00, 0x28, 0x55, 0xab, 0x94, 0x1c, -0x87, 0xee, 0xcb, 0x6e, 0x65, 0xe8, 0xc4, 0x70, 0x3d, 0x68, 0x00, 0xd0, -0x0f, 0x73, 0x60, 0x01, 0xd9, 0x2a, 0xfb, 0xf0, 0xc1, 0x52, 0x06, 0x11, -0x6d, 0xf2, 0xb1, 0xa6, 0x14, 0x1b, 0x3a, 0xb7, 0x72, 0x53, 0xfc, 0xd3, -0x6c, 0xda, 0xf9, 0x87, 0x1c, 0x73, 0xf6, 0xd3, 0xd3, 0x79, 0x3f, 0x51, -0xcb, 0x22, 0x66, 0x59, 0x2c, 0x4f, 0x2e, 0xe4, 0xf6, 0xdb, 0xd6, 0xb0, -0x2c, 0xd9, 0x45, 0xcc, 0xb2, 0x31, 0xd1, 0xa8, 0x00, 0x54, 0x00, 0x96, -0x36, 0x68, 0x6f, 0x49, 0xb0, 0xe4, 0x63, 0x1d, 0xc4, 0x22, 0x11, 0xaa, -0xae, 0xcb, 0x64, 0xb5, 0x8a, 0x0e, 0x4c, 0xee, 0xb8, 0xfa, 0xb7, 0xe9, -0x7f, 0x6d, 0x77, 0xa3, 0xd9, 0x7c, 0x3d, 0xe3, 0x9d, 0x03, 0x0b, 0x00, -0x78, 0x30, 0x36, 0x3a, 0xc5, 0xb0, 0x77, 0x90, 0xf5, 0x2d, 0x77, 0x53, -0xf5, 0xca, 0x74, 0x3f, 0xbe, 0x8e, 0x81, 0x91, 0x01, 0x76, 0x1d, 0xd9, -0xc9, 0xf7, 0x7b, 0x9f, 0x61, 0xe3, 0x25, 0x8f, 0xf0, 0xdd, 0xd3, 0x7d, -0x94, 0xfd, 0x12, 0xf3, 0xda, 0x9a, 0x59, 0xb7, 0xee, 0x1a, 0x46, 0x46, -0xc6, 0x39, 0xb0, 0x7f, 0x84, 0xe1, 0xc1, 0x71, 0x10, 0xe8, 0x5c, 0xda, -0xca, 0xa2, 0xe5, 0xed, 0x44, 0x22, 0x26, 0x15, 0xd7, 0x0d, 0xf7, 0x93, -0xaa, 0x55, 0xee, 0xf9, 0xe5, 0xaf, 0xd1, 0xbf, 0xbf, 0x9f, 0xc9, 0xb1, -0xa9, 0x46, 0x8b, 0xcf, 0x37, 0x2e, 0xe6, 0x06, 0xc0, 0xa7, 0xdf, 0xa9, -0x78, 0xdd, 0x86, 0xd6, 0x54, 0xbc, 0x12, 0x37, 0x3f, 0x76, 0x0b, 0x03, -0x23, 0x03, 0x20, 0x30, 0x32, 0x34, 0xce, 0xe7, 0x1f, 0xff, 0x5d, 0xbe, -0x77, 0xf7, 0x3f, 0xd0, 0x33, 0xef, 0x21, 0x9e, 0x1d, 0x7b, 0x9c, 0xa1, -0xda, 0x51, 0x0c, 0xad, 0xe9, 0xea, 0x6a, 0xa3, 0x6d, 0x7e, 0x82, 0xea, -0xf5, 0x2e, 0x35, 0xcf, 0x9b, 0xde, 0x43, 0x2a, 0xd7, 0x6a, 0x94, 0x2a, -0x15, 0x8a, 0x95, 0x0a, 0x9b, 0xd7, 0xfc, 0x31, 0x37, 0x2d, 0xf9, 0x55, -0x6e, 0xfb, 0xbb, 0xdb, 0x66, 0xb6, 0x38, 0x7d, 0x02, 0x34, 0x37, 0xa7, -0x94, 0x5e, 0xb8, 0xc5, 0xb8, 0xf7, 0xe0, 0x4f, 0xe8, 0xde, 0xbe, 0x8e, -0x81, 0x63, 0x03, 0x8d, 0x9d, 0x37, 0xf0, 0x61, 0x64, 0xa8, 0xc0, 0x6f, -0x3d, 0x76, 0x27, 0x6f, 0x8e, 0xbf, 0xc6, 0xdd, 0x9d, 0x7f, 0xce, 0x27, -0x5b, 0xee, 0x42, 0x79, 0x16, 0x8e, 0xe7, 0x21, 0x22, 0x18, 0x5a, 0x63, -0x68, 0x4d, 0x20, 0x42, 0xd9, 0x71, 0x28, 0x96, 0xcb, 0xb8, 0x9e, 0xc1, -0x83, 0x1f, 0xdf, 0xca, 0xa7, 0x96, 0x7d, 0x9a, 0x2d, 0x3f, 0xfa, 0x06, -0x53, 0xc7, 0xa7, 0x7b, 0xbf, 0xbf, 0xe1, 0x3e, 0xf0, 0x01, 0x87, 0x7c, -0x3f, 0x8f, 0xa8, 0x7b, 0xce, 0x24, 0x81, 0x33, 0x24, 0x07, 0x6c, 0x21, -0x5c, 0x6a, 0xa6, 0x10, 0xb0, 0xa3, 0x26, 0x1b, 0xbf, 0xf0, 0x05, 0xee, -0x5e, 0x79, 0x3f, 0x6d, 0x56, 0x07, 0xaf, 0x8d, 0xbf, 0xc4, 0xfe, 0xc9, -0x7d, 0x9c, 0x70, 0x8e, 0xf3, 0xf6, 0xd8, 0x5b, 0x2c, 0xb0, 0x2e, 0x45, -0x89, 0xc5, 0x8d, 0x97, 0xdc, 0xcc, 0x75, 0x5d, 0x37, 0x12, 0xb7, 0xe2, -0x3c, 0xb8, 0xfb, 0x41, 0x76, 0x7e, 0x6f, 0x67, 0xd8, 0x19, 0xa1, 0xa4, -0x66, 0x25, 0x93, 0x73, 0x02, 0xf0, 0x65, 0xb5, 0x05, 0xe8, 0x0b, 0x7f, -0x00, 0xd0, 0x27, 0x7f, 0x13, 0x1e, 0x1f, 0xa9, 0x2f, 0xab, 0x56, 0xc2, -0x88, 0x91, 0x6a, 0xe4, 0x2f, 0x2b, 0xaf, 0xbd, 0x82, 0x8d, 0x9f, 0xda, -0xc0, 0x27, 0x16, 0x7e, 0x92, 0x76, 0xbb, 0x83, 0x80, 0x00, 0x1f, 0x7f, -0xd6, 0xf7, 0xfb, 0x53, 0xc7, 0xf8, 0xe6, 0xab, 0xdf, 0xe4, 0xe5, 0x5d, -0xbb, 0xa1, 0x32, 0xdd, 0xd4, 0x76, 0xc9, 0xcc, 0x3e, 0xd5, 0x99, 0x1b, -0x80, 0xb4, 0xfa, 0x12, 0xf0, 0x54, 0x5d, 0xd1, 0x9e, 0x99, 0x26, 0xae, -0xdf, 0x6f, 0x25, 0x1c, 0x78, 0xdd, 0x33, 0xff, 0xde, 0xb5, 0xac, 0x8d, -0xd5, 0x2b, 0xaf, 0x65, 0xed, 0x8a, 0x75, 0xb8, 0xbe, 0x47, 0x2d, 0xf0, -0x70, 0x7d, 0x8f, 0xff, 0x1c, 0x7e, 0x9b, 0x1f, 0xed, 0x7d, 0x91, 0xe0, -0xb8, 0xcc, 0xec, 0xf9, 0x9c, 0x64, 0x64, 0xf5, 0x39, 0x6d, 0xcf, 0x11, -0xc0, 0x2a, 0x42, 0xd3, 0x7e, 0xe0, 0xa9, 0xa3, 0x4a, 0xab, 0x4d, 0x84, -0x96, 0x3a, 0x67, 0x4b, 0x51, 0x9b, 0x0a, 0x1d, 0xd5, 0x78, 0x53, 0xfe, -0x39, 0xf5, 0xa8, 0xaf, 0xd9, 0xcf, 0x97, 0x0d, 0xcf, 0x09, 0xc0, 0xcf, -0x23, 0xf5, 0x2d, 0x97, 0x3e, 0xa0, 0xe7, 0x67, 0xac, 0xb2, 0x1d, 0xe8, -0x3b, 0x6f, 0x2a, 0xcf, 0x47, 0x00, 0x30, 0xdd, 0x70, 0xe8, 0x56, 0x3d, -0x84, 0x6e, 0xd5, 0xd8, 0x66, 0x81, 0x70, 0xed, 0x91, 0x27, 0x74, 0xb9, -0xe7, 0xcf, 0x76, 0xc7, 0x73, 0xde, 0xf3, 0xff, 0xff, 0xad, 0xf2, 0x11, -0xcb, 0xff, 0x00, 0x23, 0xdd, 0xb3, 0x7f, 0xe6, 0x37, 0xca, 0x79, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_refresh.xpm b/Source/Core/DolphinWX/resources/toolbar_refresh.xpm deleted file mode 100644 index 51f6897f57..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_refresh.xpm +++ /dev/null @@ -1,192 +0,0 @@ -/* XPM */ -static const char *toolbar_refresh_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 138 2", -" c #990A02", -". c #97160F", -"X c #9D160F", -"o c #9D1710", -"O c #9A1912", -"+ c #9C1F18", -"@ c #B00D05", -"# c #A5170F", -"$ c #AC160F", -"% c #B3160E", -"& c #A31710", -"* c #A81710", -"= c #A31C15", -"- c #AB1A13", -"; c #A21F18", -": c #B41B14", -"> c #BA1A12", -", c #B51F18", -"< c #9D231C", -"1 c #A3231C", -"2 c #AB231C", -"3 c #B3231C", -"4 c #BD231B", -"5 c #9E2720", -"6 c #9F2C25", -"7 c #A32822", -"8 c #AE2C25", -"9 c #A12F28", -"0 c #B02620", -"q c #B82720", -"w c #A1312A", -"e c #A53934", -"r c #AF3832", -"t c #B13832", -"y c #B93B35", -"u c #CE170E", -"i c #D5160F", -"p c #C31E16", -"a c #CA1C14", -"s c #D21D14", -"d c #C4231B", -"f c #CB231B", -"g c #D2231B", -"h c #C42820", -"j c #D42C24", -"k c #C2312A", -"l c #CC322B", -"z c #C63932", -"x c #CC3830", -"c c #AD423C", -"v c #B3433D", -"b c #BA433D", -"n c #CC463F", -"m c #DA4039", -"M c #AB4A44", -"N c #AD4E49", -"B c #B44640", -"V c #B24A44", -"C c #B74F4A", -"Z c #B75752", -"A c #B6625D", -"S c #B9645F", -"D c #BC716C", -"F c #BE7672", -"G c #C4504B", -"H c #C8524B", -"J c #D5534D", -"K c #C35651", -"L c #C36C67", -"P c #CB6B66", -"I c #CF6D68", -"U c #D86862", -"Y c #C4706B", -"T c #C9716C", -"R c #E27D78", -"E c #CD837F", -"W c #C28481", -"Q c #CF8F8C", -"! c #D58884", -"~ c #C6918D", -"^ c #C8918D", -"/ c #D5908C", -"( c #CD9B99", -") c #DD9D9A", -"_ c #E18D89", -"` c #E59490", -"' c #E59B97", -"] c #E59F9B", -"[ c #D5A29F", -"{ c #DDA19E", -"} c #E6A09C", -"| c #DDA5A2", -" . c #D4B1AE", -".. c #D5BAB7", -"X. c #DCB8B6", -"o. c #D9BDBB", -"O. c #E0A7A4", -"+. c #E2C1BF", -"@. c #E9C2BF", -"#. c #CDCCCC", -"$. c #DCC7C5", -"%. c #DBC8C7", -"&. c #D0CFCF", -"*. c #DBC9C8", -"=. c #D4D3D3", -"-. c #D8D7D7", -";. c #D7D8D6", -":. c #D8D8D7", -">. c #DCDCDB", -",. c #E4C3C2", -"<. c #EBC6C4", -"1. c #EAC8C7", -"2. c #E0CAC8", -"3. c #EBCFCE", -"4. c #ECD0CE", -"5. c #E6D7D6", -"6. c #EFD5D4", -"7. c #E1D8D7", -"8. c #E1DBDA", -"9. c #EFDCDB", -"0. c #E0E0DF", -"q. c #E3E3E2", -"w. c #EBE6E6", -"e. c #E5E8E7", -"r. c #E8E7E8", -"t. c #E7EBEA", -"y. c #ECECEC", -"u. c #F1E5E4", -"i. c #F2ECEC", -"p. c #F0F0EF", -"a. c #EAF1F1", -"s. c #F3F3F3", -"d. c #F8F7F7", -"f. c #F8F8F7", -"g. c #F3F7F8", -"h. c #F6FCFC", -"j. c #FAFCFC", -"k. c None", -/* pixels */ -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.:.;.#.#.#.#.#.#.#.#.;.:.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.:.#.#.=.-.>.q.q.e.e.q.q.>.:.=.#.#.:.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.=.#.=.>.e.r.y.y.y.y.r.r.y.y.y.y.r.r.>.=.#.=.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.:.#.;.q.r.y.r.r.y.y.y.y.y.y.y.y.y.y.r.r.y.r.q.-.#.-.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.#.=.q.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.r.r.y.q.=.#.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.>.#.:.r.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.r.r.>.#.>.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.:.#.q.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.y.q.#.-.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.:.#.q.y.r.y.y.y.y.y.y.y.y.y.y.p.p.p.p.p.p.y.y.y.y.y.y.y.y.y.y.r.y.q.#.-.k.k.k.k.k.k.", -"k.k.k.k.k.>.#.q.y.r.y.y.y.y.y.y.y.y.p.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.y.y.y.r.r.q.#.>.k.k.k.k.k.", -"k.k.k.k.k.#.8.y.r.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.y.r.y.q.#.k.k.k.k.k.", -"k.k.k.k.#.:.y.r.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.t.y.>.#.k.k.k.k.", -"k.k.k.>.&.r.r.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.g.h.h.h.h.h.h.h.h.h.s.y.y.y.y.y.r.r.=.:.k.k.k.", -"k.k.k.#.q.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.h.,.P T T T Y Y Y D S ( s.y.y.y.y.y.r.q.#.k.k.k.", -"k.k.;.=.y.r.y.y.y.y.y.s.s.s.s.g.s.s.s.s.d.s.d.d.j.{ @ $ $ $ # # # c 5.s.y.y.y.y.y.r.y.-.=.k.k.", -"k.k.#.q.y.y.y.y.y.y.p.s.s.s.g.9.g.g.d.d.d.d.d.d.j.| : 3 3 2 2 2 ; Z w.g.s.y.y.y.y.y.y.r.q.#.k.k.", -"k.>.=.r.y.y.y.y.y.p.s.s.s.h.<.j ` h.d.d.d.d.d.d.j.O.: 3 3 2 2 2 ; X.h.s.s.s.p.y.y.y.y.r.y.=.>.k.", -"k.#.>.y.y.y.y.y.y.s.s.s.g.u.m i s ' j.f.d.f.f.f.j.O.: 3 3 2 2 2 = c 8.t.e.r.y.y.y.y.y.r.y.8.#.k.", -"k.#.e.y.y.y.y.y.y.s.s.s.h.R i g g s } j.f.f.f.d.h.| : 3 3 2 2 2 1 X F t.q.q.>.>.q.r.y.y.r.r.#.k.", -">.=.r.y.y.y.y.y.p.s.s.g.6.j g g g g a ] j.d.s.s.h.| : 3 , 2 2 2 1 1 7 *.e.q.q.>.>.>.>.e.y.y.=.>.", -"-.-.y.y.y.y.y.y.s.s.s.h._ u g g g f a ' h.s.s.s.j.| : : y 3 2 2 1 1 X W a.q.q.>.>.>.:.;.>.r.>.;.", -"#.>.y.y.y.y.y.p.s.s.s.g.J a f f f a U h.s.d.d.d.j.| @ K u.L * 2 1 1 O N e.q.q.0.>.>.>.:.=.=.:.#.", -"#.q.y.y.y.y.y.p.s.s.g.u.l f f f f f @.h.d.d.f.f.j.) G i.j.+.2 1 1 1 + w 8.e.q.0.>.>.>.:.=.=.#.#.", -"#.q.y.y.y.y.y.p.s.s.g.4.h f f f a x i.g.d.f.j.j.j.6.u.j.g.y.t ; 1 1 + 9 7.e.q.q.>.>.>.:.=.=.#.#.", -"#.e.y.y.y.y.y.p.s.s.h.1.d d d d p n i.f.d.f.j.j.j.j.j.d.d.i.B = 1 1 + w 7.e.q.q.>.>.>.:.=.=.&.#.", -"#.q.y.y.y.y.y.p.s.s.g.3.h d d d p z i.f.d.f.j.j.j.j.f.d.f.y.r ; 1 < + 9 7.e.q.q.>.>.>.:.=.=.&.#.", -"#.q.y.y.y.y.y.p.s.s.g.u.k 4 4 4 4 4 <.h.d.f.j.j.j.j.f.d.j.,.1 1 1 < + w 8.e.q.q.>.>.>.:.=.=.#.#.", -"#.q.y.y.y.y.y.p.s.s.s.s.H > 4 4 4 > I j.d.d.f.f.f.f.d.d.j.L & 1 1 < O N e.e.q.q.>.>.>.:.=.=.#.#.", -"&.>.y.y.y.y.y.p.s.s.s.h.! % 4 4 4 4 , | j.f.d.d.d.d.f.j.[ = 1 1 < < . W a.q.q.0.>.>.>.:.=.=.#.#.", -"-.-.y.y.y.y.y.p.s.s.s.g.2.q 3 3 3 3 , 3 / s.j.j.j.j.s.Q 1 ; 1 < < < 5 %.t.q.q.0.>.>.>.;.=.=.#.-.", -">.=.r.y.y.y.y.y.s.s.s.y.y.T % 3 3 3 3 3 - b E | | E v & 1 1 < < < . D y.q.q.q.>.>.>.>.;.=.&.#.>.", -"k.#.e.y.y.y.y.y.p.s.s.q.t.7.y - 3 3 3 2 2 - * # # & = 1 1 1 < < O e 7.t.q.q.q.>.>.>.:.=.=.&.#.k.", -"k.&.>.y.y.y.y.y.y.s.y.q.q.a.X.0 - 2 2 2 2 2 2 2 1 1 1 1 1 < < O 5 ..a.q.q.q.0.>.>.>.:.=.=.#.&.k.", -"k.>.=.y.y.y.y.y.y.s.r.q.q.q.a. .8 * 2 2 2 2 1 1 1 1 1 < < < O 6 .a.q.q.q.0.>.>.>.>.;.=.=.#.>.k.", -"k.k.#.q.y.y.y.y.y.y.q.q.q.q.q.a.$.C & = 1 1 1 1 1 1 < < O O N $.a.q.q.q.q.>.>.>.>.:.=.=.#.#.k.k.", -"k.k.;.;.y.y.y.y.y.y.>.0.q.q.q.q.y.r.( V 1 o o o O O O < M ( r.y.q.q.q.q.>.>.>.>.:.;.=.=.#.;.k.k.", -"k.k.k.#.q.y.y.y.y.r.>.>.q.q.q.q.q.e.a.r.o.^ D A A D ~ o.r.a.e.q.q.q.q.>.>.>.>.>.;.=.=.#.#.k.k.k.", -"k.k.k.>.=.r.y.y.y.e.>.>.>.0.q.q.q.q.q.e.y.a.a.y.y.a.a.y.e.q.q.q.q.q.>.>.>.>.>.:.=.=.&.#.>.k.k.k.", -"k.k.k.k.#.>.y.y.y.q.>.>.>.>.>.q.q.q.q.q.q.q.q.e.e.q.q.q.q.q.q.q.0.>.>.>.>.>.:.;.=.=.#.#.k.k.k.k.", -"k.k.k.k.k.#.q.y.y.0.:.>.>.>.>.>.q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.>.>.>.>.>.>.:.;.=.=.#.#.k.k.k.k.k.", -"k.k.k.k.k.>.#.q.y.>.;.:.>.>.>.>.>.>.0.q.q.q.q.q.q.q.q.q.0.>.>.>.>.>.>.>.:.;.=.=.#.#.>.k.k.k.k.k.", -"k.k.k.k.k.k.:.#.q.>.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.=.=.=.#.#.:.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.:.#.-.=.=.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.;.=.=.=.#.#.:.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.>.#.#.=.=.=.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.;.=.=.=.=.#.#.>.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.#.#.&.=.=.=.=.;.:.:.:.>.>.>.>.>.>.:.:.;.;.=.=.=.=.&.#.#.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.>.#.#.&.=.=.=.=.=.=.;.;.;.;.;.;.=.=.=.=.=.=.&.#.#.>.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.=.#.#.#.=.=.=.=.=.=.=.=.=.=.=.=.=.&.#.#.#.=.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.>.=.#.#.#.#.=.=.=.=.=.=.#.#.#.#.=.>.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.>.:.=.#.#.#.#.#.#.=.:.>.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_stop.c b/Source/Core/DolphinWX/resources/toolbar_stop.c deleted file mode 100644 index 47dfd9f577..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_stop.c +++ /dev/null @@ -1,260 +0,0 @@ -static const unsigned char toolbar_stop_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0b, 0x61, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x49, 0x8c, 0x5d, 0xc7, 0x75, -0x86, 0xbf, 0xaa, 0xba, 0xc3, 0x1b, 0x38, 0x3c, 0x36, 0x9b, 0xa4, 0x2d, -0x83, 0x14, 0x69, 0x45, 0x32, 0x18, 0xd0, 0x26, 0xb3, 0xc8, 0xc2, 0x8b, -0x50, 0xf4, 0x26, 0x4a, 0x80, 0x00, 0xd4, 0x22, 0x80, 0x80, 0x08, 0x82, -0xdb, 0x8b, 0x44, 0x1e, 0x00, 0x33, 0x59, 0x64, 0x45, 0x04, 0xa6, 0x21, -0x38, 0x32, 0x04, 0x28, 0x22, 0x99, 0x00, 0x81, 0x93, 0x05, 0x05, 0x04, -0xbd, 0x0d, 0xe8, 0x0c, 0x48, 0x82, 0x38, 0x01, 0x2d, 0x7b, 0x23, 0x07, -0x71, 0x68, 0x5b, 0x59, 0x49, 0xb6, 0x9a, 0x54, 0x8b, 0xa4, 0xba, 0x5f, -0x8f, 0xaf, 0xdf, 0xeb, 0x77, 0x87, 0x3a, 0x27, 0x8b, 0xba, 0x6f, 0xe8, -0x66, 0x37, 0xd9, 0x4d, 0x09, 0x11, 0x54, 0x40, 0xe1, 0xde, 0x37, 0xd5, -0xfd, 0xff, 0x73, 0xfe, 0x33, 0x54, 0x75, 0x1b, 0x55, 0xe5, 0x93, 0x3c, -0xec, 0xc7, 0x0d, 0xe0, 0xc3, 0x8e, 0xe8, 0xe3, 0x7c, 0xf8, 0x8b, 0x2f, -0xfe, 0x8d, 0x19, 0xdc, 0x7f, 0xef, 0x7b, 0x7f, 0xf4, 0x48, 0x52, 0x30, -0x1f, 0x95, 0x84, 0xbe, 0xfb, 0xdd, 0x7f, 0x3d, 0xae, 0xaa, 0xe7, 0x54, -0xe5, 0x9c, 0x88, 0x1c, 0x17, 0xd1, 0xd3, 0xaa, 0xd2, 0x12, 0x11, 0x44, -0x04, 0x55, 0x99, 0x11, 0x91, 0x5b, 0x22, 0x72, 0x43, 0x44, 0x7e, 0xb6, -0xb2, 0xd2, 0xfb, 0xfe, 0x16, 0xcb, 0x28, 0xec, 0x8e, 0xcc, 0x87, 0x22, -0xf0, 0xea, 0xab, 0xff, 0xd9, 0x52, 0x95, 0x67, 0x55, 0xf5, 0x82, 0xaa, -0x9e, 0x09, 0x40, 0x95, 0x31, 0xd0, 0xc3, 0xfb, 0x8d, 0xaf, 0x3d, 0x22, -0xb2, 0x2c, 0x22, 0xff, 0xe0, 0xbd, 0xfc, 0xdd, 0xfa, 0x7a, 0xf9, 0xc3, -0x0a, 0xfc, 0x60, 0x02, 0xe8, 0x4e, 0x88, 0x3c, 0x32, 0x81, 0xd7, 0x5e, -0xbb, 0x71, 0x09, 0xf4, 0x82, 0x88, 0xb6, 0x54, 0x95, 0x5a, 0x2d, 0xa5, -0xd9, 0x6c, 0xb2, 0x77, 0xef, 0x5e, 0x8c, 0x31, 0x24, 0x49, 0x3a, 0x04, -0x5b, 0x14, 0x05, 0xbd, 0xde, 0x1a, 0x6b, 0x6b, 0x3d, 0x3a, 0x9d, 0x15, -0x3a, 0x9d, 0x0e, 0x65, 0x59, 0x8c, 0x93, 0x7b, 0xc3, 0x7b, 0xff, 0xa7, -0x79, 0xce, 0xcd, 0x8a, 0x80, 0x0c, 0xc8, 0x3c, 0x8c, 0xc4, 0xae, 0x63, -0xe0, 0xca, 0x95, 0x37, 0xce, 0x19, 0x63, 0xae, 0x59, 0x6b, 0x8f, 0x5b, -0x6b, 0x99, 0x98, 0x98, 0xe0, 0xf1, 0xc7, 0x3f, 0xc5, 0xc1, 0x83, 0x75, -0x1a, 0x8d, 0x88, 0x28, 0xb2, 0x44, 0x91, 0xc3, 0x7b, 0x10, 0x81, 0x6e, -0x37, 0x67, 0x6d, 0x2d, 0x63, 0x65, 0xa5, 0xc7, 0xc2, 0xc2, 0x2a, 0x13, -0x13, 0x07, 0xc8, 0xf3, 0x9c, 0x95, 0x95, 0x25, 0xee, 0xde, 0xbd, 0x47, -0x96, 0x65, 0x00, 0x67, 0x8d, 0x31, 0x6f, 0xc6, 0xb1, 0xff, 0xf3, 0xa2, -0xb0, 0x2f, 0x01, 0xa6, 0x22, 0x31, 0x20, 0xb2, 0xed, 0xd8, 0x95, 0x07, -0xae, 0x5e, 0xfd, 0xf1, 0x25, 0x63, 0xcc, 0xb7, 0x00, 0x0e, 0x1f, 0x3e, -0xc4, 0xa9, 0x53, 0x47, 0x39, 0x7c, 0x38, 0x25, 0x4d, 0x2d, 0x22, 0x0c, -0x41, 0x3f, 0xe8, 0x7e, 0x6e, 0x6e, 0x99, 0xd9, 0xd9, 0x7b, 0xf4, 0x7a, -0xeb, 0x88, 0x94, 0xcc, 0xcf, 0xcf, 0x33, 0x37, 0x37, 0x37, 0xf4, 0x88, -0xaa, 0xfc, 0xc8, 0x7b, 0x7d, 0x4e, 0x35, 0x5a, 0x00, 0x3c, 0x20, 0x0f, -0xf2, 0xc2, 0x8e, 0x3d, 0x70, 0xf5, 0xea, 0x8f, 0xae, 0x59, 0x6b, 0xa7, -0xd2, 0x34, 0xe5, 0x0b, 0x5f, 0xf8, 0x1c, 0x4f, 0x3d, 0xb5, 0x87, 0x5a, -0xcd, 0x0c, 0xc1, 0xad, 0xaf, 0x7b, 0x16, 0x17, 0x73, 0x56, 0x57, 0x0b, -0xfa, 0xfd, 0x30, 0xbd, 0xf7, 0x88, 0x78, 0x92, 0xc4, 0x91, 0xa6, 0x31, -0xf5, 0x7a, 0x4a, 0xab, 0xb5, 0x97, 0x03, 0x07, 0x5a, 0xdc, 0xbd, 0x3b, -0xc7, 0xbb, 0xef, 0xde, 0xe2, 0xc0, 0x81, 0x09, 0xea, 0xf5, 0x3a, 0xb3, -0xb3, 0xef, 0xb1, 0xbe, 0xbe, 0x0e, 0xf0, 0x5b, 0xc6, 0xe8, 0xbf, 0xa9, -0x96, 0xcf, 0x40, 0xb4, 0xc0, 0xc6, 0xb8, 0xb8, 0x6f, 0xec, 0xc8, 0x03, -0x57, 0xae, 0xbc, 0x71, 0xcd, 0x5a, 0x3b, 0xd5, 0x6c, 0x36, 0x39, 0x7b, -0xf6, 0x14, 0xc7, 0x8e, 0xc5, 0x43, 0x8b, 0x2e, 0x2c, 0x78, 0xee, 0xdd, -0xcb, 0xe9, 0xf5, 0x4a, 0x44, 0x3c, 0xde, 0x4b, 0x75, 0xf5, 0x63, 0x57, -0xc1, 0x7b, 0x8f, 0xf7, 0x25, 0x65, 0x29, 0xb4, 0x5a, 0x7b, 0x38, 0x72, -0xe4, 0x08, 0x79, 0x5e, 0xf2, 0xd6, 0x5b, 0xff, 0x4b, 0x51, 0x64, 0x78, -0xef, 0xb9, 0x7b, 0xf7, 0x0e, 0x2b, 0x2b, 0xcb, 0x83, 0xb8, 0xf8, 0x85, -0xaa, 0xf9, 0x6d, 0x63, 0x92, 0x36, 0xe0, 0xb7, 0xf3, 0xc2, 0x43, 0x0b, -0xd9, 0x6b, 0xaf, 0xdd, 0xb8, 0x06, 0x4c, 0xed, 0xdf, 0xdf, 0xe2, 0x99, -0x67, 0x3e, 0xcf, 0xd1, 0xa3, 0x71, 0x65, 0x71, 0x78, 0xfb, 0xed, 0x92, -0xd9, 0xd9, 0x92, 0x2c, 0x53, 0x8c, 0x31, 0x80, 0xc1, 0x54, 0x99, 0x3d, -0x5c, 0x4d, 0x35, 0x87, 0xf6, 0x02, 0x60, 0x61, 0x61, 0x89, 0x9f, 0xff, -0xfc, 0x2d, 0x96, 0x96, 0x96, 0x38, 0x79, 0xf2, 0xd7, 0xb1, 0xd6, 0x21, -0xa2, 0x1c, 0x3e, 0x7c, 0x84, 0x5a, 0xad, 0x31, 0xf8, 0xdd, 0xe7, 0x55, -0xfd, 0xdf, 0x02, 0x6e, 0xd3, 0x22, 0x3b, 0x27, 0xf0, 0xea, 0xab, 0xff, -0x71, 0x41, 0x55, 0xa7, 0x6a, 0xb5, 0x1a, 0x5f, 0xfa, 0xd2, 0xe7, 0x98, -0x98, 0x88, 0x10, 0x81, 0x76, 0x5b, 0xf9, 0xe5, 0x2f, 0x95, 0x7e, 0xff, -0x61, 0xf4, 0x19, 0x12, 0x0a, 0xf7, 0xa3, 0x17, 0xaa, 0xf0, 0xfe, 0xfb, -0xb3, 0xbc, 0xf3, 0xce, 0x3b, 0x3c, 0xf1, 0xc4, 0x53, 0xc3, 0xf4, 0x7b, -0xe4, 0xc8, 0x11, 0xa2, 0x68, 0xa8, 0xec, 0xdf, 0x2b, 0xcb, 0xee, 0x37, -0x01, 0x3b, 0x5e, 0xf4, 0x76, 0x44, 0xe0, 0x95, 0x57, 0xfe, 0xfd, 0x8c, -0xaa, 0x5e, 0x76, 0xce, 0xf1, 0xc5, 0x2f, 0x9e, 0x62, 0x62, 0x22, 0x58, -0xfe, 0xf6, 0x6d, 0xcf, 0x9d, 0x3b, 0x21, 0xfd, 0x81, 0x32, 0x50, 0xe0, -0xd6, 0x52, 0x1c, 0x7d, 0x3e, 0x78, 0x3d, 0xe2, 0x10, 0x3e, 0xeb, 0xf5, -0x3a, 0xdc, 0xbe, 0x3d, 0xc3, 0xa7, 0x3f, 0xfd, 0x19, 0x54, 0x15, 0x63, -0x2c, 0x87, 0x0e, 0x1d, 0x62, 0x4c, 0xf6, 0x17, 0x8b, 0x62, 0xed, 0xc4, -0x76, 0x38, 0x1f, 0xe0, 0x01, 0xbd, 0xa6, 0x0a, 0x27, 0x4f, 0x3e, 0xc9, -0xd1, 0xa3, 0x75, 0x44, 0xe0, 0xd6, 0xad, 0x9c, 0xc5, 0xc5, 0xb2, 0x2a, -0x44, 0x7e, 0x58, 0x9c, 0x02, 0x78, 0x45, 0x55, 0x87, 0x44, 0x46, 0xc0, -0x47, 0x0c, 0xc2, 0x7b, 0xba, 0xe1, 0x33, 0x55, 0xe8, 0x74, 0x56, 0x59, -0x5e, 0x5e, 0x22, 0x8e, 0x6b, 0xa8, 0x0a, 0x69, 0x5a, 0x63, 0xcf, 0x9e, -0xbd, 0x83, 0x2f, 0xed, 0x57, 0x95, 0x3f, 0x63, 0x1b, 0x19, 0x6d, 0x49, -0xe0, 0xe5, 0x97, 0xff, 0xe5, 0xcb, 0xaa, 0x7a, 0x66, 0xdf, 0xbe, 0x7d, -0x3c, 0xf9, 0xe4, 0x41, 0x8c, 0x31, 0xb4, 0xdb, 0x05, 0x0b, 0x0b, 0x05, -0xde, 0xcb, 0x70, 0x6e, 0xac, 0xb2, 0xba, 0xc5, 0x1c, 0x00, 0xdf, 0x9c, -0x48, 0x46, 0x84, 0x07, 0xef, 0x77, 0x3a, 0xab, 0x14, 0x45, 0x86, 0x48, -0x78, 0xbf, 0xd5, 0x3a, 0x80, 0xea, 0xd0, 0xb3, 0x2f, 0x64, 0xd9, 0xf2, -0x96, 0x5e, 0xd8, 0x92, 0x80, 0xaa, 0x5e, 0x52, 0x55, 0x4e, 0x9e, 0xfc, -0x2c, 0xfb, 0xf6, 0x25, 0xf4, 0xfb, 0xc2, 0xec, 0xec, 0xfa, 0x58, 0x1b, -0x30, 0xf2, 0xc0, 0x78, 0xfb, 0x30, 0xf0, 0xc6, 0xe8, 0xba, 0x99, 0x8c, -0x56, 0x32, 0x31, 0x15, 0x38, 0x86, 0x80, 0x45, 0x94, 0xa2, 0x28, 0x86, -0xeb, 0x39, 0xe7, 0x68, 0x36, 0x9b, 0x18, 0x33, 0xf8, 0x1e, 0xdf, 0xdc, -0x0a, 0xeb, 0x7d, 0x69, 0xf4, 0xa5, 0x97, 0xfe, 0xf1, 0xbc, 0xb5, 0xf6, -0xfa, 0xe4, 0xe4, 0x41, 0xce, 0x9e, 0x3d, 0xcd, 0xe4, 0x64, 0x9d, 0x99, -0x99, 0x35, 0x3a, 0x9d, 0x02, 0x63, 0x2c, 0xc6, 0x8c, 0x32, 0x4d, 0x7b, -0x7e, 0x8e, 0x9b, 0x3f, 0x7d, 0x93, 0xf5, 0x5e, 0x77, 0xab, 0xb5, 0xef, -0x1b, 0x69, 0x5a, 0xe3, 0xd8, 0x89, 0x5f, 0xa3, 0xde, 0x68, 0x52, 0x14, -0x39, 0x79, 0x5e, 0x52, 0x96, 0x05, 0x79, 0x5e, 0x54, 0x85, 0x2c, 0x90, -0x0f, 0x5e, 0x31, 0x74, 0x3a, 0xab, 0xcc, 0xcf, 0xdd, 0xa5, 0x0c, 0x29, -0xf9, 0x56, 0xbd, 0x3e, 0x71, 0x62, 0x73, 0x3a, 0xbd, 0xaf, 0x90, 0xa9, -0xea, 0x94, 0xaa, 0x30, 0x39, 0x79, 0x90, 0x03, 0x07, 0xea, 0xac, 0xae, -0xe6, 0x2c, 0x2d, 0xad, 0x63, 0xad, 0xc5, 0x98, 0x51, 0xba, 0x04, 0xb8, -0xf9, 0xd3, 0x37, 0x39, 0x75, 0xea, 0x33, 0x3c, 0xf7, 0x07, 0xe7, 0x76, -0x44, 0x60, 0x7d, 0x3d, 0xe7, 0x9f, 0xff, 0xe9, 0xbf, 0x58, 0xeb, 0xea, -0xd0, 0x53, 0x03, 0xcf, 0x85, 0x87, 0x0b, 0xa8, 0x62, 0xad, 0x41, 0x55, -0x69, 0x36, 0xea, 0xcc, 0x63, 0x06, 0xe2, 0x7f, 0xbc, 0xdb, 0x6d, 0x9f, -0x01, 0xfe, 0x67, 0x7c, 0xcd, 0x0d, 0x12, 0xba, 0x74, 0xe9, 0xef, 0x5b, -0xaa, 0xf2, 0x6c, 0x14, 0xc5, 0x1c, 0x3a, 0x34, 0x51, 0xa5, 0xcc, 0xf5, -0x0d, 0x5a, 0x1f, 0x14, 0x2a, 0x11, 0xcf, 0x7a, 0xaf, 0xcb, 0xef, 0x3f, -0x77, 0x0e, 0xef, 0xd9, 0xd1, 0x4c, 0x92, 0x84, 0xdf, 0xf9, 0xdd, 0xdf, -0xac, 0x80, 0x6f, 0x0e, 0xfa, 0x10, 0x0f, 0xc6, 0x54, 0x55, 0xc0, 0x80, -0x73, 0x8e, 0x34, 0xad, 0xc1, 0x50, 0x72, 0x7a, 0x7e, 0xb3, 0x51, 0x36, -0x78, 0x40, 0x44, 0x9f, 0xb6, 0x56, 0x69, 0x36, 0x1b, 0x34, 0x9b, 0x09, -0x45, 0x21, 0xb4, 0xdb, 0xdd, 0xca, 0xea, 0x21, 0xc5, 0xc1, 0xc6, 0x7c, -0xee, 0xfd, 0x8e, 0x8c, 0x3f, 0x1c, 0x49, 0x92, 0x6c, 0xb0, 0xbe, 0x88, -0xa0, 0xa2, 0x15, 0x68, 0x83, 0x31, 0x06, 0x6b, 0x0c, 0xa2, 0x82, 0x28, -0x44, 0x91, 0xc3, 0x8c, 0x12, 0xc0, 0xe9, 0x07, 0x12, 0x50, 0xd5, 0x33, -0xaa, 0x42, 0xa3, 0xd1, 0xa0, 0x56, 0x8b, 0x59, 0x5d, 0xcd, 0x10, 0x91, -0x2a, 0xe8, 0xcc, 0x98, 0x84, 0xc6, 0x49, 0xef, 0x8e, 0x40, 0xf8, 0x8d, -0x8c, 0x05, 0xef, 0x28, 0x0d, 0x1b, 0x0c, 0x91, 0xb5, 0x58, 0x6b, 0xf0, -0x62, 0x80, 0x92, 0x5a, 0x2d, 0xa5, 0xd3, 0x19, 0x66, 0xa3, 0xd6, 0x43, -0x08, 0xc8, 0x39, 0x11, 0x4b, 0x14, 0x45, 0x34, 0x1a, 0x35, 0xee, 0xdc, -0x59, 0x44, 0xc4, 0x57, 0x96, 0xd9, 0x18, 0xc0, 0x83, 0xb1, 0x5b, 0x0f, -0x8c, 0x08, 0xc8, 0xb0, 0x4f, 0x42, 0x03, 0x78, 0x67, 0xc1, 0x59, 0x83, -0xb3, 0x16, 0x54, 0x50, 0x63, 0xb1, 0x26, 0xd8, 0xbf, 0x52, 0xda, 0xb9, -0x87, 0x10, 0xd0, 0x16, 0x08, 0x69, 0x9a, 0x56, 0xbd, 0x7c, 0x7f, 0xe8, -0x81, 0x8d, 0xd6, 0x7f, 0x74, 0x09, 0x0d, 0x08, 0x84, 0xe6, 0x2e, 0x78, -0xc2, 0x20, 0x38, 0x63, 0x02, 0x78, 0x67, 0x71, 0xd6, 0xa2, 0x28, 0x42, -0x90, 0x54, 0x78, 0xda, 0xd6, 0x4d, 0xe7, 0xa6, 0x18, 0x90, 0x33, 0x03, -0x1d, 0x8a, 0xc0, 0xea, 0x6a, 0x77, 0xcc, 0xf2, 0x61, 0x99, 0x8f, 0x42, -0x42, 0xde, 0x97, 0xc3, 0x6e, 0x55, 0xd5, 0x63, 0x8d, 0xc1, 0x1a, 0x70, -0xd6, 0x11, 0xbb, 0x08, 0x6b, 0x42, 0x7d, 0xb0, 0x66, 0x20, 0xdf, 0xed, -0x3b, 0xea, 0xcd, 0x12, 0x02, 0x6c, 0xe5, 0x62, 0x2a, 0xeb, 0x8f, 0x77, -0x9a, 0xf7, 0x93, 0x78, 0x14, 0x0f, 0x94, 0xa5, 0x1f, 0x93, 0x4f, 0x58, -0xcf, 0x59, 0x4b, 0xe4, 0xc2, 0x34, 0x80, 0xb3, 0x42, 0x29, 0x86, 0xa2, -0xc8, 0xb7, 0xe9, 0xb3, 0xb6, 0x20, 0x20, 0xa2, 0x18, 0x23, 0x23, 0x02, -0x3e, 0x58, 0x80, 0xca, 0x03, 0xa3, 0x16, 0x79, 0x34, 0x1e, 0x8d, 0x40, -0x59, 0x91, 0x10, 0x9c, 0x09, 0xba, 0x8f, 0x9d, 0x23, 0x89, 0x23, 0xe2, -0xc8, 0x85, 0x6a, 0xed, 0x43, 0x2a, 0x2d, 0x8a, 0x02, 0x19, 0x11, 0xb8, -0xf9, 0x40, 0x02, 0xaa, 0x82, 0xc1, 0x90, 0x65, 0x19, 0xab, 0xab, 0xdd, -0xca, 0x23, 0xa3, 0xc2, 0x25, 0xf2, 0xd1, 0x04, 0xf1, 0x40, 0x3e, 0x06, -0xc1, 0x1a, 0x1b, 0xc0, 0x47, 0x11, 0x49, 0xe4, 0x88, 0x9c, 0xa3, 0xf0, -0x25, 0xc6, 0x1a, 0x0c, 0x86, 0x6e, 0x77, 0x6d, 0xdc, 0x03, 0xcb, 0x0f, -0x24, 0x20, 0x22, 0x37, 0x8c, 0xb5, 0xe7, 0xf2, 0xac, 0x4f, 0xaf, 0xbb, -0xce, 0x40, 0x77, 0x66, 0xd0, 0xb3, 0xc0, 0xb0, 0x97, 0x19, 0xfd, 0x66, -0xf7, 0x04, 0xca, 0xd2, 0x83, 0x86, 0xc0, 0x4d, 0x22, 0x47, 0x2d, 0x89, -0xa8, 0xa5, 0x31, 0x49, 0xe4, 0xc2, 0xe7, 0x3e, 0x80, 0xcf, 0xf2, 0xac, -0xb2, 0xfe, 0x90, 0xc0, 0x8d, 0x87, 0x11, 0x58, 0x0e, 0xac, 0x3b, 0x2c, -0x2e, 0x2c, 0x52, 0xaf, 0xa5, 0xe4, 0x59, 0x8e, 0xa8, 0x60, 0x08, 0x1e, -0x52, 0x01, 0xd1, 0x40, 0x26, 0x49, 0x52, 0xfa, 0xfd, 0x9c, 0x34, 0x4d, -0x76, 0x0c, 0x3e, 0xcb, 0xf2, 0x0a, 0xbc, 0x25, 0x8d, 0x23, 0x1a, 0x69, -0x42, 0x3d, 0x49, 0xa8, 0xc5, 0x11, 0xce, 0x39, 0x4a, 0x09, 0x2e, 0x55, -0x55, 0x96, 0x96, 0x97, 0xf1, 0x5e, 0xc7, 0x3d, 0x70, 0x9f, 0x84, 0x36, -0xb4, 0x12, 0xaa, 0x7a, 0x53, 0x51, 0xba, 0x6b, 0x5d, 0xfa, 0xfd, 0x5e, -0x60, 0xae, 0x42, 0x64, 0xc0, 0xa2, 0x18, 0x35, 0x18, 0x06, 0x7b, 0xde, -0x92, 0xc7, 0x8e, 0x3e, 0xce, 0x8f, 0xdf, 0xf8, 0x49, 0x00, 0xb5, 0x43, -0xf0, 0x3f, 0x79, 0xf3, 0x17, 0x44, 0x36, 0x80, 0xaf, 0x27, 0x49, 0x20, -0x90, 0x26, 0xa4, 0x49, 0x5c, 0xe5, 0x7f, 0x10, 0x14, 0xaf, 0xc2, 0xf2, -0xf2, 0x52, 0xd5, 0xd9, 0x0e, 0x97, 0xb8, 0xb1, 0x79, 0xcd, 0xcd, 0x1e, -0xb8, 0x6e, 0x8c, 0xb9, 0xd4, 0xed, 0x76, 0xf1, 0x65, 0x49, 0x91, 0x15, -0x38, 0x43, 0x55, 0xde, 0xc1, 0x20, 0x94, 0x3e, 0x48, 0x0a, 0x51, 0x6a, -0xb5, 0x06, 0x59, 0x2e, 0xfc, 0xe0, 0x07, 0xff, 0x8d, 0xf7, 0x83, 0xb6, -0x3a, 0xb8, 0x3c, 0xe8, 0x5c, 0x51, 0xf5, 0xa8, 0x0c, 0xf2, 0xbd, 0xe2, -0x8c, 0xa1, 0x91, 0xc6, 0xa4, 0x71, 0x44, 0xb3, 0x96, 0xd2, 0x48, 0x13, -0xe2, 0x28, 0xc2, 0x5a, 0xc8, 0x4b, 0x8f, 0x57, 0xa1, 0xf4, 0xc2, 0xc2, -0xe2, 0x12, 0x59, 0x5e, 0xe0, 0x65, 0x18, 0x64, 0xd7, 0xa7, 0xa7, 0x2f, -0xae, 0x3c, 0xd0, 0x03, 0x57, 0xaf, 0xfe, 0xe1, 0xcf, 0xc4, 0xfb, 0x19, -0x2f, 0x9e, 0x85, 0x85, 0x36, 0xbe, 0xcc, 0x31, 0x06, 0x22, 0x0b, 0x91, -0xb5, 0x24, 0xce, 0x91, 0x38, 0x4b, 0xec, 0x0c, 0x91, 0x05, 0x67, 0x14, -0x4b, 0x68, 0xd6, 0x8d, 0x2a, 0x2a, 0x1e, 0xd4, 0xa3, 0x3e, 0x68, 0xdc, -0xa8, 0x60, 0x35, 0x3c, 0x24, 0xb1, 0x96, 0x7a, 0x1c, 0xd1, 0xac, 0x25, -0xec, 0xa9, 0xd7, 0xd8, 0xdf, 0x6c, 0xb0, 0xb7, 0x5e, 0xa3, 0x9e, 0x26, -0x95, 0xf6, 0x4d, 0xd8, 0x13, 0x94, 0x9e, 0xac, 0x28, 0xf8, 0x60, 0xee, -0x03, 0xbc, 0x94, 0xe3, 0xd6, 0x7f, 0x7d, 0x2b, 0xaf, 0x6e, 0x71, 0x2e, -0xa4, 0xdf, 0x17, 0x2f, 0x17, 0xda, 0xed, 0x36, 0x93, 0x13, 0x93, 0x24, -0x91, 0xc5, 0x60, 0x89, 0x6c, 0xc8, 0x46, 0xce, 0x04, 0x40, 0x45, 0xc5, -0xbe, 0x1c, 0x5c, 0xd5, 0x63, 0x6c, 0x28, 0x80, 0x6a, 0xc0, 0x62, 0xc0, -0x99, 0xca, 0xea, 0x0e, 0x67, 0x2d, 0x49, 0xe4, 0x48, 0xe3, 0x88, 0x5a, -0x12, 0x93, 0xc6, 0x31, 0x49, 0xec, 0x30, 0xc6, 0x50, 0x7a, 0xc1, 0x8b, -0x90, 0x97, 0x25, 0x79, 0xe9, 0x79, 0xff, 0xce, 0x2c, 0xfd, 0x2c, 0xc3, -0x0f, 0xfb, 0x24, 0x66, 0xa6, 0xa7, 0x2f, 0x6e, 0x75, 0x18, 0xbc, 0xe5, -0x7e, 0xe0, 0xb2, 0x17, 0x7f, 0x21, 0x2f, 0x72, 0xe6, 0xdb, 0x1f, 0x90, -0x3e, 0xf6, 0x18, 0x91, 0x0d, 0x6d, 0x6e, 0xe4, 0x0c, 0xb1, 0x46, 0xc4, -0xce, 0x52, 0x3a, 0x4b, 0xe1, 0x2d, 0x79, 0x69, 0x42, 0x4e, 0xb7, 0x06, -0x2f, 0x82, 0x68, 0xe8, 0x2e, 0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x91, 0x75, -0xc4, 0x91, 0x0d, 0xa9, 0x32, 0x8e, 0x48, 0xa2, 0x88, 0xc8, 0x59, 0xc0, -0x50, 0x8a, 0xa7, 0x14, 0x4f, 0x3f, 0x2f, 0xe8, 0x17, 0x05, 0xf3, 0x0b, -0x6d, 0x16, 0x16, 0x97, 0x29, 0xca, 0xb2, 0x92, 0x23, 0x00, 0x97, 0xb6, -0x02, 0x0f, 0xdb, 0x1c, 0x6c, 0x7d, 0xe3, 0x1b, 0x7f, 0xfd, 0x7a, 0x1c, -0x45, 0x5f, 0xae, 0x25, 0x31, 0x4f, 0x7e, 0xf6, 0x04, 0x07, 0xf6, 0xb7, -0xa8, 0xc5, 0x11, 0x69, 0x1c, 0x11, 0x55, 0xf9, 0x59, 0x34, 0xe8, 0xbc, -0xf4, 0x42, 0xe9, 0x3d, 0xa5, 0xf7, 0x55, 0xc6, 0x90, 0x6a, 0x3f, 0x05, -0xd6, 0x84, 0xde, 0x26, 0x76, 0x96, 0xc8, 0xb9, 0x6a, 0x56, 0x0d, 0x9a, -0x2a, 0x85, 0x0f, 0x72, 0xe9, 0x65, 0x05, 0xdd, 0x2c, 0xe3, 0x83, 0x76, -0x9b, 0x77, 0x6f, 0xcd, 0xb0, 0x9e, 0x65, 0xe3, 0x04, 0x6e, 0x4e, 0x4f, -0x5f, 0xfc, 0x8d, 0xed, 0x08, 0x6c, 0x79, 0xb4, 0x18, 0x3b, 0xfb, 0xed, -0xb2, 0x2c, 0xce, 0xe7, 0xd0, 0x9a, 0xb9, 0xfd, 0x1e, 0xd1, 0x89, 0x08, -0xbb, 0x77, 0x4f, 0xa8, 0x9a, 0x71, 0x8c, 0x73, 0x96, 0xc8, 0x00, 0x55, -0xd5, 0x14, 0x11, 0x64, 0x10, 0xc0, 0x63, 0x06, 0xb1, 0x55, 0xf5, 0xb6, -0xd6, 0xe2, 0xaa, 0x6a, 0xae, 0x28, 0x5e, 0xa4, 0x02, 0x5f, 0xd2, 0xcb, -0x0a, 0x7a, 0x59, 0xc6, 0xfc, 0xc2, 0x02, 0xb7, 0xde, 0xbb, 0x4d, 0x96, -0x97, 0x94, 0xde, 0x8f, 0xa7, 0xce, 0xa9, 0xed, 0xc0, 0x6f, 0xeb, 0x01, -0x80, 0xaf, 0x7f, 0xed, 0xaf, 0xfe, 0xc4, 0x18, 0xfb, 0x17, 0xb5, 0x24, -0xa1, 0x59, 0xaf, 0xf1, 0xc4, 0x89, 0xe3, 0xb4, 0xf6, 0xee, 0xa5, 0x9e, -0xc4, 0x95, 0x27, 0x42, 0xd7, 0x68, 0xad, 0x19, 0xd6, 0x99, 0x00, 0xaf, -0x1a, 0x95, 0x1b, 0x06, 0x25, 0x4f, 0x35, 0x00, 0x2f, 0x7d, 0xd0, 0x7a, -0xb0, 0x7c, 0x4e, 0x2f, 0xcb, 0x99, 0xbd, 0x73, 0x97, 0xbb, 0x73, 0xf7, -0xe8, 0x67, 0x39, 0x79, 0x51, 0x8c, 0x6b, 0xff, 0x8f, 0xa7, 0xa7, 0x2f, -0x5e, 0x79, 0x24, 0x02, 0x00, 0x5f, 0x7d, 0xf1, 0xea, 0xf5, 0xc8, 0xb9, -0xf3, 0x69, 0x45, 0xe2, 0xf8, 0xb1, 0x63, 0x1c, 0xd8, 0x37, 0x22, 0x91, -0x44, 0x11, 0xae, 0x22, 0x32, 0xd8, 0x51, 0x0d, 0xf5, 0x53, 0x15, 0x3b, -0xa9, 0xb6, 0x8f, 0x41, 0x6a, 0x21, 0x48, 0xfb, 0x79, 0xc1, 0x7a, 0x9e, -0xb3, 0xba, 0xb6, 0xc6, 0xad, 0xd9, 0x59, 0x96, 0x57, 0x57, 0xe9, 0x67, -0x39, 0xa5, 0x2f, 0x29, 0xfd, 0x10, 0xfc, 0xeb, 0xd3, 0xd3, 0x17, 0xbf, -0xf2, 0x20, 0xf0, 0xf0, 0x90, 0xd3, 0xe9, 0xc8, 0xb9, 0xa9, 0xac, 0x28, -0x6e, 0xa8, 0xea, 0x69, 0x11, 0xcf, 0xdb, 0xbf, 0xfa, 0x15, 0x47, 0x26, -0x0f, 0xf1, 0xa9, 0xc3, 0x87, 0x68, 0xa4, 0x29, 0x49, 0xec, 0x49, 0x22, -0x47, 0xec, 0x1c, 0xce, 0x1a, 0xac, 0xb1, 0xc3, 0x63, 0x10, 0x25, 0x00, -0xf7, 0x5e, 0x28, 0x45, 0xc8, 0x8b, 0xb2, 0xca, 0x32, 0x25, 0x6b, 0xbd, -0x75, 0xee, 0xcd, 0xcf, 0x31, 0xdf, 0x6e, 0xd3, 0xeb, 0xe7, 0xe4, 0x45, -0x1e, 0x62, 0x48, 0x76, 0x07, 0xfe, 0xa1, 0x1e, 0x00, 0xf8, 0xfa, 0x57, -0xff, 0xb2, 0x95, 0x97, 0xe5, 0x8d, 0xc8, 0xb9, 0xd3, 0x71, 0xe4, 0x48, -0xe3, 0x98, 0x46, 0xbd, 0xc6, 0xe1, 0x83, 0x93, 0x4c, 0xb4, 0x5a, 0xd4, -0x6b, 0x29, 0xf1, 0x30, 0x38, 0x03, 0x01, 0x34, 0xb4, 0x1b, 0xa2, 0xe1, -0x10, 0xa0, 0xf0, 0x9e, 0xbc, 0x28, 0x59, 0xe9, 0x74, 0x58, 0x5a, 0x59, -0xa6, 0xbd, 0xb8, 0xc8, 0x7a, 0x16, 0x80, 0x17, 0x83, 0xd6, 0x7a, 0x54, -0x71, 0x77, 0x0c, 0x7e, 0x47, 0x04, 0x00, 0xbe, 0xf6, 0xe2, 0xd5, 0x56, -0x96, 0xe7, 0xd7, 0xad, 0xb5, 0x4f, 0x27, 0xb1, 0x23, 0x8e, 0x22, 0xe2, -0x28, 0x22, 0x89, 0x63, 0xf6, 0xed, 0xd9, 0x43, 0xb3, 0xd1, 0x64, 0x4f, -0xb3, 0x41, 0x12, 0x27, 0x38, 0x17, 0x1a, 0x32, 0xef, 0x4b, 0xb2, 0xbc, -0xa0, 0xdf, 0xef, 0xb3, 0xd6, 0x5d, 0x63, 0xa5, 0xd3, 0x21, 0xcb, 0x73, -0xfa, 0x79, 0x41, 0x51, 0x16, 0x21, 0xf5, 0x4a, 0xb0, 0xfa, 0x78, 0xba, -0x9c, 0x9e, 0xbe, 0xf8, 0xed, 0x9d, 0x82, 0xdf, 0x31, 0x81, 0xc1, 0xf8, -0xca, 0xd4, 0x2b, 0x97, 0x8c, 0x31, 0xdf, 0x72, 0xd6, 0xe2, 0x5c, 0x28, -0x4e, 0x51, 0x95, 0xd3, 0xc3, 0x46, 0xc4, 0x0d, 0x25, 0x04, 0x21, 0x60, -0x45, 0x06, 0x69, 0xb6, 0x1c, 0xa6, 0x5b, 0x11, 0x19, 0xca, 0xa5, 0x7a, -0xfc, 0x0c, 0x30, 0x35, 0x3d, 0x7d, 0xf1, 0x87, 0xbb, 0x01, 0xbf, 0x6b, -0x02, 0x00, 0x2f, 0xbc, 0xf0, 0xf2, 0x69, 0x63, 0xcc, 0x65, 0x6b, 0xcc, -0x39, 0x53, 0xe9, 0xde, 0x1a, 0x13, 0xb2, 0x11, 0xa1, 0x67, 0x02, 0x86, -0xe7, 0x9a, 0xa2, 0x32, 0xb4, 0xb2, 0x6c, 0x38, 0x72, 0x04, 0x42, 0x7f, -0x7f, 0x79, 0xb7, 0x56, 0xff, 0x50, 0x04, 0x06, 0xe3, 0xf9, 0xe7, 0xbf, -0xf3, 0xb4, 0x31, 0x4c, 0x59, 0x63, 0x9f, 0x35, 0xc6, 0xb4, 0xac, 0x1d, -0x6c, 0xc0, 0xc7, 0xf6, 0x0a, 0x3a, 0x6a, 0xf0, 0x94, 0x0d, 0xc0, 0x6f, -0x02, 0x97, 0xd9, 0xa6, 0x41, 0xfb, 0x7f, 0x21, 0x30, 0x3e, 0x9e, 0x7f, -0xfe, 0x3b, 0xe7, 0x81, 0x33, 0x84, 0x63, 0x8f, 0xe3, 0xd5, 0x1c, 0x8c, -0x65, 0x02, 0xe0, 0x19, 0x42, 0x3b, 0x7c, 0x63, 0x7a, 0xfa, 0xe2, 0xad, -0x0f, 0xfd, 0xd0, 0x6a, 0x7c, 0x64, 0x7f, 0xa9, 0xff, 0xb8, 0xc6, 0x27, -0xfe, 0x9f, 0x3d, 0x3e, 0xf1, 0x04, 0xfe, 0x0f, 0xa4, 0xff, 0x07, 0x95, -0xd9, 0xf3, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, -0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_stop.xpm b/Source/Core/DolphinWX/resources/toolbar_stop.xpm deleted file mode 100644 index c9fbb24767..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_stop.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static const char *toolbar_stop_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 72 1", -" c #96150D", -". c #9B140D", -"X c #971911", -"o c #9A1811", -"O c #9C1F18", -"+ c #A3160E", -"@ c #A31911", -"# c #AC1811", -"$ c #A01F18", -"% c #B41811", -"& c #BE1911", -"* c #9D231C", -"= c #A4231C", -"- c #AB231C", -"; c #B3231C", -": c #BB231C", -"> c #AC2B24", -", c #B32B24", -"< c #BB2B24", -"1 c #A1302A", -"2 c #CB160E", -"3 c #C41911", -"4 c #CB1911", -"5 c #C3241C", -"6 c #CB241C", -"7 c #D2231B", -"8 c #C42C24", -"9 c #CC2C24", -"0 c #D12C24", -"q c #C48A86", -"w c #C88B87", -"e c #C68E8A", -"r c #C98E8A", -"t c #C6918E", -"y c #CE918E", -"u c #D2938F", -"i c #CD9895", -"p c #D69390", -"a c #DC9490", -"s c #E1928E", -"d c #E19491", -"f c #CDCCCC", -"g c #D0CFCF", -"h c #DFCDCB", -"j c #D4D3D3", -"k c #D8D7D7", -"l c #D7D8D6", -"z c #D8D8D7", -"x c #DCDCDB", -"c c #E1CFCE", -"v c #E3D1CF", -"b c #E6D2D1", -"n c #EDD7D6", -"m c #E4DDDC", -"M c #EFD9D8", -"N c #F0DAD9", -"B c #E0E0DF", -"V c #E3E3E3", -"C c #E8E7E7", -"Z c #E6E8E7", -"A c #E8E8E7", -"S c #E8E7E8", -"D c #E7E9E9", -"F c #ECECEC", -"G c #F1E7E6", -"H c #F0F0EF", -"J c #EDF3F3", -"K c #F2F2F2", -"L c #F1F8F7", -"P c #F6FCFC", -"I c #F9FFFF", -"U c None", -/* pixels */ -"UUUUUUUUUUUUUUUUUUzlfffffffflzUUUUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUzffjkxVVVCVVxzjffzUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUjfjxZDDDDDDDDDDDACxjfjUUUUUUUUUUUUU", -"UUUUUUUUUUUzflVAFDDDDFFFFFFDDDADAVkfkUUUUUUUUUUU", -"UUUUUUUUUUfjVDDDDFFFFFFFFFFFFFFDAADVjfUUUUUUUUUU", -"UUUUUUUUxfzADDDFFFFFFFFFFFFFFFFFFDAADxfxUUUUUUUU", -"UUUUUUUzfVFDDFFFFFFFFFFFFFFFFFFFFFFDDDVfkUUUUUUU", -"UUUUUUzfVFDDFFFFFFFFFHHHHHHFFFFFFFFFDDDVfkUUUUUU", -"UUUUUxfVFDFFFFFFFFHKKKKKKKKKHFFFFFFFFFAAVfxUUUUU", -"UUUUUfmFDFFFFFFFKKKKKKKKKKKKKKKHFFFFFFFADVfUUUUU", -"UUUUfzDDFFFFFFFKKKKKKKKKKKKKKKKKKHFFFFFFDDxfUUUU", -"UUUxgADFFFFFFKKKKKKKKKKKKKKKKKKKKKHFFFFFDDAjzUUU", -"UUUfVDFFFFFFKKKKKKKKKKKKKKKKKKKKKKKHFFFFFDDVfUUU", -"UUljDDFFFFFKKKKKKKKKKKKKKKKKKKKKKKKKHFFFFFDDkjUU", -"UUfVFFFFFFHKKKKIIIIIIIIIIIIIIIIIIKKKKFFFFFDAVfUU", -"UxjADFFFFHKKKLGdsssddaaaaappuuyyiFKKKKHFFFFADjxU", -"UfxFFFFFFKKKKLn6244433&&%%%#@@@.*mDZZAFFFFFDDmfU", -"UfCDFFFFFKKKKPM077766555::;;--=$1mDVVVxxVAFFACfU", -"xjDDFFFFHKKKKPN077776655::;;--=$1mDZVVVxxxxZDDjx", -"kkFFFFFFKKKKKPN077776655::;;--=$1mFCVVVxxxzlxSxl", -"fxFFFFFHKKKKKPN077766555::;;--=O1mFCVVVBxxxzjjzf", -"fVFFFFFHKKKKKPN96666655::;;;--=O1mFCVVVBxxxzjjff", -"fVFFFFFHKKKKKPN96666555::;;--==O1mFAZVVVxxxzjjff", -"fVDFFFFHKKKKKPN8555555::;;;--==O1mFAZVVVxxxzjjgf", -"fVFFFFFHKKKKKPn855555:::;;---==O1mFAZVVVxxxzjjgf", -"fVFFFFFHKKKKKLb<:::::::;;;--==*O1mFAZVVVxxxzjjff", -"fVFFFFFHKKKKKJb<:::::;;;;--===*O1mFCZVVVxxxzjjff", -"gxFFFFFHKKKKFFv<;;;;;;;----==**O1mFCVVVBxxxzjjff", -"kkFFFFFHKKKKAFv,;;;;;;----===**O1mFCVVVBxxxljjfk", -"xjDDFFFFKKKFZFc,--------===****O1mFZVVVxxxxljgfx", -"UfZDFFFFHKKVVFc>------====*****O1mDVVVVxxxzjjgfU", -"UgxFFFFFFKFVVDh=+@@@@@ooooXXXXX *mDVVVBxxxzjjfgU", -"UxjDDFFFFKCVVZmrwwrrrrrrreeeeeeqtBZVVBxxxxljjfxU", -"UUfVFFFFFFVVVVZJJJJJJLLLLLLLJJJJJVVVVxxxxzjjffUU", -"UUllDDFFFFxBVVVVZCAADDDFDDDAAACZVVVVxxxxzljjflUU", -"UUUfVFFFFAxxVVVVVZCCAAAAAAACCCVVVVVxxxxxljjffUUU", -"UUUxjDDFFVxxxBVVVVVVZCCCCCZZVVVVVVxxxxxzjjgfxUUU", -"UUUUfxFDFVxxxxxVVVVVVVVVVVVVVVVVBxxxxxzljjffUUUU", -"UUUUUfVFFBzxxxxxVVVVVVVVVVVVVVVxxxxxxzljjffUUUUU", -"UUUUUxfVFxlzxxxxxxBVVVVVVVVVBxxxxxxxzljjffxUUUUU", -"UUUUUUzfVxjlzxxxxxxxxxxxxxxxxxxxxxxzjjjffzUUUUUU", -"UUUUUUUzfkjjjlzxxxxxxxxxxxxxxxxxxzljjjffzUUUUUUU", -"UUUUUUUUxffjjjjlzxxxxxxxxxxxxxxzljjjjffxUUUUUUUU", -"UUUUUUUUUUffgjjjjlzzzxxxxxxzzlljjjjgffUUUUUUUUUU", -"UUUUUUUUUUUxffgjjjjjjlllllljjjjjjgffxUUUUUUUUUUU", -"UUUUUUUUUUUUUjfffjjjjjjjjjjjjjgfffjUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUxjffffjjjjjjffffjxUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUUUUxzjffffffjzxUUUUUUUUUUUUUUUUUU" -}; diff --git a/Source/Core/InputCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp index 9065888d7d..2e6ad10617 100644 --- a/Source/Core/InputCommon/Src/ControllerEmu.cpp +++ b/Source/Core/InputCommon/Src/ControllerEmu.cpp @@ -295,6 +295,7 @@ ControllerEmu::Tilt::Tilt(const char* const _name) settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50)); settings.push_back(new Setting(_trans("Circle Stick"), 0)); + settings.push_back(new Setting(_trans("Angle"), 0.9f, 0, 180)); } ControllerEmu::Cursor::Cursor(const char* const _name) diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h index 888e0c7fa9..6084a610a1 100644 --- a/Source/Core/InputCommon/Src/ControllerEmu.h +++ b/Source/Core/InputCommon/Src/ControllerEmu.h @@ -307,6 +307,7 @@ public: ControlState deadzone = settings[0]->value; ControlState circle = settings[1]->value; + auto const angle = settings[2]->value / 1.8f; ControlState m = controls[4]->control_ref->State(); // modifier code @@ -363,8 +364,8 @@ public: m_tilt[1] = std::max(m_tilt[1] - 0.1f, yy); } - *y = C(m_tilt[1] * range + base); - *x = C(m_tilt[0] * range + base); + *y = C(m_tilt[1] * angle * range + base); + *x = C(m_tilt[0] * angle * range + base); } private: float m_tilt[2]; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 82cfe2469e..8e96231674 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -45,7 +45,7 @@ void ControllerInterface::Initialize() ciface::Xlib::Init(m_devices, m_hwnd); #endif #ifdef CIFACE_USE_OSX - ciface::OSX::Init(m_devices); + ciface::OSX::Init(m_devices, m_hwnd); #endif #ifdef CIFACE_USE_SDL ciface::SDL::Init(m_devices); @@ -461,7 +461,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec i = device->Inputs().begin(), e = device->Inputs().end(); for (std::vector::iterator state = states.begin(); i != e; ++i) - *state++ = ((*i)->GetState() > INPUT_DETECT_THRESHOLD); + *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); while (time < ms) { @@ -477,7 +477,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec if (false == *state) return *i; } - else + else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD)) *state = false; } Common::SleepCurrentThread(10); time += 10; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 7c5a236d75..b846bb56e8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -87,7 +87,7 @@ public: Input* ToInput() { return this; } }; - + // // Output // @@ -122,6 +122,36 @@ public: protected: void AddInput(Input* const i); void AddOutput(Output* const o); + + class FullAnalogSurface : public Input + { + public: + FullAnalogSurface(Input* low, Input* high) + : m_low(*low), m_high(*high) + {} + + ControlState GetState() const + { + return (1 + m_high.GetState() - m_low.GetState()) / 2; + } + + std::string GetName() const + { + return m_low.GetName() + *m_high.GetName().rbegin(); + } + + private: + Input& m_low; + Input& m_high; + }; + + void AddAnalogInputs(Input* low, Input* high) + { + AddInput(low); + AddInput(high); + AddInput(new FullAnalogSurface(low, high)); + AddInput(new FullAnalogSurface(high, low)); + } private: std::vector m_inputs; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index 08d62bcfc1..9bc5364e76 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -254,9 +254,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset) { range.diph.dwObj = offset * sizeof(LONG); - // try to set some nice power of 2 values (8192) - range.lMin = -(1 << 13); - range.lMax = (1 << 13); + // try to set some nice power of 2 values (128) to match the GameCube controls + range.lMin = -(1 << 7); + range.lMax = (1 << 7); m_device->SetProperty(DIPROP_RANGE, &range.diph); // but i guess not all devices support setting range // so i getproperty right afterward incase it didn't set :P @@ -267,8 +267,8 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI const LONG& ax = (&m_state_in.lX)[offset]; // each axis gets a negative and a positive input instance associated with it - AddInput(new Axis(offset, ax, base, range.lMin-base)); - AddInput(new Axis(offset, ax, base, range.lMax-base)); + AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base), + new Axis(offset, ax, base, range.lMax-base)); } } @@ -281,17 +281,19 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI if ( objects.size() ) { // temporary - DWORD rgdwAxes[] = {DIJOFS_X, DIJOFS_Y}; - LONG rglDirection[] = {0, 0}; + DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y}; + LONG rglDirection[2] = {-200, 0}; DIEFFECT eff; ZeroMemory(&eff, sizeof(eff)); eff.dwSize = sizeof(DIEFFECT); eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.dwDuration = INFINITE; // (4 * DI_SECONDS) + eff.dwSamplePeriod = 0; eff.dwGain = DI_FFNOMINALMAX; eff.dwTriggerButton = DIEB_NOTRIGGER; - eff.cAxes = std::min((DWORD)2, (DWORD)objects.size()); + eff.dwTriggerRepeatInterval = 0; + eff.cAxes = std::min((DWORD)1, (DWORD)objects.size()); eff.rgdwAxes = rgdwAxes; eff.rglDirection = rglDirection; @@ -310,7 +312,12 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI { // ugly if ladder if (0 == f) + { + DICONSTANTFORCE diCF = {-10000}; + diCF.lMagnitude = DI_FFNOMINALMAX; eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + eff.lpvTypeSpecificParams = &diCF; + } else if (1 == f) eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE); else diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h index 0458d87e1d..225906c35d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h @@ -7,7 +7,7 @@ namespace ciface namespace OSX { -void Init(std::vector& devices); +void Init(std::vector& devices, void *window); void DeInit(); void DeviceElementDebugPrint(const void *, void *); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm index bf4f49bac6..aef8f283c1 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm @@ -1,5 +1,6 @@ #include #include +#include #include "../ControllerInterface.h" #include "OSX.h" @@ -131,6 +132,7 @@ void DeviceDebugPrint(IOHIDDeviceRef device) #endif } +static void *g_window; static void DeviceMatching_callback(void* inContext, IOReturn inResult, @@ -150,7 +152,7 @@ static void DeviceMatching_callback(void* inContext, if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) devices->push_back(new Keyboard(inIOHIDDeviceRef, - name, kbd_name_counts[name]++)); + name, kbd_name_counts[name]++, g_window)); #if 0 else if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Mouse)) @@ -162,13 +164,15 @@ static void DeviceMatching_callback(void* inContext, name, joy_name_counts[name]++)); } -void Init(std::vector& devices) +void Init(std::vector& devices, void *window) { HIDManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); if (!HIDManager) NSLog(@"Failed to create HID Manager reference"); + g_window = window; + IOHIDManagerSetDeviceMatching(HIDManager, NULL); // Callbacks for acquisition or loss of a matching device diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm index 129a5f38e0..0d89c2e393 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm @@ -64,8 +64,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index) AddInput(new Hat(e, m_device, Hat::down)); AddInput(new Hat(e, m_device, Hat::left)); } else { - AddInput(new Axis(e, m_device, Axis::negative)); - AddInput(new Axis(e, m_device, Axis::positive)); + AddAnalogInputs(new Axis(e, m_device, Axis::negative), + new Axis(e, m_device, Axis::positive)); } } CFRelease(axes); @@ -121,7 +121,9 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d // Need to parse the element a bit first std::string description("unk"); - switch (IOHIDElementGetUsage(m_element)) { + int const usage = IOHIDElementGetUsage(m_element); + switch (usage) + { case kHIDUsage_GD_X: description = "X"; break; @@ -146,6 +148,13 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d case kHIDUsage_Csmr_ACPan: description = "Pan"; break; + default: + { + std::ostringstream s; + s << usage; + description = s.str(); + break; + } } m_name = std::string("Axis ") + description; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h index 1a7fcd045b..d59651c98a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h @@ -21,21 +21,51 @@ private: const IOHIDDeviceRef m_device; std::string m_name; }; + class Cursor : public Input + { + public: + std::string GetName() const; + bool IsDetectable() { return false; } + Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {} + ControlState GetState() const; + private: + const float& m_axis; + const u8 m_index; + const bool m_positive; + }; + class Button : public Input + { + public: + std::string GetName() const; + Button(u8 index, const unsigned char& button) : m_index(index), m_button(button) {} + ControlState GetState() const; + private: + const unsigned char& m_button; + const u8 m_index; + }; public: bool UpdateInput(); bool UpdateOutput(); - Keyboard(IOHIDDeviceRef device, std::string name, int index); + Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window); std::string GetName() const; std::string GetSource() const; int GetId() const; private: + struct + { + float x, y; + } m_cursor; + const IOHIDDeviceRef m_device; const std::string m_device_name; int m_index; + void *m_window; + uint32_t m_windowid; + unsigned char m_mousebuttons[3]; }; } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm index 7543d507dd..56e360019a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm @@ -1,5 +1,7 @@ #include #include +#include +#include // wxWidgets #include "../ControllerInterface.h" #include "OSXKeyboard.h" @@ -9,10 +11,11 @@ namespace ciface namespace OSX { -Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index) +Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window) : m_device(device) , m_device_name(name) , m_index(index) + , m_window(window) { // This class should only recieve Keyboard or Keypad devices // Now, filter on just the buttons we can handle sanely @@ -39,10 +42,48 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index) } CFRelease(elements); } + + m_windowid = [[(NSView *)(((wxWindow *)window)->GetHandle()) window] windowNumber]; + + // cursor, with a hax for-loop + for (unsigned int i=0; i<4; ++i) + AddInput(new Cursor(!!(i&2), (&m_cursor.x)[i/2], !!(i&1))); + + for (u8 i = 0; i < sizeof(m_mousebuttons) / sizeof(m_mousebuttons[0]); ++i) + AddInput(new Button(i, m_mousebuttons[i])); } bool Keyboard::UpdateInput() { + CGRect bounds = CGRectZero; + uint32_t windowid[1] = { m_windowid }; + CFArrayRef windowArray = CFArrayCreate(NULL, (const void **) windowid, 1, NULL); + CFArrayRef windowDescriptions = CGWindowListCreateDescriptionFromArray(windowArray); + CFDictionaryRef windowDescription = (CFDictionaryRef) CFArrayGetValueAtIndex((CFArrayRef) windowDescriptions, 0); + + if (CFDictionaryContainsKey(windowDescription, kCGWindowBounds)) + { + CFDictionaryRef boundsDictionary = (CFDictionaryRef) CFDictionaryGetValue(windowDescription, kCGWindowBounds); + + if (boundsDictionary != NULL) + CGRectMakeWithDictionaryRepresentation(boundsDictionary, &bounds); + } + + CFRelease(windowArray); + + CGEventRef event = CGEventCreate(nil); + CGPoint loc = CGEventGetLocation(event); + CFRelease(event); + + loc.x -= bounds.origin.x; + loc.y -= bounds.origin.y; + m_cursor.x = loc.x / bounds.size.width * 2 - 1.0; + m_cursor.y = loc.y / bounds.size.height * 2 - 1.0; + + m_mousebuttons[0] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonLeft); + m_mousebuttons[1] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonRight); + m_mousebuttons[2] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonCenter); + return true; } @@ -201,10 +242,34 @@ ControlState Keyboard::Key::GetState() const return 0; } +ControlState Keyboard::Cursor::GetState() const +{ + return std::max(0.0f, ControlState(m_axis) / (m_positive ? 1.0f : -1.0f)); +} + +ControlState Keyboard::Button::GetState() const +{ + return (m_button != 0); +} + +std::string Keyboard::Cursor::GetName() const +{ + static char tmpstr[] = "Cursor .."; + tmpstr[7] = (char)('X' + m_index); + tmpstr[8] = (m_positive ? '+' : '-'); + return tmpstr; +} + +std::string Keyboard::Button::GetName() const +{ + return std::string("Click ") + char('0' + m_index); +} + std::string Keyboard::Key::GetName() const { return m_name; } + } } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index c7c6898ecd..c5ee3af23f 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -17,6 +17,15 @@ namespace ciface { namespace SDL { + +std::string GetJoystickName(int index) +{ +#if SDL_VERSION_ATLEAST(2, 0, 0) + return SDL_JoystickNameForIndex(index); +#else + return SDL_JoystickName(index); +#endif +} void Init( std::vector& devices ) { @@ -32,7 +41,7 @@ void Init( std::vector& devices ) SDL_Joystick* dev = SDL_JoystickOpen(i); if (dev) { - Joystick* js = new Joystick(dev, i, name_counts[SDL_JoystickName(i)]++); + Joystick* js = new Joystick(dev, i, name_counts[GetJoystickName(i)]++); // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) devices.push_back( js ); @@ -86,8 +95,8 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i) { // each axis gets a negative and a positive input instance associated with it - AddInput(new Axis(i, m_joystick, -32768)); - AddInput(new Axis(i, m_joystick, 32767)); + AddAnalogInputs(new Axis(i, m_joystick, -32768), + new Axis(i, m_joystick, 32767)); } #ifdef USE_SDL_HAPTIC @@ -325,7 +334,7 @@ bool Joystick::UpdateOutput() std::string Joystick::GetName() const { - return StripSpaces(SDL_JoystickName(m_sdl_index)); + return StripSpaces(GetJoystickName(m_sdl_index)); } std::string Joystick::GetSource() const diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h index 139e9f232d..fa770c403d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -5,22 +5,14 @@ #include -#ifdef _WIN32 - #include -#else - #include -#endif +#include #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif #ifdef USE_SDL_HAPTIC - #ifdef _WIN32 - #include - #else - #include - #endif + #include #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index 450080bfd2..dad0c6bbf8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -1,5 +1,7 @@ #include "Xlib.h" +#include + namespace ciface { namespace Xlib @@ -93,7 +95,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key KeySym keysym = 0; do { - keysym = XKeycodeToKeysym(m_display, keycode, i); + keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); i++; } while (keysym == NoSymbol && i < 8); @@ -113,9 +115,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key ControlState KeyboardMouse::Key::GetState() const { - const KeyCode shift = XKeysymToKeycode(m_display, XK_Shift_L); - return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0 - && (m_keyboard[shift / 8] & (1 << (shift % 8))) == 0; + return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } ControlState KeyboardMouse::Button::GetState() const diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index b9d2a93b99..1988a9ebb7 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "InputConfig.h" +#include "../../Core/Src/ConfigManager.h" InputPlugin::~InputPlugin() { @@ -26,18 +27,58 @@ InputPlugin::~InputPlugin() delete *i; } -bool InputPlugin::LoadConfig() +bool InputPlugin::LoadConfig(bool isGC) { IniFile inifile; + IniFile game_ini; + bool useProfile[4] = {false, false, false, false}; + std::string num[4] = {"1", "2", "3", "4"}; + std::string profile[4]; + std::string path; + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000") + { + std::string type; + if (isGC) + { + type = "Pad"; + path = "Profiles/GCPad/"; + } + else + { + type = "Wiimote"; + path = "Profiles/Wiimote/"; + } + game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); + for (int i = 0; i < 4; i++) + { + if (game_ini.Exists("Controls", (type + "Profile" + num[i]).c_str())) + { + game_ini.Get("Controls", (type + "Profile" + num[i]).c_str(), &profile[i]); + if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini")) + useProfile[i] = true; + else + PanicAlertT("Selected controller profile does not exist"); + } + } + } + if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) { std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), e = controllers.end(); - for (; i!=e; ++i) + for (int n = 0; i!=e; ++i, ++n) { // load settings from ini - (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + if (useProfile[n]) + { + IniFile profile_ini; + profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); + (*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); + } + else + (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); // update refs (*i)->UpdateReferences(g_controller_interface); } diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h index 4d25334ce7..71505bb935 100644 --- a/Source/Core/InputCommon/Src/InputConfig.h +++ b/Source/Core/InputCommon/Src/InputConfig.h @@ -42,7 +42,7 @@ public: ~InputPlugin(); - bool LoadConfig(); + bool LoadConfig(bool isGC); void SaveConfig(); std::vector< ControllerEmu* > controllers; diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 5a4ed87c1d..89b6828281 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -3,9 +3,9 @@ set(SRCS Src/BPFunctions.cpp Src/BPStructs.cpp Src/CPMemory.cpp Src/CommandProcessor.cpp - Src/DLCache.cpp Src/Debugger.cpp Src/Fifo.cpp + Src/FPSCounter.cpp Src/FramebufferManagerBase.cpp Src/HiresTextures.cpp Src/ImageWrite.cpp @@ -24,7 +24,6 @@ set(SRCS Src/BPFunctions.cpp Src/Statistics.cpp Src/TextureCacheBase.cpp Src/TextureConversionShader.cpp - Src/TextureDecoder.cpp Src/VertexLoader.cpp Src/VertexLoaderManager.cpp Src/VertexLoader_Color.cpp @@ -41,6 +40,14 @@ set(SRCS Src/BPFunctions.cpp Src/memcpy_amd.cpp) set(LIBS core) + +if(NOT _M_GENERIC) + set(SRCS ${SRCS} Src/x64TextureDecoder.cpp + Src/x64DLCache.cpp) +else() + set(SRCS ${SRCS} Src/GenericTextureDecoder.cpp + Src/GenericDLCache.cpp) +endif() if(NOT ${CL} STREQUAL CL-NOTFOUND) list(APPEND LIBS ${CL}) endif() diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 4c31798d9f..fefb09fecb 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -157,9 +157,21 @@ void AVIDump::Stop() NOTICE_LOG(VIDEO, "Stop"); } -void AVIDump::AddFrame(char *data) +void AVIDump::AddFrame(const u8* data, int w, int h) { - AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, (LPVOID) data, m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer); + static bool shown_error = false; + if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !shown_error) + { + PanicAlert("You have resized the window while dumping frames.\n" + "Nothing sane can be done to handle this.\n" + "Your video will likely be broken."); + shown_error = true; + + m_bitmap.biWidth = w; + m_bitmap.biHeight = h; + } + + AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, const_cast(data), m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer); m_totalBytes += m_byteBuffer; // Close the recording if the file is more than 2gb // VfW can't properly save files over 2gb in size, but can keep writing to them up to 4gb. @@ -252,7 +264,7 @@ bool AVIDump::CreateFile() File::CreateFullPath(s_FormatContext->filename); if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) || - !(s_Stream = av_new_stream(s_FormatContext, 0))) + !(s_Stream = avformat_new_stream(s_FormatContext, codec))) { CloseFile(); return false; @@ -269,7 +281,7 @@ bool AVIDump::CreateFile() s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) || - (avcodec_open(s_Stream->codec, codec) < 0)) + (avcodec_open2(s_Stream->codec, codec, NULL) < 0)) { CloseFile(); return false; @@ -298,9 +310,9 @@ bool AVIDump::CreateFile() return true; } -void AVIDump::AddFrame(uint8_t *data, int width, int height) +void AVIDump::AddFrame(const u8* data, int width, int height) { - avpicture_fill((AVPicture *)s_BGRFrame, data, PIX_FMT_BGR24, width, height); + avpicture_fill((AVPicture *)s_BGRFrame, const_cast(data), PIX_FMT_BGR24, width, height); // Convert image from BGR24 to desired pixel format, and scale to initial // width and height diff --git a/Source/Core/VideoCommon/Src/AVIDump.h b/Source/Core/VideoCommon/Src/AVIDump.h index e74df05db4..08ab6be254 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.h +++ b/Source/Core/VideoCommon/Src/AVIDump.h @@ -24,6 +24,8 @@ #include #endif +#include "CommonTypes.h" + class AVIDump { private: @@ -36,11 +38,11 @@ class AVIDump public: #ifdef _WIN32 static bool Start(HWND hWnd, int w, int h); - static void AddFrame(char *data); #else static bool Start(int w, int h); - static void AddFrame(uint8_t *data, int width, int height); #endif + static void AddFrame(const u8* data, int width, int height); + static void Stop(); }; diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index c452b238b6..38489bcf7a 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -55,6 +55,11 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size snprintf(name, name_size, #reg); \ (void)(reg); + case BPMEM_GENMODE: // 0x00 + SetRegName(BPMEM_GENMODE); + // TODO: Description + break; + case BPMEM_DISPLAYCOPYFILER: // 0x01 // TODO: This is actually the sample pattern used for copies from an antialiased EFB SetRegName(BPMEM_DISPLAYCOPYFILER); @@ -75,6 +80,28 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size } break; + case BPMEM_BLENDMODE: // 0x41 + { + SetRegName(BPMEM_BLENDMODE); + BlendMode mode; mode.hex = cmddata; + const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" }; + snprintf(desc, desc_size, "Enable: %s\n" + "Logic ops: %s\n" + "Dither: %s\n" + "Color write: %s\n" + "Alpha write: %s\n" + "Dest factor: %s\n" + "Source factor: %s\n" + "Subtract: %s\n" + "Logic mode: %s\n", + no_yes[mode.blendenable], no_yes[mode.logicopenable], no_yes[mode.dither], + no_yes[mode.colorupdate], no_yes[mode.alphaupdate], dstfactors[mode.dstfactor], + srcfactors[mode.srcfactor], no_yes[mode.subtract], logicmodes[mode.logicmode]); + } + break; + case BPMEM_EFB_BR: // 0x4A { // TODO: Misleading name, should be BPMEM_EFB_WH instead @@ -148,6 +175,147 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size // TODO: Description break; -#undef SET_REG_NAME + case BPMEM_TEV_COLOR_ENV: // 0xC0 + case BPMEM_TEV_COLOR_ENV+2: + case BPMEM_TEV_COLOR_ENV+4: + case BPMEM_TEV_COLOR_ENV+8: + case BPMEM_TEV_COLOR_ENV+10: + case BPMEM_TEV_COLOR_ENV+12: + case BPMEM_TEV_COLOR_ENV+14: + case BPMEM_TEV_COLOR_ENV+16: + case BPMEM_TEV_COLOR_ENV+18: + case BPMEM_TEV_COLOR_ENV+20: + case BPMEM_TEV_COLOR_ENV+22: + case BPMEM_TEV_COLOR_ENV+24: + case BPMEM_TEV_COLOR_ENV+26: + case BPMEM_TEV_COLOR_ENV+28: + case BPMEM_TEV_COLOR_ENV+30: + { + SetRegName(BPMEM_TEV_COLOR_ENV); + TevStageCombiner::ColorCombiner cc; cc.hex = cmddata; + const char* tevin[] = + { + "prev.rgb", "prev.aaa", + "c0.rgb", "c0.aaa", + "c1.rgb", "c1.aaa", + "c2.rgb", "c2.aaa", + "tex.rgb", "tex.aaa", + "ras.rgb", "ras.aaa", + "ONE", "HALF", "konst.rgb", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n", + (data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d], + tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]); + break; + } + + case BPMEM_TEV_ALPHA_ENV: // 0xC1 + case BPMEM_TEV_ALPHA_ENV+2: + case BPMEM_TEV_ALPHA_ENV+4: + case BPMEM_TEV_ALPHA_ENV+6: + case BPMEM_TEV_ALPHA_ENV+8: + case BPMEM_TEV_ALPHA_ENV+10: + case BPMEM_TEV_ALPHA_ENV+12: + case BPMEM_TEV_ALPHA_ENV+14: + case BPMEM_TEV_ALPHA_ENV+16: + case BPMEM_TEV_ALPHA_ENV+18: + case BPMEM_TEV_ALPHA_ENV+20: + case BPMEM_TEV_ALPHA_ENV+22: + case BPMEM_TEV_ALPHA_ENV+24: + case BPMEM_TEV_ALPHA_ENV+26: + case BPMEM_TEV_ALPHA_ENV+28: + case BPMEM_TEV_ALPHA_ENV+30: + { + SetRegName(BPMEM_TEV_ALPHA_ENV); + TevStageCombiner::AlphaCombiner ac; ac.hex = cmddata; + const char* tevin[] = + { + "prev", "c0", "c1", "c2", + "tex", "ras", "konst", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev", "c0", "c1", "c2" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n" + "ras sel: %d\n" + "tex sel: %d\n", + (data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d], + tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest], + ac.rswap, ac.tswap); + break; + } + + case BPMEM_ALPHACOMPARE: // 0xF3 + { + SetRegName(BPMEM_ALPHACOMPARE); + AlphaTest test; test.hex = cmddata; + const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" }; + const char* logic[] = { "AND", "OR", "XOR", "XNOR" }; + snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n" + "test 2: %s (ref: %#02x)\n" + "logic: %s\n", + functions[test.comp0], test.ref0, functions[test.comp1], test.ref1, logic[test.logic]); + break; + } + +#undef SetRegName } } + +AlphaTest::TEST_RESULT AlphaTest::TestResult() +{ + switch(logic) + { + case 0: // AND + if (comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) + return PASS; + if (comp0 == ALPHACMP_NEVER || comp1 == ALPHACMP_NEVER) + return FAIL; + break; + + case 1: // OR + if (comp0 == ALPHACMP_ALWAYS || comp1 == ALPHACMP_ALWAYS) + return PASS; + if (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER) + return FAIL; + break; + + case 2: // XOR + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS)) + return PASS; + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER)) + return FAIL; + break; + + case 3: // XNOR + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS)) + return FAIL; + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER)) + return PASS; + break; + } + return UNDETERMINED; +} diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index ce65bcb824..0ee00f911e 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -793,7 +793,7 @@ union PE_CONTROL { u32 pixel_format : 3; // PIXELFMT_X u32 zformat : 3; // Z Compression for 16bit Z format - u32 zcomploc : 1; // 1: before tex stage + u32 early_ztest : 1; // 1: before tex stage u32 unused : 17; u32 rid : 8; }; @@ -857,7 +857,7 @@ union TevKSel int getKA(int i) {return i?kasel1:kasel0;} }; -union AlphaFunc +union AlphaTest { struct { @@ -868,6 +868,15 @@ union AlphaFunc u32 logic : 2; }; u32 hex; + + enum TEST_RESULT + { + UNDETERMINED = 0, + FAIL = 1, + PASS = 2, + }; + + TEST_RESULT TestResult(); }; union UPE_Copy @@ -981,7 +990,7 @@ struct BPMemory TevReg tevregs[4]; //0xE0 FogRangeParams fogRange; FogParams fog; //0xEE,0xEF,0xF0,0xF1,0xF2 - AlphaFunc alphaFunc; //0xF3 + AlphaTest alpha_test; //0xF3 ZTex1 ztex1; //0xf4,0xf5 ZTex2 ztex2; TevKSel tevksel[8];//0xf6,0xf7,f8,f9,fa,fb,fc,fd diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index cda0f7c7c0..a8d081666f 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -35,9 +35,9 @@ using namespace BPFunctions; -u32 mapTexAddress; -bool mapTexFound; -int numWrites; +static u32 mapTexAddress; +static bool mapTexFound; +static int numWrites; extern volatile bool g_bSkipCurrentFrame; @@ -81,6 +81,9 @@ void BPWritten(const BPCmd& bp) just stuff geometry in them and don't put state changes there ---------------------------------------------------------------------------------------------------------------- */ + + // check for invalid state, else unneeded configuration are built + g_video_backend->CheckInvalidState(); // Debugging only, this lets you skip a bp update //static int times = 0; @@ -359,9 +362,9 @@ void BPWritten(const BPCmd& bp) PixelShaderManager::SetFogColorChanged(); break; case BPMEM_ALPHACOMPARE: // Compare Alpha Values - PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alphaFunc.ref0, - bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1, bpmem.alphaFunc.logic); - PixelShaderManager::SetAlpha(bpmem.alphaFunc); + PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0, + bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic); + PixelShaderManager::SetAlpha(bpmem.alpha_test); break; case BPMEM_BIAS: // BIAS PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias); @@ -458,6 +461,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel + g_renderer->SetBlendMode(true); OnPixelFormatChange(); break; @@ -500,18 +504,39 @@ void BPWritten(const BPCmd& bp) // if this is different from 0, manual TMEM management is used (GX_PreloadEntireTexture). if (bp.newvalue != 0) { - // NOTE(neobrain): Apparently tmemodd doesn't affect hardware behavior at all (libogc uses it just as a buffer and switches its contents with tmemeven whenever this is called) + // TODO: Not quite sure if this is completely correct (likely not) + // NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature. + BPS_TmemConfig& tmem_cfg = bpmem.tmem_config; - u8* ram_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); - u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - u32 size = tmem_cfg.preload_tile_info.count * 32; + u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC? + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; + u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - // Check if the game has overflowed TMEM, and copy up to the limit. - // Paper Mario does this when entering the Great Boogly Tree (Chap 2) - if ((tmem_addr + size) > TMEM_SIZE) - size = TMEM_SIZE - tmem_addr; + if (tmem_cfg.preload_tile_info.type != 3) + { + if (tmem_addr_even + size > TMEM_SIZE) + size = TMEM_SIZE - tmem_addr_even; - memcpy(texMem + tmem_addr, ram_ptr, size); + memcpy(texMem + tmem_addr_even, src_ptr, size); + } + else // RGBA8 tiles (and CI14, but that might just be stupid libogc!) + { + // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything + u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; + + for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + { + if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || + tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) + break; + + memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); + memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE); + tmem_addr_even += TMEM_LINE_SIZE; + tmem_addr_odd += TMEM_LINE_SIZE; + src_ptr += TMEM_LINE_SIZE * 2; + } + } } break; diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h index bcce50f223..fde31e4268 100644 --- a/Source/Core/VideoCommon/Src/Debugger.h +++ b/Source/Core/VideoCommon/Src/Debugger.h @@ -72,21 +72,9 @@ void GFXDebuggerCheckAndPause(bool update); void GFXDebuggerToPause(bool update); void GFXDebuggerUpdateScreen(); -#undef ENABLE_GFX_DEBUGGER -#if defined(_DEBUG) || defined(DEBUGFAST) -#define ENABLE_GFX_DEBUGGER -#endif - -#ifdef ENABLE_GFX_DEBUGGER #define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);} #define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}} #define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}} -#else -// Disable debugging calls in Release build -#define GFX_DEBUGGER_PAUSE_AT(event,update) -#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) -#define GFX_DEBUGGER_LOG_AT(event,dumpfunc) -#endif // ENABLE_GFX_DEBUGGER #endif // _GFX_DEBUGGER_H_ diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp index cbb0bc31ac..81227ba0ca 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.cpp +++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp @@ -205,10 +205,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) OnKeyDown(lParam); FreeLookInput((u32)wParam, lParam); } - else if (wParam == WIIMOTE_DISCONNECT) - { - PostMessage(m_hParent, WM_USER, wParam, lParam); - } break; // Called when a screensaver wants to show up while this window is active diff --git a/Source/Core/VideoCommon/Src/FPSCounter.cpp b/Source/Core/VideoCommon/Src/FPSCounter.cpp new file mode 100644 index 0000000000..ea3f624c73 --- /dev/null +++ b/Source/Core/VideoCommon/Src/FPSCounter.cpp @@ -0,0 +1,64 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "FPSCounter.h" +#include "FileUtil.h" +#include "Timer.h" +#include "VideoConfig.h" + +#define FPS_REFRESH_INTERVAL 1000 + +static unsigned int s_counter = 0; +static unsigned int s_fps = 0; +static unsigned int s_fps_last_counter = 0; +static unsigned long s_last_update_time = 0; +static File::IOFile s_bench_file; + +void InitFPSCounter() +{ + s_counter = s_fps_last_counter = 0; + s_fps = 0; + s_last_update_time = Common::Timer::GetTimeMs(); + + if (s_bench_file.IsOpen()) + s_bench_file.Close(); +} + +static void LogFPSToFile(unsigned long val) +{ + if (!s_bench_file.IsOpen()) + s_bench_file.Open(File::GetUserPath(D_LOGS_IDX) + "fps.txt", "w"); + + char buffer[256]; + snprintf(buffer, 256, "%ld\n", val); + s_bench_file.WriteArray(buffer, strlen(buffer)); +} + +int UpdateFPSCounter() +{ + if (Common::Timer::GetTimeMs() - s_last_update_time >= FPS_REFRESH_INTERVAL) + { + s_last_update_time = Common::Timer::GetTimeMs(); + s_fps = s_counter - s_fps_last_counter; + s_fps_last_counter = s_counter; + if (g_ActiveConfig.bLogFPSToFile) + LogFPSToFile(s_fps); + } + + s_counter++; + return s_fps; +} \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/FPSCounter.h b/Source/Core/VideoCommon/Src/FPSCounter.h new file mode 100644 index 0000000000..314f4b0fc7 --- /dev/null +++ b/Source/Core/VideoCommon/Src/FPSCounter.h @@ -0,0 +1,28 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _FPS_COUNTER_H_ +#define _FPS_COUNTER_H_ + +// Initializes the FPS counter. +void InitFPSCounter(); + +// Called when a frame is rendered. Returns the value to be displayed on +// screen as the FPS counter (updated every second). +int UpdateFPSCounter(); + +#endif // _FPS_COUNTER_H_ \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 565684297a..413b163ced 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include "VideoConfig.h" -#include "Setup.h" #include "MemoryUtil.h" #include "Thread.h" #include "Atomic.h" @@ -223,11 +222,11 @@ void RunGpu() { u8 *uData = Memory::GetPointer(fifo.CPReadPointer); - SaveSSEState(); - LoadDefaultSSEState(); + FPURoundMode::SaveSIMDState(); + FPURoundMode::LoadDefaultSIMDState(); ReadDataFromFifo(uData, 32); OpcodeDecoder_Run(g_bSkipCurrentFrame); - LoadSSEState(); + FPURoundMode::LoadSIMDState(); //DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base"); diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index b234a7c865..c883714daf 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -10,6 +10,9 @@ XFBSourceBase *FramebufferManagerBase::m_realXFBSource; // Only used in Real XFB FramebufferManagerBase::VirtualXFBListType FramebufferManagerBase::m_virtualXFBList; // Only used in Virtual XFB mode const XFBSourceBase* FramebufferManagerBase::m_overlappingXFBArray[MAX_VIRTUAL_XFB]; +unsigned int FramebufferManagerBase::s_last_xfb_width = 1; +unsigned int FramebufferManagerBase::s_last_xfb_height = 1; + FramebufferManagerBase::FramebufferManagerBase() { m_realXFBSource = NULL; @@ -226,3 +229,31 @@ void FramebufferManagerBase::ReplaceVirtualXFB() } } } + +int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width) +{ + if (g_ActiveConfig.RealXFBEnabled()) + return x; + + if (g_ActiveConfig.b3DVision) + { + // This works, yet the version in the else doesn't. No idea why. + return x * (int)backbuffer_width / (int)FramebufferManagerBase::LastXfbWidth(); + } + else + return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth(); +} + +int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height) +{ + if (g_ActiveConfig.RealXFBEnabled()) + return y; + + if (g_ActiveConfig.b3DVision) + { + // This works, yet the version in the else doesn't. No idea why. + return y * (int)backbuffer_height / (int)FramebufferManagerBase::LastXfbHeight(); + } + else + return y * (int)Renderer::GetTargetRectangle().GetHeight() / (int)FramebufferManagerBase::LastXfbHeight(); +} diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index 26d360647d..e529bb1a39 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -50,6 +50,14 @@ public: static void CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma); static const XFBSourceBase* const* GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount); + static void SetLastXfbWidth(unsigned int width) { s_last_xfb_width = width; } + static void SetLastXfbHeight(unsigned int height) { s_last_xfb_height = height; } + static unsigned int LastXfbWidth() { return s_last_xfb_width; } + static unsigned int LastXfbHeight() { return s_last_xfb_height; } + + static int ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width); + static int ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height); + protected: struct VirtualXFB { @@ -85,6 +93,9 @@ private: static VirtualXFBListType m_virtualXFBList; // Only used in Virtual XFB mode static const XFBSourceBase* m_overlappingXFBArray[MAX_VIRTUAL_XFB]; + + static unsigned int s_last_xfb_width; + static unsigned int s_last_xfb_height; }; extern FramebufferManagerBase *g_framebuffer_manager; diff --git a/Source/Core/VideoCommon/Src/GenericDLCache.cpp b/Source/Core/VideoCommon/Src/GenericDLCache.cpp new file mode 100644 index 0000000000..5e27deb469 --- /dev/null +++ b/Source/Core/VideoCommon/Src/GenericDLCache.cpp @@ -0,0 +1,52 @@ +// Copyright (C) 2003-2009 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// TODO: Handle cache-is-full condition :p + + +#include "Common.h" +#include "DLCache.h" + +namespace DLCache +{ + +void Init() +{ +} + +void Shutdown() +{ +} + +void Clear() +{ +} + +void ProgressiveCleanup() +{ +} +} // namespace + +// NOTE - outside the namespace on purpose. +bool HandleDisplayList(u32 address, u32 size) +{ + return false; +} + +void IncrementCheckContextId() +{ +} diff --git a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp b/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp new file mode 100644 index 0000000000..ad7cfeebf9 --- /dev/null +++ b/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp @@ -0,0 +1,2182 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +//#include "VideoCommon.h" // to get debug logs + +#include "CPUDetect.h" +#include "TextureDecoder.h" +#include "OpenCL.h" +#include "OpenCL/OCLTextureDecoder.h" +#include "VideoConfig.h" + +#include "LookUpTables.h" + +#include + + + +bool TexFmt_Overlay_Enable=false; +bool TexFmt_Overlay_Center=false; + +extern const char* texfmt[]; +extern const unsigned char sfont_map[]; +extern const unsigned char sfont_raw[][9*10]; + +// TRAM +// STATE_TO_SAVE + GC_ALIGNED16(u8 texMem[TMEM_SIZE]); + + +// Gamecube/Wii texture decoder + +// Decodes all known Gamecube/Wii texture formats. +// by ector + +int TexDecoder_GetTexelSizeInNibbles(int format) +{ + switch (format & 0x3f) { + case GX_TF_I4: return 1; + case GX_TF_I8: return 2; + case GX_TF_IA4: return 2; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 8; + case GX_TF_C4: return 1; + case GX_TF_C8: return 2; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 1; + case GX_CTF_R4: return 1; + case GX_CTF_RA4: return 2; + case GX_CTF_RA8: return 4; + case GX_CTF_YUVA8: return 8; + case GX_CTF_A8: return 2; + case GX_CTF_R8: return 2; + case GX_CTF_G8: return 2; + case GX_CTF_B8: return 2; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + + case GX_TF_Z8: return 2; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 8; + + case GX_CTF_Z4: return 1; + case GX_CTF_Z8M: return 2; + case GX_CTF_Z8L: return 2; + case GX_CTF_Z16L: return 4; + default: return 1; + } +} + +int TexDecoder_GetTextureSizeInBytes(int width, int height, int format) +{ + return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2; +} + +int TexDecoder_GetBlockWidthInTexels(u32 format) +{ + switch (format) + { + case GX_TF_I4: return 8; + case GX_TF_I8: return 8; + case GX_TF_IA4: return 8; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 4; + case GX_TF_C4: return 8; + case GX_TF_C8: return 8; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 8; + case GX_CTF_R4: return 8; + case GX_CTF_RA4: return 8; + case GX_CTF_RA8: return 4; + case GX_CTF_A8: return 8; + case GX_CTF_R8: return 8; + case GX_CTF_G8: return 8; + case GX_CTF_B8: return 8; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + case GX_TF_Z8: return 8; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 4; + case GX_CTF_Z4: return 8; + case GX_CTF_Z8M: return 8; + case GX_CTF_Z8L: return 8; + case GX_CTF_Z16L: return 4; + default: + ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockWidthInTexels)", format); + return 8; + } +} + +int TexDecoder_GetBlockHeightInTexels(u32 format) +{ + switch (format) + { + case GX_TF_I4: return 8; + case GX_TF_I8: return 4; + case GX_TF_IA4: return 4; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 4; + case GX_TF_C4: return 8; + case GX_TF_C8: return 4; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 8; + case GX_CTF_R4: return 8; + case GX_CTF_RA4: return 4; + case GX_CTF_RA8: return 4; + case GX_CTF_A8: return 4; + case GX_CTF_R8: return 4; + case GX_CTF_G8: return 4; + case GX_CTF_B8: return 4; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + case GX_TF_Z8: return 4; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 4; + case GX_CTF_Z4: return 8; + case GX_CTF_Z8M: return 4; + case GX_CTF_Z8L: return 4; + case GX_CTF_Z16L: return 4; + default: + ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format); + return 4; + } +} + +//returns bytes +int TexDecoder_GetPaletteSize(int format) +{ + switch (format) + { + case GX_TF_C4: return 16 * 2; + case GX_TF_C8: return 256 * 2; + case GX_TF_C14X2: return 16384 * 2; + default: + return 0; + } +} + +static inline u32 decodeIA8(u16 val) +{ + int a = val >> 8; + int i = val & 0xFF; + return (a << 24) | (i << 16) | (i << 8) | i; +} + +static inline u32 decode5A3(u16 val) +{ + int r,g,b,a; + if ((val & 0x8000)) + { + a = 0xFF; + r = Convert5To8((val >> 10) & 0x1F); + g = Convert5To8((val >> 5) & 0x1F); + b = Convert5To8(val & 0x1F); + } + else + { + a = Convert3To8((val >> 12) & 0x7); + r = Convert4To8((val >> 8) & 0xF); + g = Convert4To8((val >> 4) & 0xF); + b = Convert4To8(val & 0xF); + } + return (a << 24) | (r << 16) | (g << 8) | b; +} + +static inline u32 decode5A3RGBA(u16 val) +{ + int r,g,b,a; + if ((val&0x8000)) + { + r=Convert5To8((val>>10) & 0x1f); + g=Convert5To8((val>>5 ) & 0x1f); + b=Convert5To8((val ) & 0x1f); + a=0xFF; + } + else + { + a=Convert3To8((val>>12) & 0x7); + r=Convert4To8((val>>8 ) & 0xf); + g=Convert4To8((val>>4 ) & 0xf); + b=Convert4To8((val ) & 0xf); + } + return r | (g<<8) | (b << 16) | (a << 24); +} + +static inline u32 decode565RGBA(u16 val) +{ + int r,g,b,a; + r=Convert5To8((val>>11) & 0x1f); + g=Convert6To8((val>>5 ) & 0x3f); + b=Convert5To8((val ) & 0x1f); + a=0xFF; + return r | (g<<8) | (b << 16) | (a << 24); +} + +static inline u32 decodeIA8Swapped(u16 val) +{ + int a = val & 0xFF; + int i = val >> 8; + return i | (i<<8) | (i<<16) | (a<<24); +} + + + +struct DXTBlock +{ + u16 color1; + u16 color2; + u8 lines[4]; +}; + +//inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) +inline void decodebytesC4_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode5A3(Common::swap16(tlut[val >> 4])); + *dst++ = decode5A3(Common::swap16(tlut[val & 0xF])); + } +} + +inline void decodebytesC4_5A3_To_rgba32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode5A3RGBA(Common::swap16(tlut[val >> 4])); + *dst++ = decode5A3RGBA(Common::swap16(tlut[val & 0xF])); + } +} + +inline void decodebytesC4_To_Raw16(u16* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = Common::swap16(tlut[val >> 4]); + *dst++ = Common::swap16(tlut[val & 0xF]); + } +} + +inline void decodebytesC4IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decodeIA8Swapped(tlut[val >> 4]); + *dst++ = decodeIA8Swapped(tlut[val & 0xF]); + } +} + +inline void decodebytesC4RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode565RGBA(Common::swap16(tlut[val >> 4])); + *dst++ = decode565RGBA(Common::swap16(tlut[val & 0xF])); + } +} + +//inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) +inline void decodebytesC8_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = decode5A3(Common::swap16(tlut[val])); + } +} + +inline void decodebytesC8_5A3_To_RGBA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = decode5A3RGBA(Common::swap16(tlut[val])); + } +} + +inline void decodebytesC8_To_Raw16(u16* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = Common::swap16(tlut[val]); + } +} + +inline void decodebytesC8IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + *dst++ = decodeIA8Swapped(tlut[src[x]]); + } +} + +inline void decodebytesC8RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + *dst++ = decode565RGBA(Common::swap16(tlut[src[x]])); + } +} + +inline void decodebytesC14X2_5A3_To_BGRA32(u32 *dst, const u16 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode5A3(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +inline void decodebytesC14X2_5A3_To_RGBA(u32 *dst, const u16 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode5A3RGBA(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +inline void decodebytesC14X2_To_Raw16(u16* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = Common::swap16(tlut[(val & 0x3FFF)]); + } +} + +inline void decodebytesC14X2IA8_To_RGBA(u32* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decodeIA8Swapped(tlut[(val & 0x3FFF)]); + } +} + +inline void decodebytesC14X2rgb565_To_RGBA(u32* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode565RGBA(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +// Needs more speed. +inline void decodebytesIA4(u16 *dst, const u8 *src) +{ + for (int x = 0; x < 8; x++) + { + const u8 val = src[x]; + u8 a = Convert4To8(val >> 4); + u8 l = Convert4To8(val & 0xF); + dst[x] = (a << 8) | l; + } +} + +inline void decodebytesIA4RGBA(u32 *dst, const u8 *src) +{ + for (int x = 0; x < 8; x++) + { + const u8 val = src[x]; + u8 a = Convert4To8(val >> 4); + u8 l = Convert4To8(val & 0xF); + dst[x] = (a << 24) | l << 16 | l << 8 | l; + } +} + +inline void decodebytesRGB5A3(u32 *dst, const u16 *src) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = decode5A3(Common::swap16(src[x])); +#else + dst[0] = decode5A3(Common::swap16(src[0])); + dst[1] = decode5A3(Common::swap16(src[1])); + dst[2] = decode5A3(Common::swap16(src[2])); + dst[3] = decode5A3(Common::swap16(src[3])); +#endif +} + +inline void decodebytesRGB5A3rgba(u32 *dst, const u16 *src) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = decode5A3RGBA(Common::swap16(src[x])); +#else + dst[0] = decode5A3RGBA(Common::swap16(src[0])); + dst[1] = decode5A3RGBA(Common::swap16(src[1])); + dst[2] = decode5A3RGBA(Common::swap16(src[2])); + dst[3] = decode5A3RGBA(Common::swap16(src[3])); +#endif +} + +// This one is used by many video formats. It'd therefore be good if it was fast. +// Needs more speed. +inline void decodebytesARGB8_4(u32 *dst, const u16 *src, const u16 *src2) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = Common::swap32((src2[x] << 16) | src[x]); +#else + dst[0] = Common::swap32((src2[0] << 16) | src[0]); + dst[1] = Common::swap32((src2[1] << 16) | src[1]); + dst[2] = Common::swap32((src2[2] << 16) | src[2]); + dst[3] = Common::swap32((src2[3] << 16) | src[3]); +#endif + + // This can probably be done in a few SSE pack/unpack instructions + pshufb + // some unpack instruction x2: + // ABABABABABABABAB 1212121212121212 -> + // AB12AB12AB12AB12 AB12AB12AB12AB12 + // 2x pshufb-> + // 21BA21BA21BA21BA 21BA21BA21BA21BA + // and we are done. +} + +inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16 * src2) +{ +#if 0 + for (int x = 0; x < 4; x++) { + dst[x] = ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8) | (src2[x] << 8); + } +#else + dst[0] = ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8) | (src2[0] << 8); + dst[1] = ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8) | (src2[1] << 8); + dst[2] = ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8) | (src2[2] << 8); + dst[3] = ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8) | (src2[3] << 8); +#endif +} + +inline u32 makecol(int r, int g, int b, int a) +{ + return (a << 24)|(r << 16)|(g << 8)|b; +} + +inline u32 makeRGBA(int r, int g, int b, int a) +{ + return (a<<24)|(b<<16)|(g<<8)|r; +} + +void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch) +{ + // S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support) + // Needs more speed. + u16 c1 = Common::swap16(src->color1); + u16 c2 = Common::swap16(src->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + int colors[4]; + colors[0] = makecol(red1, green1, blue1, 255); + colors[1] = makecol(red2, green2, blue2, 255); + if (c1 > c2) + { + int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3); + int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3); + int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3); + colors[2] = makecol(red1 + red3, green1 + green3, blue1 + blue3, 255); + colors[3] = makecol(red2 - red3, green2 - green3, blue2 - blue3, 255); + } + else + { + colors[2] = makecol((red1 + red2 + 1) / 2, // Average + (green1 + green2 + 1) / 2, + (blue1 + blue2 + 1) / 2, 255); + colors[3] = makecol(red2, green2, blue2, 0); // Color2 but transparent + } + + for (int y = 0; y < 4; y++) + { + int val = src->lines[y]; + for (int x = 0; x < 4; x++) + { + dst[x] = colors[(val >> 6) & 3]; + val <<= 2; + } + dst += pitch; + } +} + +void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch) +{ + // S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support) + // Needs more speed. + u16 c1 = Common::swap16(src->color1); + u16 c2 = Common::swap16(src->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + int colors[4]; + colors[0] = makeRGBA(red1, green1, blue1, 255); + colors[1] = makeRGBA(red2, green2, blue2, 255); + if (c1 > c2) + { + int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3); + int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3); + int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3); + colors[2] = makeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255); + colors[3] = makeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255); + } + else + { + colors[2] = makeRGBA((red1 + red2 + 1) / 2, // Average + (green1 + green2 + 1) / 2, + (blue1 + blue2 + 1) / 2, 255); + colors[3] = makeRGBA(red2, green2, blue2, 0); // Color2 but transparent + } + + for (int y = 0; y < 4; y++) + { + int val = src->lines[y]; + for (int x = 0; x < 4; x++) + { + dst[x] = colors[(val >> 6) & 3]; + val <<= 2; + } + dst += pitch; + } +} + +#if 0 // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8 +static void copyDXTBlock(u8* dst, const u8* src) +{ + ((u16*)dst)[0] = Common::swap16(((u16*)src)[0]); + ((u16*)dst)[1] = Common::swap16(((u16*)src)[1]); + u32 pixels = ((u32*)src)[1]; + // A bit of trickiness here: the row are in the same order + // between the two formats, but the ordering within the rows + // is reversed. + pixels = ((pixels >> 4) & 0x0F0F0F0F) | ((pixels << 4) & 0xF0F0F0F0); + pixels = ((pixels >> 2) & 0x33333333) | ((pixels << 2) & 0xCCCCCCCC); + ((u32*)dst)[1] = pixels; +} +#endif + +static PC_TexFormat GetPCFormatFromTLUTFormat(int tlutfmt) +{ + switch (tlutfmt) + { + case 0: return PC_TEX_FMT_IA8; // IA8 + case 1: return PC_TEX_FMT_RGB565; // RGB565 + case 2: return PC_TEX_FMT_BGRA32; // RGB5A3: This TLUT format requires + // extra work to decode. + } + return PC_TEX_FMT_NONE; // Error +} + +PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt) +{ + switch (texformat) + { + case GX_TF_C4: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_I4: + return PC_TEX_FMT_IA8; + case GX_TF_I8: // speed critical + return PC_TEX_FMT_IA8; + case GX_TF_C8: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_IA4: + return PC_TEX_FMT_IA4_AS_IA8; + case GX_TF_IA8: + return PC_TEX_FMT_IA8; + case GX_TF_C14X2: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_RGB565: + return PC_TEX_FMT_RGB565; + case GX_TF_RGB5A3: + return PC_TEX_FMT_BGRA32; + case GX_TF_RGBA8: // speed critical + return PC_TEX_FMT_BGRA32; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { + return PC_TEX_FMT_BGRA32; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_NONE; +} + + +//switch endianness, unswizzle +//TODO: to save memory, don't blindly convert everything to argb8888 +//also ARGB order needs to be swapped later, to accommodate modern hardware better +//need to add DXT support too +PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt) +{ + const int Wsteps4 = (width + 3) / 4; + const int Wsteps8 = (width + 7) / 8; + + switch (texformat) + { + case GX_TF_C4: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++) + decodebytesC4_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + else + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++) + decodebytesC4_To_Raw16((u16*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_I4: + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8 ; iy < 8; iy++,xStep++) + for (int ix = 0; ix < 4; ix++) + { + int val = src[4 * xStep + ix]; + dst[(y + iy) * width + x + ix * 2] = Convert4To8(val >> 4); + dst[(y + iy) * width + x + ix * 2 + 1] = Convert4To8(val & 0xF); + } + } + return PC_TEX_FMT_I4_AS_I8; + case GX_TF_I8: // speed critical + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + { + ((u64*)(dst + (y + iy) * width + x))[0] = ((u64*)(src + 8 * xStep))[0]; + } + } + return PC_TEX_FMT_I8; + case GX_TF_C8: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + else + { + + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_To_Raw16((u16*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_IA4: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesIA4((u16*)dst + (y + iy) * width + x, src + 8 * xStep); + } + return PC_TEX_FMT_IA4_AS_IA8; + case GX_TF_IA8: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = yStep * 4; iy < 4; iy++, xStep++) + { + u16 *ptr = (u16 *)dst + (y + iy) * width + x; + u16 *s = (u16 *)(src + 8 * xStep); + for(int j = 0; j < 4; j++) + *ptr++ = Common::swap16(*s++); + } + + } + return PC_TEX_FMT_IA8; + case GX_TF_C14X2: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_To_Raw16((u16*)dst + (y + iy) * width + x,(u16*)(src + 8 * xStep), tlutaddr); + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_RGB565: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + { + u16 *ptr = (u16 *)dst + (y + iy) * width + x; + u16 *s = (u16 *)(src + 8 * xStep); + for(int j = 0; j < 4; j++) + *ptr++ = Common::swap16(*s++); + } + } + return PC_TEX_FMT_RGB565; + case GX_TF_RGB5A3: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + //decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)src, 4); + decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)(src + 8 * xStep)); + } + return PC_TEX_FMT_BGRA32; + case GX_TF_RGBA8: // speed critical + { + + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + { + const u8* src2 = src + 64 * yStep; + for (int iy = 0; iy < 4; iy++) + decodebytesARGB8_4((u32*)dst + (y+iy)*width + x, (u16*)src2 + 4 * iy, (u16*)src2 + 4 * iy + 16); + } + } + } + return PC_TEX_FMT_BGRA32; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { +#if 0 // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8 + // 11111111 22222222 55555555 66666666 + // 33333333 44444444 77777777 88888888 + for (int y = 0; y < height; y += 8) + { + for (int x = 0; x < width; x += 8) + { + copyDXTBlock(dst+(y/2)*width+x*2, src); + src += 8; + copyDXTBlock(dst+(y/2)*width+x*2+8, src); + src += 8; + copyDXTBlock(dst+(y/2+2)*width+x*2, src); + src += 8; + copyDXTBlock(dst+(y/2+2)*width+x*2+8, src); + src += 8; + } + } + return PC_TEX_FMT_DXT1; +#else + for (int y = 0; y < height; y += 8) + { + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + { + const u8* src2 = src + 4 * sizeof(DXTBlock) * yStep; + decodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src2, width); + } + } +#endif + return PC_TEX_FMT_BGRA32; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_NONE; +} + + + +// JSD 01/06/11: +// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to +// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128 +// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples +// of 16 in the aligned case. +// TODO: complete SSE2 optimization of less often used texture formats. +// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads. + +PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt) +{ + + const int Wsteps4 = (width + 3) / 4; + const int Wsteps8 = (width + 7) / 8; + + switch (texformat) + { + case GX_TF_C4: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4_5A3_To_rgba32(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + else if(tlutfmt == 0) + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4IA8_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + + } + else + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4RGB565_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + break; + case GX_TF_I4: + { + // Reference C implementation: + for (int y = 0; y < height; y += 8) + for (int x = 0; x < width; x += 8) + for (int iy = 0; iy < 8; iy++, src += 4) + for (int ix = 0; ix < 4; ix++) + { + int val = src[ix]; + u8 i1 = Convert4To8(val >> 4); + u8 i2 = Convert4To8(val & 0xF); + memset(dst+(y + iy) * width + x + ix * 2 , i1,4); + memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4); + } + } + break; + case GX_TF_I8: // speed critical + { + // Reference C implementation + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 8) + for (int iy = 0; iy < 4; ++iy, src += 8) + { + u32 * newdst = dst + (y + iy)*width+x; + const u8 * newsrc = src; + u8 srcval; + + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + } + } + break; + case GX_TF_C8: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_5A3_To_RGBA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + else if(tlutfmt == 0) + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8IA8_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8RGB565_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + + } + break; + case GX_TF_IA4: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesIA4RGBA(dst + (y + iy) * width + x, src + 8 * xStep); + } + break; + case GX_TF_IA8: + { + // Reference C implementation: + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + { + u32 *ptr = dst + (y + iy) * width + x; + u16 *s = (u16 *)src; + ptr[0] = decodeIA8Swapped(s[0]); + ptr[1] = decodeIA8Swapped(s[1]); + ptr[2] = decodeIA8Swapped(s[2]); + ptr[3] = decodeIA8Swapped(s[3]); + } + } + break; + case GX_TF_C14X2: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_5A3_To_BGRA32(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else if (tlutfmt == 0) + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2IA8_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2rgb565_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + break; + case GX_TF_RGB565: + { + // Reference C implementation. + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + { + u32 *ptr = dst + (y + iy) * width + x; + u16 *s = (u16 *)src; + for(int j = 0; j < 4; j++) + *ptr++ = decode565RGBA(Common::swap16(*s++)); + } + } + break; + case GX_TF_RGB5A3: + { + // Reference C implementation: + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src); + } + break; + case GX_TF_RGBA8: // speed critical + { + // Reference C implementation. + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + { + for (int iy = 0; iy < 4; iy++) + decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16); + src += 64; + } + } + break; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { + for (int y = 0; y < height; y += 8) + { + for (int x = 0; x < width; x += 8) + { + decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + } + } + break; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_RGBA32; +} + + + + +void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center) +{ + TexFmt_Overlay_Enable = enable; + TexFmt_Overlay_Center = center; +} + +PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly) +{ + PC_TexFormat retval = TexDecoder_Decode_OpenCL(dst, src, + width, height, texformat, tlutaddr, tlutfmt, rgbaOnly); + if (retval == PC_TEX_FMT_NONE) + retval = rgbaOnly ? TexDecoder_Decode_RGBA((u32*)dst, src, + width, height, texformat, tlutaddr, tlutfmt) + : TexDecoder_Decode_real(dst, src, + width, height, texformat, tlutaddr, tlutfmt); + + if ((!TexFmt_Overlay_Enable)|| (retval == PC_TEX_FMT_NONE)) + return retval; + + int w = min(width, 40); + int h = min(height, 10); + + int xoff = (width - w) >> 1; + int yoff = (height - h) >> 1; + + if (!TexFmt_Overlay_Center) + { + xoff=0; + yoff=0; + } + + const char* fmt = texfmt[texformat&15]; + while (*fmt) + { + int xcnt = 0; + int nchar = sfont_map[(int)*fmt]; + + const unsigned char *ptr = sfont_raw[nchar]; // each char is up to 9x10 + + for (int x = 0; x < 9;x++) + { + if (ptr[x] == 0x78) + break; + xcnt++; + } + + for (int y=0; y < 10; y++) + { + for (int x=0; x < xcnt; x++) + { + switch(retval) + { + case PC_TEX_FMT_I8: + { + // TODO: Is this an acceptable way to draw in I8? + u8 *dtp = (u8*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFF : 0x88; + break; + } + case PC_TEX_FMT_IA8: + case PC_TEX_FMT_IA4_AS_IA8: + { + u16 *dtp = (u16*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFF : 0xFF00; + break; + } + case PC_TEX_FMT_RGB565: + { + u16 *dtp = (u16*)dst; + dtp[(y + yoff)*width + x + xoff] = ptr[x] ? 0xFFFF : 0x0000; + break; + } + default: + case PC_TEX_FMT_BGRA32: + { + int *dtp = (int*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFFFFFF : 0xFF000000; + break; + } + } + } + ptr += 9; + } + xoff += xcnt; + fmt++; + } + + return retval; +} + + + +void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt) +{ + /* General formula for computing texture offset + // + u16 sBlk = s / blockWidth; + u16 tBlk = t / blockHeight; + u16 widthBlks = (width / blockWidth) + 1; + u32 base = (tBlk * widthBlks + sBlk) * blockWidth * blockHeight; + u16 blkS = s & (blockWidth - 1); + u16 blkT = t & (blockHeight - 1); + u32 blkOff = blkT * blockWidth + blkS; + */ + + switch (texformat) + { + case GX_TF_C4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 3; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 7; + u32 blkOff = (blkT << 3) + blkS; + + int rs = (blkOff & 1)?0:4; + u32 offset = base + (blkOff >> 1); + + u8 val = (*(src + offset) >> rs) & 0xF; + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_I4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 3; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 7; + u32 blkOff = (blkT << 3) + blkS; + + int rs = (blkOff & 1)?0:4; + u32 offset = base + (blkOff >> 1); + + u8 val = (*(src + offset) >> rs) & 0xF; + val = Convert4To8(val); + dst[0] = val; + dst[1] = val; + dst[2] = val; + dst[3] = val; + } + break; + case GX_TF_I8: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + dst[0] = val; + dst[1] = val; + dst[2] = val; + dst[3] = val; + } + break; + case GX_TF_C8: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_IA4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + const u8 a = Convert4To8(val>>4); + const u8 l = Convert4To8(val&0xF); + dst[0] = l; + dst[1] = l; + dst[2] = l; + dst[3] = a; + } + break; + case GX_TF_IA8: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decodeIA8Swapped(*valAddr); + } + break; + case GX_TF_C14X2: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + u16 val = Common::swap16(*valAddr) & 0x3FFF; + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_RGB565: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decode565RGBA(Common::swap16(*valAddr)); + } + break; + case GX_TF_RGB5A3: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decode5A3RGBA(Common::swap16(*valAddr)); + } + break; + case GX_TF_RGBA8: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; // shift by 5 is correct + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1 ; + const u8* valAddr = src + offset; + + dst[3] = valAddr[0]; + dst[0] = valAddr[1]; + dst[1] = valAddr[32]; + dst[2] = valAddr[33]; + } + break; + case GX_TF_CMPR: + { + u16 sDxt = s >> 2; + u16 tDxt = t >> 2; + + u16 sBlk = sDxt >> 1; + u16 tBlk = tDxt >> 1; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 2; + u16 blkS = sDxt & 1; + u16 blkT = tDxt & 1; + u32 blkOff = (blkT << 1) + blkS; + + u32 offset = (base + blkOff) << 3; + + const DXTBlock* dxtBlock = (const DXTBlock*)(src + offset); + + u16 c1 = Common::swap16(dxtBlock->color1); + u16 c2 = Common::swap16(dxtBlock->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + + u16 ss = s & 3; + u16 tt = t & 3; + + int colorSel = dxtBlock->lines[tt]; + int rs = 6 - (ss << 1); + colorSel = (colorSel >> rs) & 3; + colorSel |= c1 > c2?0:4; + + u32 color = 0; + + switch (colorSel) + { + case 0: + case 4: + color = makeRGBA(red1, green1, blue1, 255); + break; + case 1: + case 5: + color = makeRGBA(red2, green2, blue2, 255); + break; + case 2: + color = makeRGBA(red1+(red2-red1)/3, green1+(green2-green1)/3, blue1+(blue2-blue1)/3, 255); + break; + case 3: + color = makeRGBA(red2+(red1-red2)/3, green2+(green1-green2)/3, blue2+(blue1-blue2)/3, 255); + break; + case 6: + color = makeRGBA((int)ceil((float)(red1+red2)/2), (int)ceil((float)(green1+green2)/2), (int)ceil((float)(blue1+blue2)/2), 255); + break; + case 7: + color = makeRGBA(red2, green2, blue2, 0); + break; + } + + *((u32*)dst) = color; + } + break; + } +} + + +const char* texfmt[] = { + // pixel + "I4", "I8", "IA4", "IA8", + "RGB565", "RGB5A3", "RGBA8", "0x07", + "C4", "C8", "C14X2", "0x0B", + "0x0C", "0x0D", "CMPR", "0x0F", + // Z-buffer + "0x10", "Z8", "0x12", "Z16", + "0x14", "0x15", "Z24X8", "0x17", + "0x18", "0x19", "0x1A", "0x1B", + "0x1C", "0x1D", "0x1E", "0x1F", + // pixel + copy + "CR4", "0x21", "CRA4", "CRA8", + "0x24", "0x25", "CYUVA8", "CA8", + "CR8", "CG8", "CB8", "CRG8", + "CGB8", "0x2D", "0x2E", "0x2F", + // Z + copy + "CZ4", "0x31", "0x32", "0x33", + "0x34", "0x35", "0x36", "0x37", + "0x38", "CZ8M", "CZ8L", "0x3B", + "CZ16L", "0x3D", "0x3E", "0x3F", +}; + +const unsigned char sfont_map[] = { + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,10,10,10,10, + 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25, + 26,27,28,29,30,31,32,33,34,35,36,10,10,10,10,10, + 10,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51, + 52,53,54,55,56,57,58,59,60,61,62,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +}; + +const unsigned char sfont_raw[][9*10] = { + { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + }, +}; diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp index a506acadfc..f32e5dfeee 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp @@ -23,7 +23,7 @@ int GetLightingShaderId(u32* out) { - for (int i = 0; i < xfregs.numChan.numColorChans; ++i) + for (u32 i = 0; i < xfregs.numChan.numColorChans; ++i) { out[i] = xfregs.color[i].enablelighting ? (u32)xfregs.color[i].hex : diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index e8de52addb..0d357a4f80 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -222,11 +222,17 @@ void VideoBackendHardware::InitializeShared() memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs)); memset(&s_accessEFBArgs, 0, sizeof(s_accessEFBArgs)); s_AccessEFBResult = 0; + m_invalid = false; } // Run from the CPU thread void VideoBackendHardware::DoState(PointerWrap& p) { + bool software = false; + p.Do(software); + if (p.GetMode() == PointerWrap::MODE_READ && software == true) + // change mode to abort load of incompatible save state. + p.SetMode(PointerWrap::MODE_VERIFY); VideoCommon_DoState(p); p.DoMarker("VideoCommon"); @@ -240,16 +246,25 @@ void VideoBackendHardware::DoState(PointerWrap& p) // Refresh state. if (p.GetMode() == PointerWrap::MODE_READ) { - BPReload(); + m_invalid = true; RecomputeCachedArraybases(); // Clear all caches that touch RAM // (? these don't appear to touch any emulation state that gets saved. moved to on load only.) - TextureCache::Invalidate(); VertexLoaderManager::MarkAllDirty(); } } +void VideoBackendHardware::CheckInvalidState() { + if (m_invalid) + { + m_invalid = false; + + BPReload(); + TextureCache::Invalidate(); + } +} + void VideoBackendHardware::PauseAndLock(bool doLock, bool unpauseOnUnlock) { Fifo_PauseAndLock(doLock, unpauseOnUnlock); diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp index f24bfc31b3..10cf5b84af 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp @@ -19,6 +19,7 @@ #include "Common.h" +#include "ConfigManager.h" #include "OnScreenDisplay.h" #include "RenderBase.h" #include "Timer.h" @@ -47,6 +48,8 @@ void AddMessage(const char* pstr, u32 ms) void DrawMessages() { + if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) return; + if (s_listMsgs.size() > 0) { int left = 25, top = 15; diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 7500997fef..448501aad0 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -27,9 +27,8 @@ #include "VideoConfig.h" #include "NativeVertexFormat.h" -static int AlphaPreTest(); -static void StageHash(int stage, u32* out) +static void StageHash(u32 stage, u32* out) { out[0] |= bpmem.combiners[stage].colorC.hex & 0xFFFFFF; // 24 u32 alphaC = bpmem.combiners[stage].alphaC.hex & 0xFFFFF0; // 24, strip out tswap and rswap for now @@ -109,35 +108,19 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 uid->values[0] |= dstAlphaMode << 8; // 2 - bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth; - - uid->values[0] |= DepthTextureEnable << 10; // 1 - bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - uid->values[0] |= enablePL << 11; // 1 + uid->values[0] |= enablePL << 10; // 1 - if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4 - u32 alphaPreTest = AlphaPreTest()+1; + if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 11; // 4 - uid->values[0] |= alphaPreTest << 16; // 2 - - if (alphaPreTest == 1 || (alphaPreTest && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS)) - { - // Courtesy of PreAlphaTest, we're done already ;) - // NOTE: The comment header of generated shaders depends on the value of bpmem.genmode.numindstages.. shouldnt really bother about that though. - uid->num_values = 1; - return; - } + AlphaTest::TEST_RESULT alphaPreTest = bpmem.alpha_test.TestResult(); + uid->values[0] |= alphaPreTest << 15; // 2 + // numtexgens should be <= 8 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[0] |= xfregs.texMtxInfo[i].projection << (17+i); // 1 - uid->values[1] = bpmem.genMode.numindstages << 2; // 3 + uid->values[1] = bpmem.genMode.numindstages; // 3 u32 indirectStagesUsed = 0; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) @@ -145,43 +128,37 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); - uid->values[1] |= indirectStagesUsed << 5; // 4; + uid->values[1] |= indirectStagesUsed << 3; // 4; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) { if (indirectStagesUsed & (1 << i)) { - uid->values[1] |= (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) << (9 + 3*i); // 1 + uid->values[1] |= (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) << (7 + 3*i); // 1 if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) - uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (10 + 3*i); // 2 + uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (8 + 3*i); // 2 } } u32* ptr = &uid->values[2]; - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] } - ptr[0] |= bpmem.alphaFunc.comp0; // 3 - ptr[0] |= bpmem.alphaFunc.comp1 << 3; // 3 - ptr[0] |= bpmem.alphaFunc.logic << 6; // 2 + ptr[0] |= bpmem.alpha_test.comp0; // 3 + ptr[0] |= bpmem.alpha_test.comp1 << 3; // 3 + ptr[0] |= bpmem.alpha_test.logic << 6; // 2 - if (alphaPreTest == 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 - } - } + ptr[0] |= bpmem.ztex2.op << 8; // 2 + ptr[0] |= bpmem.zcontrol.early_ztest << 10; // 1 + ptr[0] |= bpmem.zmode.testenable << 11; // 1 + ptr[0] |= bpmem.zmode.updateenable << 12; // 1 if (dstAlphaMode != DSTALPHA_ALPHA_PASS) { + ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 13; // 3 if (bpmem.fog.c_proj_fsel.fsel != 0) { ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1 @@ -208,9 +185,8 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.ztex2.hex; // 2 *ptr++ = bpmem.zcontrol.hex; // 3 *ptr++ = bpmem.zmode.hex; // 4 - *ptr++ = g_ActiveConfig.bEnablePerPixelDepth; // 5 - *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 6 - *ptr++ = xfregs.numTexGen.hex; // 7 + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 5 + *ptr++ = xfregs.numTexGen.hex; // 6 if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { @@ -222,28 +198,28 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u } for (unsigned int i = 0; i < 8; ++i) - *ptr++ = xfregs.texMtxInfo[i].hex; // 8-15 + *ptr++ = xfregs.texMtxInfo[i].hex; // 7-14 for (unsigned int i = 0; i < 16; ++i) - *ptr++ = bpmem.tevind[i].hex; // 16-31 + *ptr++ = bpmem.tevind[i].hex; // 15-30 - *ptr++ = bpmem.tevindref.hex; // 32 + *ptr++ = bpmem.tevindref.hex; // 31 - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) // up to 16 times { - *ptr++ = bpmem.combiners[i].colorC.hex; // 33+5*i - *ptr++ = bpmem.combiners[i].alphaC.hex; // 34+5*i - *ptr++ = bpmem.tevind[i].hex; // 35+5*i - *ptr++ = bpmem.tevksel[i/2].hex; // 36+5*i - *ptr++ = bpmem.tevorders[i/2].hex; // 37+5*i + *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i + *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i + *ptr++ = bpmem.tevind[i].hex; // 34+5*i + *ptr++ = bpmem.tevksel[i/2].hex; // 35+5*i + *ptr++ = bpmem.tevorders[i/2].hex; // 36+5*i } - ptr = &uid->values[113]; + ptr = &uid->values[112]; - *ptr++ = bpmem.alphaFunc.hex; // 113 + *ptr++ = bpmem.alpha_test.hex; // 112 - *ptr++ = bpmem.fog.c_proj_fsel.hex; // 114 - *ptr++ = bpmem.fogRange.Base.hex; // 115 + *ptr++ = bpmem.fog.c_proj_fsel.hex; // 113 + *ptr++ = bpmem.fogRange.Base.hex; // 114 _assert_((ptr - uid->values) == uid->GetNumValues()); } @@ -312,10 +288,10 @@ static const char *tevKSelTableC[] = // KCSEL "0.375f,0.375f,0.375f", // 3_8 = 0x05 "0.25f,0.25f,0.25f", // 1_4 = 0x06 "0.125f,0.125f,0.125f", // 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b + "ERROR1", // 0x08 + "ERROR2", // 0x09 + "ERROR3", // 0x0a + "ERROR4", // 0x0b I_KCOLORS"[0].rgb", // K0 = 0x0C I_KCOLORS"[1].rgb", // K1 = 0x0D I_KCOLORS"[2].rgb", // K2 = 0x0E @@ -348,14 +324,14 @@ static const char *tevKSelTableA[] = // KASEL "0.375f",// 3_8 = 0x05 "0.25f", // 1_4 = 0x06 "0.125f",// 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b - "ERROR", // 0x0c - "ERROR", // 0x0d - "ERROR", // 0x0e - "ERROR", // 0x0f + "ERROR5", // 0x08 + "ERROR6", // 0x09 + "ERROR7", // 0x0a + "ERROR8", // 0x0b + "ERROR9", // 0x0c + "ERROR10", // 0x0d + "ERROR11", // 0x0e + "ERROR12", // 0x0f I_KCOLORS"[0].r", // K0_R = 0x10 I_KCOLORS"[1].r", // K1_R = 0x11 I_KCOLORS"[2].r", // K2_R = 0x12 @@ -430,7 +406,7 @@ static const char *tevCInputTable[] = // CC "float3(0.5f, 0.5f, 0.5f)", // HALF "(ckonsttemp.rgb)", //"konsttemp.rgb", // KONST "float3(0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR" + "PADERROR1", "PADERROR2", "PADERROR3", "PADERROR4" }; static const char *tevAInputTable[] = // CA @@ -452,17 +428,17 @@ static const char *tevAInputTable[] = // CA "crastemp", // RASA, "ckonsttemp", // KONST, (hw1 had quarter) "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR", - "PADERROR", "PADERROR", "PADERROR", "PADERROR", + "PADERROR5", "PADERROR6", "PADERROR7", "PADERROR8", + "PADERROR9", "PADERROR10", "PADERROR11", "PADERROR12", }; static const char *tevRasTable[] = { "colors_0", "colors_1", - "ERROR", //2 - "ERROR", //3 - "ERROR", //4 + "ERROR13", //2 + "ERROR14", //3 + "ERROR15", //4 "alphabump", // use bump alpha "(alphabump*(255.0f/248.0f))", //normalized "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero @@ -485,7 +461,15 @@ static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; static char swapModeTable[4][5]; static char text[16384]; -static bool DepthTextureEnable; + +struct RegisterState +{ + bool ColorNeedOverflowControl; + bool AlphaNeedOverflowControl; + bool AuxStored; +}; + +static RegisterState RegisterStates[4]; static void BuildSwapModeTable() { @@ -523,7 +507,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; } } - DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; // Declare samplers if(ApiType != API_D3D11) @@ -579,14 +562,14 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType { WRITE(p, " out float4 ocol0 : COLOR0,%s%s\n in float4 rawpos : %s,\n", dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n out float4 ocol1 : COLOR1," : "", - DepthTextureEnable ? "\n out float depth : DEPTH," : "", + "\n out float depth : DEPTH,", ApiType & API_OPENGL ? "WPOS" : ApiType & API_D3D9_SM20 ? "POSITION" : "VPOS"); } else { WRITE(p, " out float4 ocol0 : SV_Target0,%s%s\n in float4 rawpos : SV_Position,\n", dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n out float4 ocol1 : SV_Target1," : "", - DepthTextureEnable ? "\n out float depth : SV_Depth," : ""); + "\n out float depth : SV_Depth,"); } WRITE(p, " in float4 colors_0 : COLOR0,\n"); @@ -617,33 +600,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType } WRITE(p, " ) {\n"); - char* pmainstart = p; - int Pretest = AlphaPreTest(); - if(Pretest >= 0 && !DepthTextureEnable) - { - if (!Pretest) - { - // alpha test will always fail, so restart the shader and just make it an empty function - WRITE(p, "ocol0 = 0;\n"); - if(DepthTextureEnable) - WRITE(p, "depth = 1.f;\n"); - if(dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - WRITE(p, "ocol1 = 0;\n"); - WRITE(p, "discard;\n"); - if(ApiType != API_D3D11) - WRITE(p, "return;\n"); - } - else if (dstAlphaMode == DSTALPHA_ALPHA_PASS) - { - WRITE(p, " ocol0 = " I_ALPHA"[0].aaaa;\n"); - } - if(!Pretest || dstAlphaMode == DSTALPHA_ALPHA_PASS) - { - WRITE(p, "}\n"); - return text; - } - } - WRITE(p, " float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n" " float3 comp16 = float3(1.0f, 255.0f, 0.0f), comp24 = float3(1.0f, 255.0f, 255.0f*255.0f);\n" " float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n" @@ -717,6 +673,16 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType } } + RegisterStates[0].AlphaNeedOverflowControl = false; + RegisterStates[0].ColorNeedOverflowControl = false; + RegisterStates[0].AuxStored = false; + for(int i = 1; i < 4; i++) + { + RegisterStates[i].AlphaNeedOverflowControl = true; + RegisterStates[i].ColorNeedOverflowControl = true; + RegisterStates[i].AuxStored = false; + } + for (int i = 0; i < numStages; i++) WriteStage(p, i, ApiType); //build the equation for this stage @@ -724,40 +690,43 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType { // The results of the last texenv stage are put onto the screen, // regardless of the used destination register - WRITE(p, "prev.rgb = %s;\n",tevCOutputTable[bpmem.combiners[numStages-1].colorC.dest]); - WRITE(p, "prev.a = %s;\n",tevAOutputTable[bpmem.combiners[numStages-1].alphaC.dest]); + if(bpmem.combiners[numStages - 1].colorC.dest != 0) + { + bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored; + WRITE(p, "prev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]); + RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl; + } + if(bpmem.combiners[numStages - 1].alphaC.dest != 0) + { + bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AuxStored; + WRITE(p, "prev.a = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]); + RegisterStates[0].AlphaNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl; + } } - // emulation of unsigned 8 overflow when casting - WRITE(p, "prev = frac(4.0f + prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + // emulation of unsigned 8 overflow when casting if needed + if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) + WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - if(Pretest == -1) - { + AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult(); + if (Pretest == AlphaTest::UNDETERMINED) WriteAlphaTest(p, ApiType, dstAlphaMode); - } - if((bpmem.fog.c_proj_fsel.fsel != 0) || DepthTextureEnable) - { - // the screen space depth value = far z + (clip z / clip w) * z range - WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n"); - } + // the screen space depth value = far z + (clip z / clip w) * z range + WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n"); - if (DepthTextureEnable) + // Note: depth textures are disabled if early depth test is enabled + if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) { // use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format... - 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"); + WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n", + (bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : ""); - // scale to make result from frac correct - WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n"); - WRITE(p, "zCoord = frac(zCoord);\n"); - WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n"); - } - WRITE(p, "depth = zCoord;\n"); + // scale to make result from frac correct + WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n"); + WRITE(p, "zCoord = frac(zCoord);\n"); + WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n"); } + WRITE(p, "depth = zCoord;\n"); if (dstAlphaMode == DSTALPHA_ALPHA_PASS) WRITE(p, " ocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n"); @@ -917,7 +886,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC; TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC; - // blah1 if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC || cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC || cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC @@ -950,7 +918,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, "textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - // blah2 if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST || ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST || ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST) { @@ -971,30 +938,78 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) || cc.b == TEVCOLORARG_CPREV || cc.b == TEVCOLORARG_APREV || cc.c == TEVCOLORARG_CPREV || cc.c == TEVCOLORARG_APREV || ac.a == TEVALPHAARG_APREV || ac.b == TEVALPHAARG_APREV || ac.c == TEVALPHAARG_APREV) - WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) + { + WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[0].AlphaNeedOverflowControl = false; + RegisterStates[0].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cprev = prev;\n"); + } + RegisterStates[0].AuxStored = true; + } if(cc.a == TEVCOLORARG_C0 || cc.a == TEVCOLORARG_A0 || cc.b == TEVCOLORARG_C0 || cc.b == TEVCOLORARG_A0 || cc.c == TEVCOLORARG_C0 || cc.c == TEVCOLORARG_A0 || ac.a == TEVALPHAARG_A0 || ac.b == TEVALPHAARG_A0 || ac.c == TEVALPHAARG_A0) - WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl) + { + WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[1].AlphaNeedOverflowControl = false; + RegisterStates[1].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc0 = c0;\n"); + } + RegisterStates[1].AuxStored = true; + } if(cc.a == TEVCOLORARG_C1 || cc.a == TEVCOLORARG_A1 || cc.b == TEVCOLORARG_C1 || cc.b == TEVCOLORARG_A1 || cc.c == TEVCOLORARG_C1 || cc.c == TEVCOLORARG_A1 || ac.a == TEVALPHAARG_A1 || ac.b == TEVALPHAARG_A1 || ac.c == TEVALPHAARG_A1) - WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl) + { + WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[2].AlphaNeedOverflowControl = false; + RegisterStates[2].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc1 = c1;\n"); + } + RegisterStates[2].AuxStored = true; + } if(cc.a == TEVCOLORARG_C2 || cc.a == TEVCOLORARG_A2 || cc.b == TEVCOLORARG_C2 || cc.b == TEVCOLORARG_A2 || cc.c == TEVCOLORARG_C2 || cc.c == TEVCOLORARG_A2 || ac.a == TEVALPHAARG_A2 || ac.b == TEVALPHAARG_A2 || ac.c == TEVALPHAARG_A2) + { + if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl) + { WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[3].AlphaNeedOverflowControl = false; + RegisterStates[3].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc2 = c2;\n"); + } + RegisterStates[3].AuxStored = true; + } + RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0); + RegisterStates[cc.dest].AuxStored = false; + // combine the color channel WRITE(p, "// color combine\n"); if (cc.clamp) WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); @@ -1042,8 +1057,11 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, ")"); WRITE(p,";\n"); - WRITE(p, "// alpha combine\n"); + RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0); + RegisterStates[ac.dest].AuxStored = false; + // combine the alpha channel + WRITE(p, "// alpha combine\n"); if (ac.clamp) WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); else @@ -1118,39 +1136,6 @@ static const char *tevAlphaFunclogicTable[] = " != ", // 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 void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) { @@ -1163,34 +1148,31 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode // using discard then return works the same in cg and dx9 but not in dx11 WRITE(p, "if(!( "); - int compindex = bpmem.alphaFunc.comp0 % 8; + int compindex = bpmem.alpha_test.comp0; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table - WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alphaFunc.logic % 4]);//lookup the logic op + WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op - compindex = bpmem.alphaFunc.comp1 % 8; + compindex = bpmem.alpha_test.comp1; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table WRITE(p, ")) {\n"); WRITE(p, "ocol0 = 0;\n"); if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) WRITE(p, "ocol1 = 0;\n"); - if (DepthTextureEnable) - WRITE(p, "depth = 1.f;\n"); + WRITE(p, "depth = 1.f;\n"); - // HAXX: zcomploc is a way to control whether depth test is done before - // or after texturing and alpha test. PC GPU does depth test before texturing ONLY if depth value is - // not updated during shader execution. + // HAXX: zcomploc (aka early_ztest) is a way to control whether depth test is done before + // or after texturing and alpha test. PC GPUs have no way to support this + // feature properly as of 2012: depth buffer and depth test are not + // programmable and the depth test is always done after texturing. + // Most importantly, PC GPUs do not allow writing to the z buffer without + // writing a color value (unless color writing is disabled altogether). // We implement "depth test before texturing" by discarding the fragment // when the alpha test fail. This is not a correct implementation because - // even if the depth test fails the fragment could be alpha blended. - // this implemnetation is a trick to keep speed. - // the correct, but slow, way to implement a correct zComploc is : - // 1 - if zcomplock is enebled make a first pass, with color channel write disabled updating only - // depth channel. - // 2 - in the next pass disable depth chanel update, but proccess the color data normally - // this way is the only CORRECT way to emulate perfectly the zcomplock behaviour - if (!(bpmem.zcontrol.zcomploc && bpmem.zmode.updateenable)) + // even if the depth test fails the fragment could be alpha blended, but + // we don't have a choice. + if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable)) { WRITE(p, "discard;\n"); if (ApiType != API_D3D11) @@ -1198,7 +1180,6 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode } WRITE(p, "}\n"); - } static const char *tevFogFuncsTable[] = diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 31242a916e..9c8bfce256 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -45,7 +45,7 @@ #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) #define PIXELSHADERUID_MAX_VALUES 70 -#define PIXELSHADERUID_MAX_VALUES_SAFE 120 +#define PIXELSHADERUID_MAX_VALUES_SAFE 115 // DO NOT make anything in this class virtual. template diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index 1533f9348e..eaaf99fbc8 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -302,7 +302,7 @@ void PixelShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 2; ++i) { if (nMaterialsChanged & (1 << i)) { @@ -316,6 +316,21 @@ void PixelShaderManager::SetConstants() SetPSConstant4fv(C_PMATERIALS + i, material); } } + + for (int i = 0; i < 2; ++i) + { + if (nMaterialsChanged & (1 << (i + 2))) + { + u32 data = *(xfregs.matColor + i); + + material[0] = ((data >> 24) & 0xFF) * NormalizationCoef; + material[1] = ((data >> 16) & 0xFF) * NormalizationCoef; + material[2] = ((data >> 8) & 0xFF) * NormalizationCoef; + material[3] = ( data & 0xFF) * NormalizationCoef; + + SetPSConstant4fv(C_PMATERIALS + i + 2, material); + } + } nMaterialsChanged = 0; } @@ -358,7 +373,7 @@ void PixelShaderManager::SetColorChanged(int type, int num, bool high) PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, pf[0], pf[1], pf[2], pf[3]); } -void PixelShaderManager::SetAlpha(const AlphaFunc& alpha) +void PixelShaderManager::SetAlpha(const AlphaTest& alpha) { if ((alpha.hex & 0xffff) != lastAlpha) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h index a336287a6f..12d749c871 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.h +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h @@ -38,7 +38,7 @@ public: // constant management, should be called after memory is committed static void SetColorChanged(int type, int index, bool high); - static void SetAlpha(const AlphaFunc& alpha); + static void SetAlpha(const AlphaTest& alpha); static void SetDestAlpha(const ConstantAlpha& alpha); static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt); static void SetZTextureBias(u32 bias); diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 0bd1c89118..90a09aec43 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -67,12 +67,7 @@ int Renderer::s_target_height; int Renderer::s_backbuffer_width; int Renderer::s_backbuffer_height; -// ratio of backbuffer size and render area size -float Renderer::xScale; -float Renderer::yScale; - -unsigned int Renderer::s_XFB_width; -unsigned int Renderer::s_XFB_height; +TargetRectangle Renderer::target_rc; int Renderer::s_LastEFBScale; @@ -81,9 +76,16 @@ bool Renderer::XFBWrited; bool Renderer::s_EnableDLCachingAfterRecording; unsigned int Renderer::prev_efb_format = (unsigned int)-1; +unsigned int Renderer::efb_scale_numeratorX = 1; +unsigned int Renderer::efb_scale_numeratorY = 1; +unsigned int Renderer::efb_scale_denominatorX = 1; +unsigned int Renderer::efb_scale_denominatorY = 1; +unsigned int Renderer::ssaa_multiplier = 1; -Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) +Renderer::Renderer() + : frame_data() + , bLastFrameDumped(false) { UpdateActiveConfig(); TextureCache::OnConfigChanged(g_ActiveConfig); @@ -91,6 +93,9 @@ Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) #if defined _WIN32 || defined HAVE_LIBAV bAVIDumping = false; #endif + + OSDChoice = 0; + OSDTime = 0; } Renderer::~Renderer() @@ -98,6 +103,8 @@ Renderer::~Renderer() // invalidate previous efb format prev_efb_format = (unsigned int)-1; + efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = ssaa_multiplier = 1; + #if defined _WIN32 || defined HAVE_LIBAV if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) AVIDump::Stop(); @@ -105,7 +112,6 @@ Renderer::~Renderer() if (pFrameDump.IsOpen()) pFrameDump.Close(); #endif - delete[] frame_data; } void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma) @@ -121,64 +127,117 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect VideoFifo_CheckSwapRequestAt(xfbAddr, fbWidth, fbHeight); XFBWrited = true; - // XXX: Without the VI, how would we know what kind of field this is? So - // just use progressive. if (g_ActiveConfig.bUseXFB) { FramebufferManagerBase::CopyToXFB(xfbAddr, fbWidth, fbHeight, sourceRc,Gamma); } else { + // XXX: Without the VI, how would we know what kind of field this is? So + // just use progressive. g_renderer->Swap(xfbAddr, FIELD_PROGRESSIVE, fbWidth, fbHeight,sourceRc,Gamma); Common::AtomicStoreRelease(s_swapRequested, false); } } -void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) +int Renderer::EFBToScaledX(int x) { switch (g_ActiveConfig.iEFBScale) { - case 3: // 1.5x - scaledX = (x / 2) * 3; - scaledY = (y / 2) * 3; - break; - case 4: // 2x - scaledX = x * 2; - scaledY = y * 2; - break; - case 5: // 2.5x - scaledX = (x / 2) * 5; - scaledY = (y / 2) * 5; - break; - case 6: // 3x - scaledX = x * 3; - scaledY = y * 3; - break; - case 7: // 4x - scaledX = x * 4; - scaledY = y * 4; - break; + case 0: // fractional + return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width); + default: - scaledX = x; - scaledY = y; - break; + return x * (int)ssaa_multiplier * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; }; } +int Renderer::EFBToScaledY(int y) +{ + switch (g_ActiveConfig.iEFBScale) + { + case 0: // fractional + return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height); + + default: + return y * (int)ssaa_multiplier * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; + }; +} + +void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) +{ + if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) + { + scaledX = x; + scaledY = y; + } + else + { + scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; + scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; + } +} + // return true if target size changed -bool Renderer::CalculateTargetSize(int multiplier) +bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier) { int newEFBWidth, newEFBHeight; + + // TODO: Ugly. Clean up + switch (s_LastEFBScale) + { + case 2: // 1x + efb_scale_numeratorX = efb_scale_numeratorY = 1; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 3: // 1.5x + efb_scale_numeratorX = efb_scale_numeratorY = 3; + efb_scale_denominatorX = efb_scale_denominatorY = 2; + break; + + case 4: // 2x + efb_scale_numeratorX = efb_scale_numeratorY = 2; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 5: // 2.5x + efb_scale_numeratorX = efb_scale_numeratorY = 5; + efb_scale_denominatorX = efb_scale_denominatorY = 2; + break; + + case 6: // 3x + efb_scale_numeratorX = efb_scale_numeratorY = 3; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 7: // 4x + efb_scale_numeratorX = efb_scale_numeratorY = 4; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + default: // fractional & integral handled later + break; + } + switch (s_LastEFBScale) { case 0: // fractional - newEFBWidth = (int)(EFB_WIDTH * xScale); - newEFBHeight = (int)(EFB_HEIGHT * yScale); - break; case 1: // integral - newEFBWidth = EFB_WIDTH * (int)ceilf(xScale); - newEFBHeight = EFB_HEIGHT * (int)ceilf(yScale); + newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH, framebuffer_width); + newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT, framebuffer_height); + + if (s_LastEFBScale == 1) + { + newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH; + newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT; + } + efb_scale_numeratorX = newEFBWidth; + efb_scale_denominatorX = EFB_WIDTH; + efb_scale_numeratorY = newEFBHeight; + efb_scale_denominatorY = EFB_HEIGHT; break; + default: CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, newEFBWidth, newEFBHeight); break; @@ -186,6 +245,7 @@ bool Renderer::CalculateTargetSize(int multiplier) newEFBWidth *= multiplier; newEFBHeight *= multiplier; + ssaa_multiplier = multiplier; if (newEFBWidth != s_target_width || newEFBHeight != s_target_height) { @@ -207,131 +267,230 @@ void Renderer::SetScreenshot(const char *filename) // Create On-Screen-Messages void Renderer::DrawDebugText() { + if (!g_Config.bOSDHotKey) + return; + // OSD Menu messages - if (g_ActiveConfig.bOSDHotKey) + if (OSDChoice > 0) { - if (OSDChoice > 0) - { - OSDTime = Common::Timer::GetTimeMs() + 3000; - OSDChoice = -OSDChoice; - } - if ((u32)OSDTime > Common::Timer::GetTimeMs()) - { - const char* res_text = ""; - switch (g_ActiveConfig.iEFBScale) - { - case 0: - res_text = "Auto (fractional)"; - break; - case 1: - res_text = "Auto (integral)"; - break; - case 2: - res_text = "Native"; - break; - case 3: - res_text = "1.5x"; - break; - case 4: - res_text = "2x"; - break; - case 5: - res_text = "2.5x"; - break; - case 6: - res_text = "3x"; - break; - case 7: - res_text = "4x"; - break; - } - - const char* ar_text = ""; - switch(g_ActiveConfig.iAspectRatio) - { - case ASPECT_AUTO: - ar_text = "Auto"; - break; - case ASPECT_FORCE_16_9: - ar_text = "16:9"; - break; - case ASPECT_FORCE_4_3: - ar_text = "4:3"; - break; - case ASPECT_STRETCH: - ar_text = "Stretch"; - break; - } - - const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ? - (g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled"; - - // The rows - const std::string lines[] = - { - std::string("3: Internal Resolution: ") + res_text, - std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""), - std::string("5: Copy EFB: ") + efbcopy_text, - std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"), - }; - - enum { lines_count = sizeof(lines)/sizeof(*lines) }; - - std::string final_yellow, final_cyan; - - // If there is more text than this we will have a collision - if (g_ActiveConfig.bShowFPS) - { - final_yellow = final_cyan = "\n\n"; - } - - // The latest changed setting in yellow - for (int i = 0; i != lines_count; ++i) - { - if (OSDChoice == -i - 1) - final_yellow += lines[i]; - final_yellow += '\n'; - } - - // The other settings in cyan - for (int i = 0; i != lines_count; ++i) - { - if (OSDChoice != -i - 1) - final_cyan += lines[i]; - final_cyan += '\n'; - } - - // Render a shadow - g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000); - g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000); - //and then the text - g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF); - g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00); - } + OSDTime = Common::Timer::GetTimeMs() + 3000; + OSDChoice = -OSDChoice; } + + if ((u32)OSDTime <= Common::Timer::GetTimeMs()) + return; + + const char* res_text = ""; + switch (g_ActiveConfig.iEFBScale) + { + case 0: + res_text = "Auto (fractional)"; + break; + case 1: + res_text = "Auto (integral)"; + break; + case 2: + res_text = "Native"; + break; + case 3: + res_text = "1.5x"; + break; + case 4: + res_text = "2x"; + break; + case 5: + res_text = "2.5x"; + break; + case 6: + res_text = "3x"; + break; + case 7: + res_text = "4x"; + break; + } + + const char* ar_text = ""; + switch(g_ActiveConfig.iAspectRatio) + { + case ASPECT_AUTO: + ar_text = "Auto"; + break; + case ASPECT_FORCE_16_9: + ar_text = "16:9"; + break; + case ASPECT_FORCE_4_3: + ar_text = "4:3"; + break; + case ASPECT_STRETCH: + ar_text = "Stretch"; + break; + } + + const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ? + (g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled"; + + // The rows + const std::string lines[] = + { + std::string("3: Internal Resolution: ") + res_text, + std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""), + std::string("5: Copy EFB: ") + efbcopy_text, + std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"), + }; + + enum { lines_count = sizeof(lines)/sizeof(*lines) }; + + std::string final_yellow, final_cyan; + + // If there is more text than this we will have a collision + if (g_ActiveConfig.bShowFPS) + { + final_yellow = final_cyan = "\n\n"; + } + + // The latest changed setting in yellow + for (int i = 0; i != lines_count; ++i) + { + if (OSDChoice == -i - 1) + final_yellow += lines[i]; + final_yellow += '\n'; + } + + // The other settings in cyan + for (int i = 0; i != lines_count; ++i) + { + if (OSDChoice != -i - 1) + final_cyan += lines[i]; + final_cyan += '\n'; + } + + // Render a shadow + g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000); + g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000); + //and then the text + g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF); + g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00); } -void Renderer::CalculateXYScale(const TargetRectangle& dst_rect) +// TODO: remove +extern bool g_aspect_wide; + +void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) { - if (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB) + float FloatGLWidth = (float)backbuffer_width; + float FloatGLHeight = (float)backbuffer_height; + float FloatXOffset = 0; + float FloatYOffset = 0; + + // The rendering window size + const float WinWidth = FloatGLWidth; + const float WinHeight = FloatGLHeight; + + // Handle aspect ratio. + // Default to auto. + bool use16_9 = g_aspect_wide; + + // Update aspect ratio hack values + // Won't take effect until next frame + // Don't know if there is a better place for this code so there isn't a 1 frame delay + if ( g_ActiveConfig.bWidescreenHack ) { - xScale = 1.0f; - yScale = 1.0f; - } - else - { - if (g_ActiveConfig.b3DVision) + float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f); + float target_aspect; + + switch ( g_ActiveConfig.iAspectRatio ) { - // This works, yet the version in the else doesn't. No idea why. - xScale = (float)(s_backbuffer_width-1) / (float)(s_XFB_width-1); - yScale = (float)(s_backbuffer_height-1) / (float)(s_XFB_height-1); + case ASPECT_FORCE_16_9 : + target_aspect = 16.0f / 9.0f; + break; + case ASPECT_FORCE_4_3 : + target_aspect = 4.0f / 3.0f; + break; + case ASPECT_STRETCH : + target_aspect = WinWidth / WinHeight; + break; + default : + // ASPECT_AUTO == no hacking + target_aspect = source_aspect; + break; + } + + float adjust = source_aspect / target_aspect; + if ( adjust > 1 ) + { + // Vert+ + g_Config.fAspectRatioHackW = 1; + g_Config.fAspectRatioHackH = 1/adjust; } else { - xScale = (float)(dst_rect.right - dst_rect.left - 1) / (float)(s_XFB_width-1); - yScale = (float)(dst_rect.bottom - dst_rect.top - 1) / (float)(s_XFB_height-1); + // Hor+ + g_Config.fAspectRatioHackW = adjust; + g_Config.fAspectRatioHackH = 1; } } + else + { + // Hack is disabled + g_Config.fAspectRatioHackW = 1; + g_Config.fAspectRatioHackH = 1; + } + + // Check for force-settings and override. + if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9) + use16_9 = true; + else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3) + use16_9 = false; + + if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH) + { + // The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio + float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f)); + // Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width. + if (Ratio > 1.0f) + { + // Scale down and center in the X direction. + FloatGLWidth /= Ratio; + FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f; + } + // The window is too high, we have to limit the height + else + { + // Scale down and center in the Y direction. + FloatGLHeight *= Ratio; + FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f; + } + } + + // ----------------------------------------------------------------------- + // Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10. + // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset + // ------------------ + if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop) + { + float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f))); + // The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted) + float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth; + float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight; + // The new width and height + FloatGLWidth = FloatGLWidth * Ratio; + FloatGLHeight = FloatGLHeight * Ratio; + // Adjust the X and Y offset + FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f); + FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f); + } + + int XOffset = (int)(FloatXOffset + 0.5f); + int YOffset = (int)(FloatYOffset + 0.5f); + int iWhidth = (int)ceil(FloatGLWidth); + int iHeight = (int)ceil(FloatGLHeight); + iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders + iHeight -= iHeight % 4; + + target_rc.left = XOffset; + target_rc.top = YOffset; + target_rc.right = XOffset + iWhidth; + target_rc.bottom = YOffset + iHeight; } void Renderer::SetWindowSize(int width, int height) diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 4d288143c0..7f2853bcc3 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -39,7 +39,7 @@ // TODO: Move these out of here. extern int frameCount; -extern int OSDChoice, OSDTime; +extern int OSDChoice; extern bool bLastFrameDumped; @@ -83,10 +83,6 @@ public: static int GetBackbufferWidth() { return s_backbuffer_width; } static int GetBackbufferHeight() { return s_backbuffer_height; } - // XFB scale - TODO: Remove this and add two XFBToScaled functions instead - static float GetXFBScaleX() { return xScale; } - static float GetXFBScaleY() { return yScale; } - static void SetWindowSize(int width, int height); // EFB coordinate conversion functions @@ -94,9 +90,13 @@ public: // Use this to convert a whole native EFB rect to backbuffer coordinates virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0; + static const TargetRectangle& GetTargetRectangle() { return target_rc; } + static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height); + + // Use this to upscale native EFB coordinates to IDEAL internal resolution - static unsigned int EFBToScaledX(int x) { return x * GetTargetWidth() / EFB_WIDTH; } - static unsigned int EFBToScaledY(int y) { return y * GetTargetHeight() / EFB_HEIGHT; } + static int EFBToScaledX(int x); + static int EFBToScaledY(int y); // Floating point versions of the above - only use them if really necessary static float EFBToScaledXf(float x) { return x * ((float)GetTargetWidth() / (float)EFB_WIDTH); } @@ -147,8 +147,7 @@ public: protected: static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); - static bool CalculateTargetSize(int multiplier = 1); - static void CalculateXYScale(const TargetRectangle& dst_rect); + static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1); static void CheckFifoRecording(); static void RecordVideoMemory(); @@ -162,7 +161,7 @@ protected: #else File::IOFile pFrameDump; #endif - char* frame_data; + std::vector frame_data; bool bLastFrameDumped; // The framebuffer size @@ -173,12 +172,7 @@ protected: static int s_backbuffer_width; static int s_backbuffer_height; - // ratio of backbuffer size and render area size - TODO: Remove these! - static float xScale; - static float yScale; - - static unsigned int s_XFB_width; - static unsigned int s_XFB_height; + static TargetRectangle target_rc; // can probably eliminate this static var static int s_LastEFBScale; @@ -190,6 +184,11 @@ protected: private: static unsigned int prev_efb_format; + static unsigned int efb_scale_numeratorX; + static unsigned int efb_scale_numeratorY; + static unsigned int efb_scale_denominatorX; + static unsigned int efb_scale_denominatorY; + static unsigned int ssaa_multiplier; }; extern Renderer *g_renderer; diff --git a/Source/Core/VideoCommon/Src/Statistics.h b/Source/Core/VideoCommon/Src/Statistics.h index 7238398b42..e173bfc682 100644 --- a/Source/Core/VideoCommon/Src/Statistics.h +++ b/Source/Core/VideoCommon/Src/Statistics.h @@ -43,7 +43,7 @@ struct Statistics int numUniquePixelShaders; - float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5, proj_6; + float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5; float gproj_0, gproj_1, gproj_2, gproj_3, gproj_4, gproj_5; float gproj_6, gproj_7, gproj_8, gproj_9, gproj_10, gproj_11, gproj_12, gproj_13, gproj_14, gproj_15; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index a5c390df3d..6871c411fa 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -84,35 +84,34 @@ TextureCache::~TextureCache() void TextureCache::OnConfigChanged(VideoConfig& config) { - if (!g_texture_cache) - goto skip_checks; - - // TODO: Invalidating texcache is really stupid in some of these cases - if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples || - config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay || - config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center || - config.bHiresTextures != backup_config.s_hires_textures) + if (g_texture_cache) { - g_texture_cache->Invalidate(); + // TODO: Invalidating texcache is really stupid in some of these cases + if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples || + config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay || + config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center || + config.bHiresTextures != backup_config.s_hires_textures) + { + g_texture_cache->Invalidate(); - if(g_ActiveConfig.bHiresTextures) - HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); + if(g_ActiveConfig.bHiresTextures) + HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); - SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); - TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); + SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); + TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); + } + + // TODO: Probably shouldn't clear all render targets here, just mark them dirty or something. + if (config.bEFBCopyCacheEnable != backup_config.s_copy_cache_enable || // TODO: not sure if this is needed? + config.bCopyEFBToTexture != backup_config.s_copy_efb_to_texture || + config.bCopyEFBScaled != backup_config.s_copy_efb_scaled || + config.bEFBCopyEnable != backup_config.s_copy_efb || + config.iEFBScale != backup_config.s_efb_scale) + { + g_texture_cache->ClearRenderTargets(); + } } - - // TODO: Probably shouldn't clear all render targets here, just mark them dirty or something. - if (config.bEFBCopyCacheEnable != backup_config.s_copy_cache_enable || // TODO: not sure if this is needed? - config.bCopyEFBToTexture != backup_config.s_copy_efb_to_texture || - config.bCopyEFBScaled != backup_config.s_copy_efb_scaled || - config.bEFBCopyEnable != backup_config.s_copy_efb || - config.iEFBScale != backup_config.s_efb_scale) - { - g_texture_cache->ClearRenderTargets(); - } - -skip_checks: + backup_config.s_colorsamples = config.iSafeTextureCache_ColorSamples; backup_config.s_copy_efb_to_texture = config.bCopyEFBToTexture; backup_config.s_copy_efb_scaled = config.bCopyEFBScaled; @@ -130,7 +129,11 @@ void TextureCache::Cleanup() TexCache::iterator tcend = textures.end(); while (iter != tcend) { - if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) // TODO: Deleting EFB copies might not be a good idea here... + if ( frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount + + // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted + // TODO: encoding the texture back to RAM here might be a good idea + && ! (g_ActiveConfig.bCopyEFBToTexture && iter->second->IsEfbCopy()) ) { delete iter->second; textures.erase(iter++); @@ -204,13 +207,23 @@ void TextureCache::ClearRenderTargets() iter = textures.begin(), tcend = textures.end(); - for (; iter!=tcend; ++iter) - if (iter->second->type != TCET_EC_DYNAMIC) - iter->second->type = TCET_NORMAL; + while (iter != tcend) + { + if (iter->second->type == TCET_EC_VRAM) + { + delete iter->second; + textures.erase(iter++); + } + else + ++iter; + } } bool TextureCache::CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels) { + if (levels == 1) + return false; + // Just checking if the necessary files exist, if they can't be loaded or have incorrect dimensions LODs will be black char texBasePathTemp[MAX_PATH]; char texPathTemp[MAX_PATH]; @@ -291,14 +304,30 @@ void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level) entry->Save(szTemp, level); } -TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, - u32 address, unsigned int width, unsigned int height, int texformat, - unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem) +static u32 CalculateLevelSize(u32 level_0_size, u32 level) +{ + return (level_0_size + ((1 << level) - 1)) >> level; +} + +// Used by TextureCache::Load +static TextureCache::TCacheEntryBase* ReturnEntry(unsigned int stage, TextureCache::TCacheEntryBase* entry) +{ + entry->frameCount = frameCount; + entry->Bind(stage); + + GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true); + + return entry; +} + +TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, + u32 const address, unsigned int width, unsigned int height, int const texformat, + unsigned int const tlutaddr, int const tlutfmt, bool const use_mipmaps, unsigned int maxlevel, bool const from_tmem) { if (0 == address) return NULL; - // TexelSizeInNibbles(format)*width*height/16; + // TexelSizeInNibbles(format) * width * height / 16; const unsigned int bsw = TexDecoder_GetBlockWidthInTexels(texformat) - 1; const unsigned int bsh = TexDecoder_GetBlockHeightInTexels(texformat) - 1; @@ -307,11 +336,9 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, const unsigned int nativeW = width; const unsigned int nativeH = height; - bool using_custom_texture = false; - bool using_custom_lods = false; - u32 texID = address; - u64 tex_hash = TEXHASH_INVALID; // Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup) + // Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup) + u64 tex_hash = TEXHASH_INVALID; u64 tlut_hash = TEXHASH_INVALID; u32 full_format = texformat; @@ -322,10 +349,14 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, full_format = texformat | (tlutfmt << 16); const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - u8* src_data; - if (from_tmem) src_data = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE]; - else src_data = Memory::GetPointer(address); + const u8* src_data; + if (from_tmem) + src_data = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE]; + else + src_data = Memory::GetPointer(address); + + // TODO: This doesn't hash GB tiles for preloaded RGBA8 textures (instead, it's hashing more data from the low tmem bank than it should) tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) { @@ -345,6 +376,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, tex_hash ^= tlut_hash; } + // D3D doesn't like when the specified mipmap count would require more than one 1x1-sized LOD in the mipmap chain + // e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,1x1, so we limit the mipmap count to 6 there + while (g_ActiveConfig.backend_info.bUseMinimalMipCount && max(expandedWidth, expandedHeight) >> maxlevel == 0) + --maxlevel; + TCacheEntryBase *entry = textures[texID]; if (entry) { @@ -358,15 +394,17 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, { entry->type = TCET_EC_VRAM; - // TODO: Print a warning if the format changes! In this case, we could reinterpret the internal texture object data to the new pixel format (similiar to what is already being done in Renderer::ReinterpretPixelFormat()) - goto return_entry; + // TODO: Print a warning if the format changes! In this case, + // we could reinterpret the internal texture object data to the new pixel format + // (similiar to what is already being done in Renderer::ReinterpretPixelFormat()) + return ReturnEntry(stage, entry); } // 2. b) For normal textures, all texture parameters need to match if (address == entry->addr && tex_hash == entry->hash && full_format == entry->format && - entry->num_mipmaps == maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) + entry->num_mipmaps > maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) { - goto return_entry; + return ReturnEntry(stage, entry); } // 3. If we reach this line, we'll have to upload the new texture data to VRAM. @@ -374,7 +412,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Don't we need to force texture decoding to RGBA8 for dynamic EFB copies? // TODO: Actually, it should be enough if the internal texture format matches... - if ((entry->type == TCET_NORMAL && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + if ((entry->type == TCET_NORMAL && width == entry->virtual_width && height == entry->virtual_height + && full_format == entry->format && entry->num_mipmaps > maxlevel) || (entry->type == TCET_EC_DYNAMIC && entry->native_width == width && entry->native_height == height)) { // reuse the texture @@ -387,132 +426,135 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } + bool using_custom_texture = false; if (g_ActiveConfig.bHiresTextures) { + // This function may modify width/height. pcfmt = LoadCustomTexture(tex_hash, texformat, 0, width, height); if (pcfmt != PC_TEX_FMT_NONE) { - expandedWidth = width; - expandedHeight = height; + if (expandedWidth != width || expandedHeight != height) + { + expandedWidth = width; + expandedHeight = height; + + // If we thought we could reuse the texture before, make sure to delete it now! + delete entry; + entry = NULL; + } using_custom_texture = true; } } - // TODO: RGBA8 textures are stored non-continuously in tmem, that might cause problems when preloading is enabled - if (pcfmt == PC_TEX_FMT_NONE) - pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, - expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + if (!using_custom_texture) + { + if (!(texformat == GX_TF_RGBA8 && from_tmem)) + { + pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, + expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + } + else + { + u8* src_data_gb = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + pcfmt = TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight); + } + } - // TODO: Cleanup. Plus, we still autogenerate mipmaps in certain cases (we shouldn't do that) - bool isPow2; - unsigned int texLevels; - isPow2 = !((width & (width - 1)) || (height & (height - 1))); - texLevels = (isPow2 && maxlevel) ? GetPow2(std::max(width, height)) : !isPow2; - texLevels = maxlevel ? std::min(texLevels, maxlevel + 1) : texLevels; - using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); - UseNativeMips = UseNativeMips && !using_custom_lods && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions - texLevels = (UseNativeMips || using_custom_lods) ? texLevels : !isPow2; + u32 texLevels = use_mipmaps ? (maxlevel + 1) : 1; + const bool using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); + // Only load native mips if their dimensions fit to our virtual texture dimensions + const bool use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH); + texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // TODO: Should be forced to 1 for non-pow2 textures (e.g. efb copies with automatically adjusted IR) // create the entry/texture - if (NULL == entry) { + if (NULL == entry) + { textures[texID] = entry = g_texture_cache->CreateTexture(width, height, expandedWidth, texLevels, pcfmt); // Sometimes, we can get around recreating a texture if only the number of mip levels changes // e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states // Thus, we don't update this member for every Load, but just whenever the texture gets recreated - // - // TODO: Won't we end up recreating textures all the time because maxlevel doesn't necessarily equal texLevels? - entry->num_mipmaps = maxlevel; // TODO: Does this actually work? We can't really adjust mipmap settings per-stage... + // TODO: D3D9 doesn't support min_lod. We should add a workaround for that here! + + // TODO: This is the wrong value. We should be storing the number of levels our actual texture has. + // But that will currently make the above "existing entry" tests fail as "texLevels" is not calculated until after. + // Currently, we might try to reuse a texture which appears to have more levels than actual, maybe.. + entry->num_mipmaps = maxlevel + 1; entry->type = TCET_NORMAL; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } + else + { + // load texture (CreateTexture also loads level 0) + entry->Load(width, height, expandedWidth, 0); + } entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->hash = tex_hash; - if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_EC_DYNAMIC; - else entry->type = TCET_NORMAL; - - // load texture - entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); + + if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture) + entry->type = TCET_EC_DYNAMIC; + else + entry->type = TCET_NORMAL; if (g_ActiveConfig.bDumpTextures && !using_custom_texture) DumpTexture(entry, 0); + u32 level = 1; // load mips - TODO: Loading mipmaps from tmem is untested! - if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && UseNativeMips) + if (pcfmt != PC_TEX_FMT_NONE) { - const unsigned int bsdepth = TexDecoder_GetTexelSizeInNibbles(texformat); - - unsigned int level = 1; - unsigned int mipWidth = (width + 1) >> 1; - unsigned int mipHeight = (height + 1) >> 1; - - u8* ptr_even = NULL, *ptr_odd = NULL; - if (from_tmem) + if (use_native_mips) { - ptr_even = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE + texture_size]; - ptr_odd = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + src_data += texture_size; + + const u8* ptr_even = NULL; + const u8* ptr_odd = NULL; + if (from_tmem) + { + ptr_even = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE + texture_size]; + ptr_odd = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + } + + for (; level != texLevels; ++level) + { + const u32 mip_width = CalculateLevelSize(width, level); + const u32 mip_height = CalculateLevelSize(height, level); + const u32 expanded_mip_width = (mip_width + bsw) & (~bsw); + const u32 expanded_mip_height = (mip_height + bsh) & (~bsh); + + const u8*& mip_src_data = from_tmem + ? ((level % 2) ? ptr_odd : ptr_even) + : src_data; + TexDecoder_Decode(temp, mip_src_data, expanded_mip_width, expanded_mip_height, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + mip_src_data += TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat); + + entry->Load(mip_width, mip_height, expanded_mip_width, level); + + if (g_ActiveConfig.bDumpTextures) + DumpTexture(entry, level); + } } - src_data += texture_size; - - while ((mipHeight || mipWidth) && (level < texLevels)) + else if (using_custom_lods) { - u8** ptr; - if (from_tmem) ptr = (level % 2) ? &ptr_odd : &ptr_even; - else ptr = &src_data; + for (; level != texLevels; ++level) + { + unsigned int mip_width = CalculateLevelSize(width, level); + unsigned int mip_height = CalculateLevelSize(height, level); - const unsigned int currentWidth = (mipWidth > 0) ? mipWidth : 1; - const unsigned int currentHeight = (mipHeight > 0) ? mipHeight : 1; - - expandedWidth = (currentWidth + bsw) & (~bsw); - expandedHeight = (currentHeight + bsh) & (~bsh); - - TexDecoder_Decode(temp, *ptr, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); - entry->Load(currentWidth, currentHeight, expandedWidth, level, false); - - if (g_ActiveConfig.bDumpTextures) - DumpTexture(entry, level); - - *ptr += ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1); - mipWidth >>= 1; - mipHeight >>= 1; - ++level; - } - } - else if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && using_custom_lods) - { - unsigned int level = 1; - unsigned int mipWidth = (width + 1) >> 1; - unsigned int mipHeight = (height + 1) >> 1; - - while ((mipHeight || mipWidth) && (level < texLevels)) - { - unsigned int currentWidth = (mipWidth > 0) ? mipWidth : 1; - unsigned int currentHeight = (mipHeight > 0) ? mipHeight : 1; - - LoadCustomTexture(tex_hash, texformat, level, currentWidth, currentHeight); - entry->Load(currentWidth, currentHeight, currentWidth, level, false); - - mipWidth >>= 1; - mipHeight >>= 1; - ++level; + LoadCustomTexture(tex_hash, texformat, level, mip_width, mip_height); + entry->Load(mip_width, mip_height, mip_width, level); + } } } INCSTAT(stats.numTexturesCreated); SETSTAT(stats.numTexturesAlive, textures.size()); -return_entry: - - entry->frameCount = frameCount; - entry->Bind(stage); - - GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true); - - return entry; + return ReturnEntry(stage, entry); } void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, @@ -782,7 +824,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat textures[dstAddr] = entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h); // TODO: Using the wrong dstFormat, dumb... - entry->SetGeneralParameters(dstAddr, 0, dstFormat, 0); + entry->SetGeneralParameters(dstAddr, 0, dstFormat, 1); entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); entry->SetHashes(TEXHASH_INVALID); entry->type = TCET_EC_VRAM; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 4ef3b8a985..40441c2d70 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -60,26 +60,26 @@ public: int frameCount; - void SetGeneralParameters(u32 addr, u32 size, u32 format, unsigned int num_mipmaps) + void SetGeneralParameters(u32 _addr, u32 _size, u32 _format, unsigned int _num_mipmaps) { - this->addr = addr; - this->size_in_bytes = size; - this->format = format; - this->num_mipmaps = num_mipmaps; + addr = _addr; + size_in_bytes = _size; + format = _format; + num_mipmaps = _num_mipmaps; } - void SetDimensions(unsigned int native_width, unsigned int native_height, unsigned int virtual_width, unsigned int virtual_height) + void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _virtual_width, unsigned int _virtual_height) { - this->native_width = native_width; - this->native_height = native_height; - this->virtual_width = virtual_width; - this->virtual_height = virtual_height; + native_width = _native_width; + native_height = _native_height; + virtual_width = _virtual_width; + virtual_height = _virtual_height; } - void SetHashes(u64 hash/*, u32 pal_hash*/) + void SetHashes(u64 _hash/*, u32 _pal_hash*/) { - this->hash = hash; - //this->pal_hash = pal_hash; + hash = _hash; + //pal_hash = _pal_hash; } @@ -89,7 +89,7 @@ public: virtual bool Save(const char filename[], unsigned int level) = 0; virtual void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) = 0; + unsigned int expanded_width, unsigned int level) = 0; virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf, unsigned int cbufid, @@ -116,7 +116,7 @@ public: virtual TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) = 0; static TCacheEntryBase* Load(unsigned int stage, u32 address, unsigned int width, unsigned int height, - int format, unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem); + int format, unsigned int tlutaddr, int tlutfmt, bool use_mipmaps, unsigned int maxlevel, bool from_tmem); static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h index 1901c86d27..fae70897f5 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.h +++ b/Source/Core/VideoCommon/Src/TextureDecoder.h @@ -86,6 +86,8 @@ enum PC_TexFormat PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly = false); PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt); void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt); +void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth); +PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height); void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center); #endif diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index fb34ce1bc1..526cbe7e49 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -23,7 +23,7 @@ #include "MemoryUtil.h" #include "StringUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "PixelEngine.h" #include "Host.h" @@ -43,8 +43,9 @@ //BBox #include "XFMemory.h" extern float GC_ALIGNED16(g_fProjectionMatrix[16]); - +#ifndef _M_GENERIC #define USE_JIT +#endif #define COMPILED_CODE_SIZE 4096 @@ -82,8 +83,9 @@ static const float fractionTable[32] = { 1.0f / (1U << 24), 1.0f / (1U << 25), 1.0f / (1U << 26), 1.0f / (1U << 27), 1.0f / (1U << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31), }; - +#ifdef USE_JIT using namespace Gen; +#endif void LOADERDECL PosMtx_ReadDirect_UByte() { @@ -182,14 +184,19 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr) m_VtxDesc = vtx_desc; SetVAT(vtx_attr.g0.Hex, vtx_attr.g1.Hex, vtx_attr.g2.Hex); + #ifdef USE_JIT AllocCodeSpace(COMPILED_CODE_SIZE); CompileVertexTranslator(); WriteProtect(); + #endif + } VertexLoader::~VertexLoader() { + #ifdef USE_JIT FreeCodeSpace(); + #endif delete m_NativeFmt; } @@ -224,14 +231,14 @@ void VertexLoader::CompileVertexTranslator() #endif // Colors - const int col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + const u32 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; // TextureCoord // Since m_VtxDesc.Text7Coord is broken across a 32 bit word boundary, retrieve its value manually. // If we didn't do this, the vertex format would be read as one bit offset from where it should be, making // 01 become 00, and 10/11 become 01 - const int tc[8] = { + const u32 tc[8] = { m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, - m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const int)((m_VtxDesc.Hex >> 31) & 3) + m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const u32)((m_VtxDesc.Hex >> 31) & 3) }; // Reset pipeline @@ -474,7 +481,8 @@ void VertexLoader::WriteCall(TPipelineFunction func) m_PipelineStages[m_numPipelineStages++] = func; #endif } - +// ARMTODO: This should be done in a better way +#ifndef _M_GENERIC void VertexLoader::WriteGetVariable(int bits, OpArg dest, void *address) { #ifdef USE_JIT @@ -498,7 +506,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) #endif #endif } - +#endif void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int count) { m_numLoadedVertices += count; @@ -770,7 +778,7 @@ void VertexLoader::AppendToString(std::string *dest) const dest->append(StringFromFormat("Nrm: %i %s-%s ", m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat])); } - int color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + u32 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; for (int i = 0; i < 2; i++) { if (color_mode[i]) @@ -778,7 +786,7 @@ void VertexLoader::AppendToString(std::string *dest) const dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp])); } } - int tex_mode[8] = { + u32 tex_mode[8] = { m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord }; diff --git a/Source/Core/VideoCommon/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h index 98a57cb9ff..0f321cd14f 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.h +++ b/Source/Core/VideoCommon/Src/VertexLoader.h @@ -76,7 +76,12 @@ private: } }; +// ARMTODO: This should be done in a better way +#ifndef _M_GENERIC class VertexLoader : public Gen::XCodeBlock, NonCopyable +#else +class VertexLoader +#endif { public: VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr); @@ -122,8 +127,10 @@ private: void WriteCall(TPipelineFunction); +#ifndef _M_GENERIC void WriteGetVariable(int bits, Gen::OpArg dest, void *address); void WriteSetVariable(int bits, void *address, Gen::OpArg dest); +#endif }; #endif diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp index 316941a639..153e69a8c3 100644 --- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp @@ -19,9 +19,12 @@ #ifdef _MSC_VER #include using stdext::hash_map; -#else +#elif defined __APPLE__ #include using __gnu_cxx::hash_map; +#else +#include +using std::unordered_map; #endif #include #include @@ -45,7 +48,12 @@ namespace stdext { } } #else -namespace __gnu_cxx { +#ifdef __APPLE__ +namespace __gnu_cxx +#else +namespace std +#endif +{ template<> struct hash { size_t operator()(const VertexLoaderUID& uid) const { return uid.GetHash(); @@ -54,10 +62,15 @@ namespace __gnu_cxx { } #endif +#if defined _MSC_VER || defined __APPLE__ +typedef hash_map VertexLoaderMap; +#else +typedef unordered_map VertexLoaderMap; +#endif + namespace VertexLoaderManager { -typedef hash_map VertexLoaderMap; static VertexLoaderMap g_VertexLoaderMap; // TODO - change into array of pointers. Keep a map of all seen so far. diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 86dd891386..520fc21090 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -9,6 +9,7 @@ #include "NativeVertexFormat.h" #include "TextureCacheBase.h" #include "RenderBase.h" +#include "BPStructs.h" #include "VertexManagerBase.h" #include "VideoConfig.h" @@ -159,6 +160,9 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { + // loading a state will invalidate BP, so check for it + g_video_backend->CheckInvalidState(); + g_vertex_manager->vFlush(); } @@ -198,7 +202,7 @@ void VertexManager::Flush() } PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, - bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alphaFunc.hex>>16)&0xff); + bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff); #endif u32 usedtextures = 0; diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.h b/Source/Core/VideoCommon/Src/VertexManagerBase.h index bc30fa3fba..f3a4aa72e3 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.h +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.h @@ -21,7 +21,7 @@ public: // values from DX11 backend MAXVBUFFERSIZE = 0x50000, - MAXIBUFFERSIZE = 0x10000, + MAXIBUFFERSIZE = 0xFFFF, }; VertexManager(); @@ -46,7 +46,8 @@ public: static u8* GetVertexBuffer() { return LocalVBuffer; } static void DoState(PointerWrap& p); - + virtual void CreateDeviceObjects(){}; + virtual void DestroyDeviceObjects(){}; protected: // TODO: make private after Flush() is merged static void ResetBuffer(); diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 07ace04b97..cad117c2c8 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -465,6 +465,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) //write the true depth value, if the game uses depth textures pixel shaders will override with the correct values //if not early z culling will improve speed + // TODO: Can probably be dropped? if (is_d3d) { WRITE(p, "o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n"); diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 6ad877318f..1dce567b0d 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -169,14 +169,24 @@ void VertexShaderManager::Shutdown() void VertexShaderManager::Dirty() { - nTransformMatricesChanged[0] = 0; nTransformMatricesChanged[1] = 256; - nNormalMatricesChanged[0] = 0; nNormalMatricesChanged[1] = 96; - nPostTransformMatricesChanged[0] = 0; nPostTransformMatricesChanged[1] = 256; - nLightsChanged[0] = 0; nLightsChanged[1] = 0x80; + nTransformMatricesChanged[0] = 0; + nTransformMatricesChanged[1] = 256; + + nNormalMatricesChanged[0] = 0; + nNormalMatricesChanged[1] = 96; + + nPostTransformMatricesChanged[0] = 0; + nPostTransformMatricesChanged[1] = 256; + + nLightsChanged[0] = 0; + nLightsChanged[1] = 0x80; + bPosNormalMatrixChanged = true; - bTexMatricesChanged[0] = bTexMatricesChanged[1] = true; + bTexMatricesChanged[0] = true; + bTexMatricesChanged[1] = true; + bProjectionChanged = true; - bPosNormalMatrixChanged = bTexMatricesChanged[0] = bTexMatricesChanged[1] = true; + nMaterialsChanged = 15; } @@ -207,6 +217,7 @@ void VertexShaderManager::SetConstants() int endn = (nPostTransformMatricesChanged[1] + 3 ) / 4; const float* pstart = (const float*)&xfmem[XFMEM_POSTMATRICES + startn * 4]; SetMultiVSConstant4fv(C_POSTTRANSFORMMATRICES + startn, endn - startn, pstart); + nPostTransformMatricesChanged[0] = nPostTransformMatricesChanged[1] = -1; } if (nLightsChanged[0] >= 0) @@ -250,7 +261,7 @@ void VertexShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 2; ++i) { if (nMaterialsChanged & (1 << i)) { @@ -264,6 +275,21 @@ void VertexShaderManager::SetConstants() SetVSConstant4fv(C_MATERIALS + i, material); } } + + for (int i = 0; i < 2; ++i) + { + if (nMaterialsChanged & (1 << (i + 2))) + { + u32 data = *(xfregs.matColor + i); + + material[0] = ((data >> 24) & 0xFF) * NormalizationCoef; + material[1] = ((data >> 16) & 0xFF) * NormalizationCoef; + material[2] = ((data >> 8) & 0xFF) * NormalizationCoef; + material[3] = ( data & 0xFF) * NormalizationCoef; + + SetVSConstant4fv(C_MATERIALS + i + 2, material); + } + } nMaterialsChanged = 0; } @@ -324,26 +350,28 @@ void VertexShaderManager::SetConstants() if (bProjectionChanged) { bProjectionChanged = false; + + float *rawProjection = xfregs.projection.rawProjection; - if (xfregs.rawProjection[6] == 0) + switch(xfregs.projection.type) { - // Perspective + case GX_PERSPECTIVE: - g_fProjectionMatrix[0] = xfregs.rawProjection[0] * g_ActiveConfig.fAspectRatioHackW; + g_fProjectionMatrix[0] = rawProjection[0] * g_ActiveConfig.fAspectRatioHackW; g_fProjectionMatrix[1] = 0.0f; - g_fProjectionMatrix[2] = xfregs.rawProjection[1]; + g_fProjectionMatrix[2] = rawProjection[1]; g_fProjectionMatrix[3] = 0.0f; g_fProjectionMatrix[4] = 0.0f; - g_fProjectionMatrix[5] = xfregs.rawProjection[2] * g_ActiveConfig.fAspectRatioHackH; - g_fProjectionMatrix[6] = xfregs.rawProjection[3]; + g_fProjectionMatrix[5] = rawProjection[2] * g_ActiveConfig.fAspectRatioHackH; + g_fProjectionMatrix[6] = rawProjection[3]; g_fProjectionMatrix[7] = 0.0f; g_fProjectionMatrix[8] = 0.0f; g_fProjectionMatrix[9] = 0.0f; - g_fProjectionMatrix[10] = xfregs.rawProjection[4]; + g_fProjectionMatrix[10] = rawProjection[4]; - g_fProjectionMatrix[11] = xfregs.rawProjection[5]; + g_fProjectionMatrix[11] = rawProjection[5]; g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; @@ -368,24 +396,24 @@ void VertexShaderManager::SetConstants() SETSTAT_FT(stats.gproj_13, g_fProjectionMatrix[13]); SETSTAT_FT(stats.gproj_14, g_fProjectionMatrix[14]); SETSTAT_FT(stats.gproj_15, g_fProjectionMatrix[15]); - } - else - { - // Orthographic Projection - g_fProjectionMatrix[0] = xfregs.rawProjection[0]; + break; + + case GX_ORTHOGRAPHIC: + + g_fProjectionMatrix[0] = rawProjection[0]; g_fProjectionMatrix[1] = 0.0f; g_fProjectionMatrix[2] = 0.0f; - g_fProjectionMatrix[3] = xfregs.rawProjection[1]; + g_fProjectionMatrix[3] = rawProjection[1]; g_fProjectionMatrix[4] = 0.0f; - g_fProjectionMatrix[5] = xfregs.rawProjection[2]; + g_fProjectionMatrix[5] = rawProjection[2]; g_fProjectionMatrix[6] = 0.0f; - g_fProjectionMatrix[7] = xfregs.rawProjection[3]; + g_fProjectionMatrix[7] = rawProjection[3]; g_fProjectionMatrix[8] = 0.0f; g_fProjectionMatrix[9] = 0.0f; - g_fProjectionMatrix[10] = (g_ProjHack1.value + xfregs.rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign); - g_fProjectionMatrix[11] = (g_ProjHack2.value + xfregs.rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign); + g_fProjectionMatrix[10] = (g_ProjHack1.value + rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign); + g_fProjectionMatrix[11] = (g_ProjHack2.value + rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign); g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; @@ -398,7 +426,7 @@ void VertexShaderManager::SetConstants() */ g_fProjectionMatrix[14] = 0.0f; - g_fProjectionMatrix[15] = (g_ProjHack3 && xfregs.rawProjection[0] == 2.0f ? 0.0f : 1.0f); //causes either the efb copy or bloom layer not to show if proj hack enabled + g_fProjectionMatrix[15] = (g_ProjHack3 && rawProjection[0] == 2.0f ? 0.0f : 1.0f); //causes either the efb copy or bloom layer not to show if proj hack enabled SETSTAT_FT(stats.g2proj_0, g_fProjectionMatrix[0]); SETSTAT_FT(stats.g2proj_1, g_fProjectionMatrix[1]); @@ -416,18 +444,21 @@ void VertexShaderManager::SetConstants() SETSTAT_FT(stats.g2proj_13, g_fProjectionMatrix[13]); SETSTAT_FT(stats.g2proj_14, g_fProjectionMatrix[14]); SETSTAT_FT(stats.g2proj_15, g_fProjectionMatrix[15]); - SETSTAT_FT(stats.proj_0, xfregs.rawProjection[0]); - SETSTAT_FT(stats.proj_1, xfregs.rawProjection[1]); - SETSTAT_FT(stats.proj_2, xfregs.rawProjection[2]); - SETSTAT_FT(stats.proj_3, xfregs.rawProjection[3]); - SETSTAT_FT(stats.proj_4, xfregs.rawProjection[4]); - SETSTAT_FT(stats.proj_5, xfregs.rawProjection[5]); - SETSTAT_FT(stats.proj_6, xfregs.rawProjection[6]); + SETSTAT_FT(stats.proj_0, rawProjection[0]); + SETSTAT_FT(stats.proj_1, rawProjection[1]); + SETSTAT_FT(stats.proj_2, rawProjection[2]); + SETSTAT_FT(stats.proj_3, rawProjection[3]); + SETSTAT_FT(stats.proj_4, rawProjection[4]); + SETSTAT_FT(stats.proj_5, rawProjection[5]); + break; + + default: + ERROR_LOG(VIDEO, "unknown projection type: %d", xfregs.projection.type); } - PRIM_LOG("Projection: %f %f %f %f %f %f\n", xfregs.rawProjection[0], xfregs.rawProjection[1], xfregs.rawProjection[2], xfregs.rawProjection[3], xfregs.rawProjection[4], xfregs.rawProjection[5]); + PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]); - if ((g_ActiveConfig.bFreeLook || g_ActiveConfig.bAnaglyphStereo ) && xfregs.rawProjection[6] == 0) + if ((g_ActiveConfig.bFreeLook || g_ActiveConfig.bAnaglyphStereo ) && xfregs.projection.type == GX_PERSPECTIVE) { Matrix44 mtxA; Matrix44 mtxB; diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index f067fb9d6b..1eeed20b82 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -44,17 +44,14 @@ enum EFB_HEIGHT = 528, }; -enum -{ - // XFB width is decided by EFB copy operation. The VI can do horizontal - // scaling (TODO: emulate). - MAX_XFB_WIDTH = EFB_WIDTH, +// XFB width is decided by EFB copy operation. The VI can do horizontal +// scaling (TODO: emulate). +const u32 MAX_XFB_WIDTH = EFB_WIDTH; - // Although EFB height is 528, 574-line XFB's can be created either with - // vertical scaling by the EFB copy operation or copying to multiple XFB's - // that are next to each other in memory (TODO: handle that situation). - MAX_XFB_HEIGHT = 574 -}; +// Although EFB height is 528, 574-line XFB's can be created either with +// vertical scaling by the EFB copy operation or copying to multiple XFB's +// that are next to each other in memory (TODO: handle that situation). +const u32 MAX_XFB_HEIGHT = 574; // Logging // ---------- diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 5f464c3322..74484efb01 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -42,6 +42,7 @@ VideoConfig::VideoConfig() // disable all features by default backend_info.APIType = API_NONE; backend_info.bUseRGBATextures = false; + backend_info.bUseMinimalMipCount = false; backend_info.bSupports3DVision = false; } @@ -59,6 +60,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "UseRealXFB", &bUseRealXFB, 0); iniFile.Get("Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples,128); iniFile.Get("Settings", "ShowFPS", &bShowFPS, false); // Settings + iniFile.Get("Settings", "LogFPSToFile", &bLogFPSToFile, false); iniFile.Get("Settings", "ShowInputDisplay", &bShowInputDisplay, false); iniFile.Get("Settings", "OverlayStats", &bOverlayStats, false); iniFile.Get("Settings", "OverlayProjStats", &bOverlayProjStats, false); @@ -74,7 +76,6 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation, 200); iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0); iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0); - iniFile.Get("Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth, 0); iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0); iniFile.Get("Settings", "EFBScale", &iEFBScale, 2); // native @@ -134,7 +135,6 @@ void VideoConfig::GameIniLoad(const char *ini_file) iniFile.GetIfExists("Video_Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation); iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle); iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting); - iniFile.GetIfExists("Video_Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth); iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode); iniFile.GetIfExists("Video_Settings", "EFBScale", &iEFBScale); // integral iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass); @@ -189,6 +189,7 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "UseRealXFB", bUseRealXFB); iniFile.Set("Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); iniFile.Set("Settings", "ShowFPS", bShowFPS); + iniFile.Set("Settings", "LogFPSToFile", bLogFPSToFile); iniFile.Set("Settings", "ShowInputDisplay", bShowInputDisplay); iniFile.Set("Settings", "OverlayStats", bOverlayStats); iniFile.Set("Settings", "OverlayProjStats", bOverlayProjStats); @@ -204,7 +205,6 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); iniFile.Set("Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); iniFile.Set("Settings", "EnablePixelLighting", bEnablePixelLighting); - iniFile.Set("Settings", "EnablePerPixelDepth", bEnablePerPixelDepth); iniFile.Set("Settings", "ShowEFBCopyRegions", bShowEFBCopyRegions); @@ -271,7 +271,6 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) SET_IF_DIFFERS("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting); - SET_IF_DIFFERS("Video_Settings", "EnablePerPixelDepth", bEnablePerPixelDepth); SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode); SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass); @@ -295,125 +294,3 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) iniFile.Save(game_ini); } - - -// TODO: remove -extern bool g_aspect_wide; - -// TODO: Figure out a better place for this function. -void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc) -{ - float FloatGLWidth = (float)backbuffer_width; - float FloatGLHeight = (float)backbuffer_height; - float FloatXOffset = 0; - float FloatYOffset = 0; - - // The rendering window size - const float WinWidth = FloatGLWidth; - const float WinHeight = FloatGLHeight; - - // Handle aspect ratio. - // Default to auto. - bool use16_9 = g_aspect_wide; - - // Update aspect ratio hack values - // Won't take effect until next frame - // Don't know if there is a better place for this code so there isn't a 1 frame delay - if ( g_ActiveConfig.bWidescreenHack ) - { - float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f); - float target_aspect; - - switch ( g_ActiveConfig.iAspectRatio ) - { - case ASPECT_FORCE_16_9 : - target_aspect = 16.0f / 9.0f; - break; - case ASPECT_FORCE_4_3 : - target_aspect = 4.0f / 3.0f; - break; - case ASPECT_STRETCH : - target_aspect = WinWidth / WinHeight; - break; - default : - // ASPECT_AUTO == no hacking - target_aspect = source_aspect; - break; - } - - float adjust = source_aspect / target_aspect; - if ( adjust > 1 ) - { - // Vert+ - g_Config.fAspectRatioHackW = 1; - g_Config.fAspectRatioHackH = 1/adjust; - } - else - { - // Hor+ - g_Config.fAspectRatioHackW = adjust; - g_Config.fAspectRatioHackH = 1; - } - } - else - { - // Hack is disabled - g_Config.fAspectRatioHackW = 1; - g_Config.fAspectRatioHackH = 1; - } - - // Check for force-settings and override. - if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9) - use16_9 = true; - else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3) - use16_9 = false; - - if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH) - { - // The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio - float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f)); - // Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width. - if (Ratio > 1.0f) - { - // Scale down and center in the X direction. - FloatGLWidth /= Ratio; - FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f; - } - // The window is too high, we have to limit the height - else - { - // Scale down and center in the Y direction. - FloatGLHeight *= Ratio; - FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f; - } - } - - // ----------------------------------------------------------------------- - // Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10. - // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset - // ------------------ - if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop) - { - float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f))); - // The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted) - float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth; - float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight; - // The new width and height - FloatGLWidth = FloatGLWidth * Ratio; - FloatGLHeight = FloatGLHeight * Ratio; - // Adjust the X and Y offset - FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f); - FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f); - } - - int XOffset = (int)(FloatXOffset + 0.5f); - int YOffset = (int)(FloatYOffset + 0.5f); - int iWhidth = (int)ceil(FloatGLWidth); - int iHeight = (int)ceil(FloatGLHeight); - iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders - iHeight -= iHeight % 4; - rc->left = XOffset; - rc->top = flip ? (int)(YOffset + iHeight) : YOffset; - rc->right = XOffset + iWhidth; - rc->bottom = flip ? YOffset : (int)(YOffset + iHeight); -} diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 8593de4fd7..29ad6ec721 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -97,6 +97,7 @@ struct VideoConfig bool bTexFmtOverlayEnable; bool bTexFmtOverlayCenter; bool bShowEFBCopyRegions; + bool bLogFPSToFile; // Render bool bWireFrame; @@ -132,7 +133,6 @@ struct VideoConfig bool bZTPSpeedHack; // The Legend of Zelda: Twilight Princess bool bUseBBox; bool bEnablePixelLighting; - bool bEnablePerPixelDepth; bool bDisablePixelPerf; int iLog; // CONF_ bits @@ -158,12 +158,19 @@ struct VideoConfig std::vector PPShaders; // post-processing shaders bool bUseRGBATextures; // used for D3D11 in TextureCache + bool bUseMinimalMipCount; bool bSupports3DVision; bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL bool bSupportsFormatReinterpretation; bool bSupportsPixelLighting; bool bSupportsPixelPerfQuery; } backend_info; + + // Utility + bool RealXFBEnabled() const { return bUseXFB && bUseRealXFB; } + bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; } + bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; } + bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; } }; extern VideoConfig g_Config; @@ -172,6 +179,4 @@ extern VideoConfig g_ActiveConfig; // Called every frame. void UpdateActiveConfig(); -void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc); - #endif // _VIDEO_CONFIG_H_ diff --git a/Source/Core/VideoCommon/Src/XFMemory.h b/Source/Core/VideoCommon/Src/XFMemory.h index ee3c3b0fdc..fc199b8c32 100644 --- a/Source/Core/VideoCommon/Src/XFMemory.h +++ b/Source/Core/VideoCommon/Src/XFMemory.h @@ -61,6 +61,9 @@ #define LIGHTATTN_NONE 2 #define LIGHTATTN_DIR 3 +#define GX_PERSPECTIVE 0 +#define GX_ORTHOGRAPHIC 1 + #define XFMEM_SIZE 0x8000 #define XFMEM_POSMATRICES 0x000 #define XFMEM_POSMATRICES_END 0x100 @@ -235,6 +238,12 @@ struct Viewport float farZ; }; +struct Projection +{ + float rawProjection[6]; + u32 type; // only GX_PERSPECTIVE or GX_ORTHOGRAPHIC are allowed +}; + struct XFRegisters { u32 error; // 0x1000 @@ -257,10 +266,10 @@ struct XFRegisters u32 unk5; // 0x1015 u32 unk6; // 0x1016 u32 unk7; // 0x1017 - u32 MatrixIndexA; // 0x1018 - u32 MatrixIndexB; // 0x1019 + u32 MatrixIndexA; // 0x1018 + u32 MatrixIndexB; // 0x1019 Viewport viewport; // 0x101a - 0x101f - float rawProjection[7]; // 0x1020 - 0x1026 + Projection projection; // 0x1020 - 0x1026 u32 unk8[24]; // 0x1027 - 0x103e NumTexGen numTexGen; // 0x103f TexMtxInfo texMtxInfo[8]; // 0x1040 - 0x1047 diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp index f8330604ad..9f395bfecf 100644 --- a/Source/Core/VideoCommon/Src/XFStructs.cpp +++ b/Source/Core/VideoCommon/Src/XFStructs.cpp @@ -121,18 +121,12 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETVIEWPORT+3: case XFMEM_SETVIEWPORT+4: case XFMEM_SETVIEWPORT+5: - { - u8 size = std::min(transferSize * 4, 6 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - VertexShaderManager::SetViewportChanged(); - PixelShaderManager::SetViewportChanged(); - } + VertexManager::Flush(); + VertexShaderManager::SetViewportChanged(); + PixelShaderManager::SetViewportChanged(); - nextAddress = XFMEM_SETVIEWPORT + 6; - break; - } + nextAddress = XFMEM_SETVIEWPORT + 6; + break; case XFMEM_SETPROJECTION: case XFMEM_SETPROJECTION+1: @@ -141,21 +135,15 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETPROJECTION+4: case XFMEM_SETPROJECTION+5: case XFMEM_SETPROJECTION+6: - { - u8 size = std::min(transferSize * 4, 7 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - VertexShaderManager::SetProjectionChanged(); - } + VertexManager::Flush(); + VertexShaderManager::SetProjectionChanged(); - nextAddress = XFMEM_SETPROJECTION + 7; - break; - } + nextAddress = XFMEM_SETPROJECTION + 7; + break; case XFMEM_SETNUMTEXGENS: // GXSetNumTexGens if (xfregs.numTexGen.numTexGens != (newValue & 15)) - VertexManager::Flush(); + VertexManager::Flush(); break; case XFMEM_SETTEXMTXINFO: @@ -166,16 +154,10 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETTEXMTXINFO+5: case XFMEM_SETTEXMTXINFO+6: case XFMEM_SETTEXMTXINFO+7: - { - u8 size = std::min(transferSize * 4, 8 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - } + VertexManager::Flush(); - nextAddress = XFMEM_SETTEXMTXINFO + 8; - break; - } + nextAddress = XFMEM_SETTEXMTXINFO + 8; + break; case XFMEM_SETPOSMTXINFO: case XFMEM_SETPOSMTXINFO+1: @@ -185,16 +167,10 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETPOSMTXINFO+5: case XFMEM_SETPOSMTXINFO+6: case XFMEM_SETPOSMTXINFO+7: - { - u8 size = std::min(transferSize * 4, 8 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - } + VertexManager::Flush(); - nextAddress = XFMEM_SETPOSMTXINFO + 8; - break; - } + nextAddress = XFMEM_SETPOSMTXINFO + 8; + break; // -------------- // Unknown Regs @@ -264,15 +240,8 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData) transferSize = 0; } - for (u32 i = 0; i < xfMemTransferSize; ++i) - { - if (((u32*)&xfmem[xfMemBase])[i] != pData[i]) - { - XFMemWritten(xfMemTransferSize, xfMemBase); - memcpy_gc(&xfmem[xfMemBase], pData, xfMemTransferSize * 4); - break; - } - } + XFMemWritten(xfMemTransferSize, xfMemBase); + memcpy_gc(&xfmem[xfMemBase], pData, xfMemTransferSize * 4); pData += xfMemTransferSize; } diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp similarity index 98% rename from Source/Core/VideoCommon/Src/DLCache.cpp rename to Source/Core/VideoCommon/Src/x64DLCache.cpp index 5499fa26f1..559593a08c 100644 --- a/Source/Core/VideoCommon/Src/DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -35,7 +35,7 @@ #include "VertexLoaderManager.h" #include "VertexManagerBase.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "DLCache.h" #include "VideoConfig.h" @@ -361,9 +361,9 @@ u32 AnalyzeAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices); num_draw_call++; - const int tc[12] = { + const u32 tc[12] = { g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; for(int i = 0; i < 12; i++) { @@ -563,9 +563,9 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) dl->InsertRegion(NewRegion); memcpy(NewRegion->start_address, StartAddress, Vdatasize); emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices, cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewRegion->start_address); - const int tc[12] = { + const u32 tc[12] = { g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; for(int i = 0; i < 12; i++) { diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp similarity index 97% rename from Source/Core/VideoCommon/Src/TextureDecoder.cpp rename to Source/Core/VideoCommon/Src/x64TextureDecoder.cpp index 180c901730..6c474920cd 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp @@ -692,7 +692,7 @@ inline void SetOpenMPThreadCount(int width, int height) if (g_ActiveConfig.bOMPDecoder && width > 127 && height > 127) { // don't span to many threads they will kill the rest of the emu :) - omp_set_num_threads((cpu_info.num_cores + 2) / 3); + omp_set_num_threads((omp_get_num_procs() + 2) / 3); } else { @@ -1119,20 +1119,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 ); } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 8) - for (int x = 0; x < width; x += 8) - for (int iy = 0; iy < 8; iy++, src += 4) - for (int ix = 0; ix < 4; ix++) - { - int val = src[ix]; - u8 i1 = Convert4To8(val >> 4); - u8 i2 = Convert4To8(val & 0xF); - memset(dst+(y + iy) * width + x + ix * 2 , i1,4); - memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4); - } -#endif } break; case GX_TF_I8: // speed critical @@ -1248,26 +1234,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } -#if 0 - // Reference C implementation - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 8) - for (int iy = 0; iy < 4; ++iy, src += 8) - { - u32 * newdst = dst + (y + iy)*width+x; - const u8 * newsrc = src; - u8 srcval; - - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - } -#endif } break; case GX_TF_C8: @@ -1380,20 +1346,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 ); } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - { - u32 *ptr = dst + (y + iy) * width + x; - u16 *s = (u16 *)src; - ptr[0] = decodeIA8Swapped(s[0]); - ptr[1] = decodeIA8Swapped(s[1]); - ptr[2] = decodeIA8Swapped(s[2]); - ptr[3] = decodeIA8Swapped(s[3]); - } -#endif } break; case GX_TF_C14X2: @@ -1493,18 +1445,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he __m128i *ptr = (__m128i *)(dst + (y + iy) * width + x); _mm_storeu_si128(ptr, abgr888x4); } -#if 0 - // Reference C implementation. - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - { - u32 *ptr = dst + (y + iy) * width + x; - u16 *s = (u16 *)src; - for(int j = 0; j < 4; j++) - *ptr++ = decode565RGBA(Common::swap16(*s++)); - } -#endif } break; case GX_TF_RGB5A3: @@ -1718,13 +1658,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src); -#endif } break; case GX_TF_RGBA8: // speed critical @@ -1860,16 +1793,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128(dst128, rgba11); } } -#if 0 - // Reference C implementation. - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - { - for (int iy = 0; iy < 4; iy++) - decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16); - src += 64; - } -#endif } break; case GX_TF_CMPR: // speed critical @@ -2104,22 +2027,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } } -#if 0 - for (int y = 0; y < height; y += 8) - { - for (int x = 0; x < width; x += 8) - { - decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - } - } -#endif break; } } @@ -2515,6 +2422,40 @@ void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth } } +void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth) +{ + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; // TODO: Looks wrong. Shouldn't this be ((imageWidth-1)>>2)+1 ? + u32 base_ar = (tBlk * widthBlks + sBlk) << 4; + u32 base_gb = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blk_off = (blkT << 2) + blkS; + + u32 offset_ar = (base_ar + blk_off) << 1; + u32 offset_gb = (base_gb + blk_off) << 1; + const u8* val_addr_ar = src_ar + offset_ar; + const u8* val_addr_gb = src_gb + offset_gb; + + dst[3] = val_addr_ar[0]; // A + dst[0] = val_addr_ar[1]; // R + dst[1] = val_addr_gb[0]; // G + dst[2] = val_addr_gb[1]; // B +} + +PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height) +{ + // TODO for someone who cares: Make this less slow! + for (int y = 0; y < height; ++y) + for (int x = 0; x < width; ++x) + { + TexDecoder_DecodeTexelRGBA8FromTmem(dst, src_ar, src_gb, x, y, width-1); + dst += 4; + } + + return PC_TEX_FMT_RGBA32; +} const char* texfmt[] = { // pixel diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index e458a8d87c..f785cb5c84 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -111,6 +111,7 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + false true @@ -129,7 +130,7 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - true + false true @@ -141,6 +142,7 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + false true @@ -180,9 +182,9 @@ - + @@ -202,7 +204,6 @@ - @@ -214,6 +215,8 @@ + + @@ -229,6 +232,7 @@ + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index 0a61595c45..86b2e03221 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -5,9 +5,6 @@ - - Vertex Loading - Vertex Loading @@ -92,9 +89,6 @@ Decoding - - Decoding - Base @@ -121,6 +115,14 @@ Base + + Util + + + Decoding + + + Vertex Loading @@ -251,6 +253,8 @@ Base + + Util @@ -285,4 +289,4 @@ {e2a527a2-ccc8-4ab8-a93e-dd2628c0f3b6} - \ No newline at end of file + diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index 041f6c95bb..a65ba2e894 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -108,6 +108,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\SoundTouch\SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -382,6 +384,18 @@ Global {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.Build.0 = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.Build.0 = Debug|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.ActiveCfg = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.Build.0 = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.ActiveCfg = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.Build.0 = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.Build.0 = Release|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Plugins/CMakeLists.txt b/Source/Plugins/CMakeLists.txt index 0a0412377a..7dfdbaca83 100644 --- a/Source/Plugins/CMakeLists.txt +++ b/Source/Plugins/CMakeLists.txt @@ -1,3 +1,5 @@ -add_subdirectory(Plugin_VideoOGL) +if(NOT USE_GLES) + add_subdirectory(Plugin_VideoOGL) +endif() add_subdirectory(Plugin_VideoSoftware) # TODO: Add other backends here! diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp index 0389085fae..cb94884eb7 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp @@ -181,15 +181,12 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) { - const float scaleX = Renderer::GetXFBScaleX(); - const float scaleY = Renderer::GetXFBScaleY(); - TargetRectangle targetSource; - targetSource.top = (int)(sourceRc.top *scaleY); - targetSource.bottom = (int)(sourceRc.bottom *scaleY); - targetSource.left = (int)(sourceRc.left *scaleX); - targetSource.right = (int)(sourceRc.right * scaleX); + targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight()); + targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight()); + targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth()); + targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth()); *width = targetSource.right - targetSource.left; *height = targetSource.bottom - targetSource.top; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 3f88d7f99d..882d20f8e6 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include -#include #include "Timer.h" @@ -44,6 +43,9 @@ #include "Host.h" #include "BPFunctions.h" #include "AVIDump.h" +#include "FPSCounter.h" +#include "ConfigManager.h" +#include namespace DX11 { @@ -52,8 +54,6 @@ static int s_fps = 0; static u32 s_LastAA = 0; -static u32 s_blendMode; - static Television s_television; ID3D11Buffer* access_efb_cbuf = NULL; @@ -87,151 +87,6 @@ struct D3D11_RASTERIZER_DESC rastdc; } gx_state; -// State translation lookup tables -static const D3D11_BLEND d3dSrcFactors[8] = -{ - D3D11_BLEND_ZERO, - D3D11_BLEND_ONE, - D3D11_BLEND_DEST_COLOR, - D3D11_BLEND_INV_DEST_COLOR, - D3D11_BLEND_SRC_ALPHA, - D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! - D3D11_BLEND_DEST_ALPHA, - D3D11_BLEND_INV_DEST_ALPHA -}; - -static const D3D11_BLEND d3dDestFactors[8] = -{ - D3D11_BLEND_ZERO, - D3D11_BLEND_ONE, - D3D11_BLEND_SRC_COLOR, - D3D11_BLEND_INV_SRC_COLOR, - D3D11_BLEND_SRC_ALPHA, - D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! - D3D11_BLEND_DEST_ALPHA, - D3D11_BLEND_INV_DEST_ALPHA -}; - -// 0 0x00 -// 1 Source & destination -// 2 Source & ~destination -// 3 Source -// 4 ~Source & destination -// 5 Destination -// 6 Source ^ destination = Source & ~destination | ~Source & destination -// 7 Source | destination - -// 8 ~(Source | destination) -// 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination -// 10 ~Destination -// 11 Source | ~destination -// 12 ~Source -// 13 ~Source | destination -// 14 ~(Source & destination) -// 15 0xff - -static const D3D11_BLEND_OP d3dLogicOps[16] = -{ - D3D11_BLEND_OP_ADD,//0 - D3D11_BLEND_OP_ADD,//1 - D3D11_BLEND_OP_SUBTRACT,//2 - D3D11_BLEND_OP_ADD,//3 - D3D11_BLEND_OP_REV_SUBTRACT,//4 - D3D11_BLEND_OP_ADD,//5 - D3D11_BLEND_OP_MAX,//6 - D3D11_BLEND_OP_ADD,//7 - - D3D11_BLEND_OP_MAX,//8 - D3D11_BLEND_OP_MAX,//9 - D3D11_BLEND_OP_ADD,//10 - D3D11_BLEND_OP_ADD,//11 - D3D11_BLEND_OP_ADD,//12 - D3D11_BLEND_OP_ADD,//13 - D3D11_BLEND_OP_ADD,//14 - D3D11_BLEND_OP_ADD//15 -}; - -static const D3D11_BLEND d3dLogicOpSrcFactors[16] = -{ - D3D11_BLEND_ZERO,//0 - D3D11_BLEND_DEST_COLOR,//1 - D3D11_BLEND_ONE,//2 - D3D11_BLEND_ONE,//3 - D3D11_BLEND_DEST_COLOR,//4 - D3D11_BLEND_ZERO,//5 - D3D11_BLEND_INV_DEST_COLOR,//6 - D3D11_BLEND_INV_DEST_COLOR,//7 - - D3D11_BLEND_INV_SRC_COLOR,//8 - D3D11_BLEND_INV_SRC_COLOR,//9 - D3D11_BLEND_INV_DEST_COLOR,//10 - D3D11_BLEND_ONE,//11 - D3D11_BLEND_INV_SRC_COLOR,//12 - D3D11_BLEND_INV_SRC_COLOR,//13 - D3D11_BLEND_INV_DEST_COLOR,//14 - D3D11_BLEND_ONE//15 -}; - -static const D3D11_BLEND d3dLogicOpDestFactors[16] = -{ - D3D11_BLEND_ZERO,//0 - D3D11_BLEND_ZERO,//1 - D3D11_BLEND_INV_SRC_COLOR,//2 - D3D11_BLEND_ZERO,//3 - D3D11_BLEND_ONE,//4 - D3D11_BLEND_ONE,//5 - D3D11_BLEND_INV_SRC_COLOR,//6 - D3D11_BLEND_ONE,//7 - - D3D11_BLEND_INV_DEST_COLOR,//8 - D3D11_BLEND_SRC_COLOR,//9 - D3D11_BLEND_INV_DEST_COLOR,//10 - D3D11_BLEND_INV_DEST_COLOR,//11 - D3D11_BLEND_INV_SRC_COLOR,//12 - D3D11_BLEND_ONE,//13 - D3D11_BLEND_INV_SRC_COLOR,//14 - D3D11_BLEND_ONE//15 -}; - -static const D3D11_CULL_MODE d3dCullModes[4] = -{ - D3D11_CULL_NONE, - D3D11_CULL_BACK, - D3D11_CULL_FRONT, - D3D11_CULL_BACK -}; - -static const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] = -{ - D3D11_COMPARISON_NEVER, - D3D11_COMPARISON_LESS, - D3D11_COMPARISON_EQUAL, - D3D11_COMPARISON_LESS_EQUAL, - D3D11_COMPARISON_GREATER, - D3D11_COMPARISON_NOT_EQUAL, - D3D11_COMPARISON_GREATER_EQUAL, - D3D11_COMPARISON_ALWAYS -}; - -#define TEXF_NONE 0 -#define TEXF_POINT 1 -#define TEXF_LINEAR 2 -static const unsigned int d3dMipFilters[4] = -{ - TEXF_NONE, - TEXF_POINT, - TEXF_LINEAR, - TEXF_NONE, //reserved -}; - -static const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] = -{ - D3D11_TEXTURE_ADDRESS_CLAMP, - D3D11_TEXTURE_ADDRESS_WRAP, - D3D11_TEXTURE_ADDRESS_MIRROR, - D3D11_TEXTURE_ADDRESS_WRAP //reserved -}; - void SetupDeviceObjects() { @@ -358,7 +213,8 @@ void CreateScreenshotTexture() Renderer::Renderer() { int x, y, w_temp, h_temp; - s_blendMode = 0; + + InitFPSCounter(); Host_GetRenderWindowSize(x, y, w_temp, h_temp); @@ -367,17 +223,14 @@ Renderer::Renderer() s_backbuffer_width = D3D::GetBackBufferWidth(); s_backbuffer_height = D3D::GetBackBufferHeight(); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastAA = g_ActiveConfig.iMultisampleMode; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); pixel_perf_query_index = 0; pixel_perf = 0; @@ -497,10 +350,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format UINT8 color_mask = 0; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA; - if (bpmem.blendmode.colorupdate) - color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA; + if (bpmem.blendmode.colorupdate) + color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE; + } gx_state.blenddc.RenderTarget[0].RenderTargetWriteMask = color_mask; } @@ -962,6 +818,32 @@ void SetBlendOp(D3D11_BLEND_OP val) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const D3D11_BLEND d3dSrcFactors[8] = + { + D3D11_BLEND_ZERO, + D3D11_BLEND_ONE, + D3D11_BLEND_DEST_COLOR, + D3D11_BLEND_INV_DEST_COLOR, + D3D11_BLEND_SRC_ALPHA, + D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! + (target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE, + (target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO + }; + const D3D11_BLEND d3dDestFactors[8] = + { + D3D11_BLEND_ZERO, + D3D11_BLEND_ONE, + D3D11_BLEND_SRC_COLOR, + D3D11_BLEND_INV_SRC_COLOR, + D3D11_BLEND_SRC_ALPHA, + D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! + (target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE, + (target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO + }; + if (bpmem.blendmode.logicopenable && !forceUpdate) return; @@ -974,8 +856,8 @@ void Renderer::SetBlendMode(bool forceUpdate) } else { - gx_state.blenddc.RenderTarget[0].BlendEnable = bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0)); - if (bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))) + gx_state.blenddc.RenderTarget[0].BlendEnable = bpmem.blendmode.blendenable; + if (bpmem.blendmode.blendenable) { SetBlendOp(D3D11_BLEND_OP_ADD); SetSrcBlend(d3dSrcFactors[bpmem.blendmode.srcfactor]); @@ -1012,11 +894,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle return SUCCEEDED(hr); } -void formatBufferDump(const char *in, char *out, int w, int h, int p) +void formatBufferDump(const u8* in, u8* out, int w, int h, int p) { for (int y = 0; y < h; ++y) { - const u8 *line = (u8*)(in + (h - y - 1) * p); + auto line = (in + (h - y - 1) * p); for (int x = 0; x < w; ++x) { out[0] = line[2]; @@ -1031,24 +913,22 @@ void formatBufferDump(const char *in, char *out, int w, int h, int p) // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP + if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -1057,18 +937,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons ResetAPIState(); // Prepare to copy the XFBs to our backbuffer - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)s_backbuffer_width, (float)s_backbuffer_height); - D3D::context->RSSetViewports(1, &vp); - float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f }; - D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - int X = dst_rect.left; - int Y = dst_rect.top; - int Width = dst_rect.right - dst_rect.left; - int Height = dst_rect.bottom - dst_rect.top; + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; + // TODO: Redundant checks... if (X < 0) X = 0; if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; @@ -1077,10 +953,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; - vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); + D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); D3D::context->RSSetViewports(1, &vp); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); + float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f }; + D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor); + // activate linear filtering for the buffer copies D3D::SetLinearCopySampler(); @@ -1107,7 +986,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = 1; + drawRc.bottom = -1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -1128,13 +1014,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = 1; - drawRc.bottom = -1; - drawRc.left = -1; - drawRc.right = 1; - } xfbSource->Draw(sourceRc, drawRc, 0, 0); } @@ -1151,7 +1030,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // done with drawing the game stuff, good moment to save a screenshot if (s_bScreenshot) { - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, GetTargetRectangle()); s_bScreenshot = false; } @@ -1168,8 +1047,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); if (!bLastFrameDumped) { - s_recordWidth = dst_rect.GetWidth(); - s_recordHeight = dst_rect.GetHeight(); + s_recordWidth = GetTargetRectangle().GetWidth(); + s_recordHeight = GetTargetRectangle().GetHeight(); bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); if (!bAVIDumping) { @@ -1188,16 +1067,15 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D11_MAPPED_SUBRESOURCE map; D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); - if (!frame_data || w != s_recordWidth || h != s_recordHeight) + if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight) { - delete[] frame_data; - frame_data = new char[3 * s_recordWidth * s_recordHeight]; + frame_data.resize(3 * s_recordWidth * s_recordHeight); w = s_recordWidth; h = s_recordHeight; } - char* source_ptr = (char*)map.pData + dst_rect.left*4 + dst_rect.top*map.RowPitch; - formatBufferDump(source_ptr, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); - AVIDump::AddFrame(frame_data); + auto source_ptr = (const u8*)map.pData + GetTargetRectangle().left*4 + GetTargetRectangle().top*map.RowPitch; + formatBufferDump(source_ptr, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); D3D::context->Unmap(s_screenshot_texture, 0); } bLastFrameDumped = true; @@ -1206,7 +1084,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - SAFE_DELETE_ARRAY(frame_data); + std::vector().swap(frame_data); w = h = 0; AVIDump::Stop(); @@ -1224,11 +1102,18 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps); } + if (SConfig::GetInstance().m_ShowLag) + { + char lag[10]; + StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount); + D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag); + } + if (g_ActiveConfig.bShowInputDisplay) { char inputDisplay[1000]; StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str()); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, inputDisplay); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, inputDisplay); } Renderer::DrawDebugText(); @@ -1236,13 +1121,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { char buf[32768]; Statistics::ToString(buf); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, buf); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf); } else if (g_ActiveConfig.bOverlayProjStats) { char buf[32768]; Statistics::ToStringProj(buf); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, buf); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf); } OSD::DrawMessages(); @@ -1264,28 +1149,18 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(w); + FramebufferManagerBase::SetLastXfbHeight(h); } // update FPS counter - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // Begin new frame // Set default viewport and scissor, for the clear to work correctly @@ -1313,12 +1188,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_backbuffer_height = D3D::GetBackBufferHeight(); } - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); @@ -1468,12 +1341,32 @@ void Renderer::RestoreCull() void Renderer::SetGenerationMode() { + const D3D11_CULL_MODE d3dCullModes[4] = + { + D3D11_CULL_NONE, + D3D11_CULL_BACK, + D3D11_CULL_FRONT, + D3D11_CULL_BACK + }; + // rastdc.FrontCounterClockwise must be false for this to work gx_state.rastdc.CullMode = d3dCullModes[bpmem.genMode.cullmode]; } void Renderer::SetDepthMode() { + const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] = + { + D3D11_COMPARISON_NEVER, + D3D11_COMPARISON_LESS, + D3D11_COMPARISON_EQUAL, + D3D11_COMPARISON_LESS_EQUAL, + D3D11_COMPARISON_GREATER, + D3D11_COMPARISON_NOT_EQUAL, + D3D11_COMPARISON_GREATER_EQUAL, + D3D11_COMPARISON_ALWAYS + }; + if (bpmem.zmode.testenable) { gx_state.depthdc.DepthEnable = TRUE; @@ -1490,9 +1383,85 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + // D3D11 doesn't support logic blending, so this is a huge hack + // TODO: Make use of D3D11.1's logic blending support + + // 0 0x00 + // 1 Source & destination + // 2 Source & ~destination + // 3 Source + // 4 ~Source & destination + // 5 Destination + // 6 Source ^ destination = Source & ~destination | ~Source & destination + // 7 Source | destination + // 8 ~(Source | destination) + // 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination + // 10 ~Destination + // 11 Source | ~destination + // 12 ~Source + // 13 ~Source | destination + // 14 ~(Source & destination) + // 15 0xff + const D3D11_BLEND_OP d3dLogicOps[16] = + { + D3D11_BLEND_OP_ADD,//0 + D3D11_BLEND_OP_ADD,//1 + D3D11_BLEND_OP_SUBTRACT,//2 + D3D11_BLEND_OP_ADD,//3 + D3D11_BLEND_OP_REV_SUBTRACT,//4 + D3D11_BLEND_OP_ADD,//5 + D3D11_BLEND_OP_MAX,//6 + D3D11_BLEND_OP_ADD,//7 + D3D11_BLEND_OP_MAX,//8 + D3D11_BLEND_OP_MAX,//9 + D3D11_BLEND_OP_ADD,//10 + D3D11_BLEND_OP_ADD,//11 + D3D11_BLEND_OP_ADD,//12 + D3D11_BLEND_OP_ADD,//13 + D3D11_BLEND_OP_ADD,//14 + D3D11_BLEND_OP_ADD//15 + }; + const D3D11_BLEND d3dLogicOpSrcFactors[16] = + { + D3D11_BLEND_ZERO,//0 + D3D11_BLEND_DEST_COLOR,//1 + D3D11_BLEND_ONE,//2 + D3D11_BLEND_ONE,//3 + D3D11_BLEND_DEST_COLOR,//4 + D3D11_BLEND_ZERO,//5 + D3D11_BLEND_INV_DEST_COLOR,//6 + D3D11_BLEND_INV_DEST_COLOR,//7 + D3D11_BLEND_INV_SRC_COLOR,//8 + D3D11_BLEND_INV_SRC_COLOR,//9 + D3D11_BLEND_INV_DEST_COLOR,//10 + D3D11_BLEND_ONE,//11 + D3D11_BLEND_INV_SRC_COLOR,//12 + D3D11_BLEND_INV_SRC_COLOR,//13 + D3D11_BLEND_INV_DEST_COLOR,//14 + D3D11_BLEND_ONE//15 + }; + const D3D11_BLEND d3dLogicOpDestFactors[16] = + { + D3D11_BLEND_ZERO,//0 + D3D11_BLEND_ZERO,//1 + D3D11_BLEND_INV_SRC_COLOR,//2 + D3D11_BLEND_ZERO,//3 + D3D11_BLEND_ONE,//4 + D3D11_BLEND_ONE,//5 + D3D11_BLEND_INV_SRC_COLOR,//6 + D3D11_BLEND_ONE,//7 + D3D11_BLEND_INV_DEST_COLOR,//8 + D3D11_BLEND_SRC_COLOR,//9 + D3D11_BLEND_INV_DEST_COLOR,//10 + D3D11_BLEND_INV_DEST_COLOR,//11 + D3D11_BLEND_INV_SRC_COLOR,//12 + D3D11_BLEND_ONE,//13 + D3D11_BLEND_INV_SRC_COLOR,//14 + D3D11_BLEND_ONE//15 + }; + + if (bpmem.blendmode.logicopenable) { - s_blendMode = 0; gx_state.blenddc.RenderTarget[0].BlendEnable = true; SetBlendOp(d3dLogicOps[bpmem.blendmode.logicmode]); SetSrcBlend(d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]); @@ -1516,18 +1485,32 @@ void Renderer::SetLineWidth() void Renderer::SetSamplerState(int stage, int texindex) { +#define TEXF_NONE 0 +#define TEXF_POINT 1 +#define TEXF_LINEAR 2 + const unsigned int d3dMipFilters[4] = + { + TEXF_NONE, + TEXF_POINT, + TEXF_LINEAR, + TEXF_NONE, //reserved + }; + const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] = + { + D3D11_TEXTURE_ADDRESS_CLAMP, + D3D11_TEXTURE_ADDRESS_WRAP, + D3D11_TEXTURE_ADDRESS_MIRROR, + D3D11_TEXTURE_ADDRESS_WRAP //reserved + }; + const FourTexUnits &tex = bpmem.tex[texindex]; const TexMode0 &tm0 = tex.texMode0[stage]; const TexMode1 &tm1 = tex.texMode1[stage]; - unsigned int mip; - mip = (tm0.min_filter == 8) ? TEXF_NONE:d3dMipFilters[tm0.min_filter & 3]; - if ((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) mip = TEXF_NONE; + unsigned int mip = d3dMipFilters[tm0.min_filter & 3]; if (texindex) stage += 4; - // TODO: Clarify whether these values are correct - // NOTE: since there's no "no filter" in DX11 we're using point filters in these cases if (g_ActiveConfig.bForceFiltering) { gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; @@ -1569,7 +1552,7 @@ void Renderer::SetSamplerState(int stage, int texindex) // When mipfilter is set to "none", just disable mipmapping altogether gx_state.sampdc[stage].MaxLOD = (mip == TEXF_NONE) ? 0.0f : (float)tm1.max_lod/16.f; gx_state.sampdc[stage].MinLOD = (float)tm1.min_lod/16.f; - gx_state.sampdc[stage].MipLODBias = (float)tm0.lod_bias/32.0f; + gx_state.sampdc[stage].MipLODBias = (s32)tm0.lod_bias/32.0f; } void Renderer::SetInterlacingMode() diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 5f82a18fc0..c0474e5c67 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -59,12 +59,9 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { D3D::ReplaceRGBATexture2D(texture->GetTex(), TextureCache::temp, width, height, expanded_width, level, usage); - - if (autogen_mips) - PD3DX11FilterTexture(D3D::context, texture->GetTex(), 0, D3DX11_DEFAULT); } TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, @@ -101,6 +98,9 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetSRV(), "shader resource view of a texture of the TextureCache"); SAFE_RELEASE(pTexture); + + if (tex_levels != 1) + entry->Load(width, height, expanded_width, 0); return entry; } diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h index 59d343017c..7876cb79ee 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h @@ -41,7 +41,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int levels, bool autogen_mips = false); + unsigned int expanded_width, unsigned int levels); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index 4bb04bc302..8137e1a39f 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -39,33 +39,41 @@ namespace DX11 { // TODO: Find sensible values for these two -const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE*2 * 16; +const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 16 * sizeof(u16); const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16; +const UINT MAXVBUFFER_COUNT = 2; void VertexManager::CreateDeviceObjects() { D3D11_BUFFER_DESC bufdesc = CD3D11_BUFFER_DESC(IBUFFER_SIZE, D3D11_BIND_INDEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); - CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_indexBuffer)), - "Failed to create index buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)m_indexBuffer, "index buffer of VertexManager"); - - bufdesc.BindFlags = D3D11_BIND_VERTEX_BUFFER; - bufdesc.ByteWidth = VBUFFER_SIZE; - - CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertexBuffer)), - "Failed to create vertex buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertexBuffer, "vertex buffer of VertexManager"); - - m_indexBufferCursor = 0; - m_vertexBufferCursor = 0; m_vertexDrawOffset = 0; - m_triangleDrawIndex = 0; m_lineDrawIndex = 0; m_pointDrawIndex = 0; - + m_indexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; + m_vertexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; + for (m_activeIndexBuffer = 0; m_activeIndexBuffer < MAXVBUFFER_COUNT; m_activeIndexBuffer++) + { + m_indexBuffers[m_activeIndexBuffer] = NULL; + CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_indexBuffers[m_activeIndexBuffer])), + "Failed to create index buffer."); + D3D::SetDebugObjectName((ID3D11DeviceChild*)m_indexBuffers[m_activeIndexBuffer], "index buffer of VertexManager"); + } + bufdesc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + bufdesc.ByteWidth = VBUFFER_SIZE; + for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) + { + m_vertexBuffers[m_activeVertexBuffer] = NULL; + CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertexBuffers[m_activeVertexBuffer])), + "Failed to create vertex buffer."); + D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertexBuffers[m_activeVertexBuffer], "Vertex buffer of VertexManager"); + } + m_activeVertexBuffer = 0; + m_activeIndexBuffer = 0; + m_indexBufferCursor = IBUFFER_SIZE; + m_vertexBufferCursor = VBUFFER_SIZE; m_lineShader.Init(); m_pointShader.Init(); } @@ -74,9 +82,12 @@ void VertexManager::DestroyDeviceObjects() { m_pointShader.Shutdown(); m_lineShader.Shutdown(); - - SAFE_RELEASE(m_vertexBuffer); - SAFE_RELEASE(m_indexBuffer); + for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) + { + SAFE_RELEASE(m_vertexBuffers[m_activeVertexBuffer]); + SAFE_RELEASE(m_indexBuffers[m_activeVertexBuffer]); + } + } VertexManager::VertexManager() @@ -94,42 +105,41 @@ void VertexManager::LoadBuffers() D3D11_MAPPED_SUBRESOURCE map; UINT vSize = UINT(s_pCurBufferPointer - LocalVBuffer); + D3D11_MAP MapType = D3D11_MAP_WRITE_NO_OVERWRITE; if (m_vertexBufferCursor + vSize >= VBUFFER_SIZE) { // Wrap around - D3D::context->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map); + m_activeVertexBuffer = (m_activeVertexBuffer + 1) % MAXVBUFFER_COUNT; m_vertexBufferCursor = 0; + MapType = D3D11_MAP_WRITE_DISCARD; } - else - { - // Append data - D3D::context->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map); - } + + D3D::context->Map(m_vertexBuffers[m_activeVertexBuffer], 0, MapType, 0, &map); + memcpy((u8*)map.pData + m_vertexBufferCursor, LocalVBuffer, vSize); - D3D::context->Unmap(m_vertexBuffer, 0); + D3D::context->Unmap(m_vertexBuffers[m_activeVertexBuffer], 0); m_vertexDrawOffset = m_vertexBufferCursor; m_vertexBufferCursor += vSize; UINT iCount = IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen(); - if (m_indexBufferCursor + iCount >= IBUFFER_SIZE/2) + MapType = D3D11_MAP_WRITE_NO_OVERWRITE; + if (m_indexBufferCursor + iCount >= (IBUFFER_SIZE / sizeof(u16))) { // Wrap around - D3D::context->Map(m_indexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map); + m_activeIndexBuffer = (m_activeIndexBuffer + 1) % MAXVBUFFER_COUNT; m_indexBufferCursor = 0; + MapType = D3D11_MAP_WRITE_DISCARD; } - else - { - // Append data - D3D::context->Map(m_indexBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map); - } + D3D::context->Map(m_indexBuffers[m_activeIndexBuffer], 0, MapType, 0, &map); + m_triangleDrawIndex = m_indexBufferCursor; m_lineDrawIndex = m_triangleDrawIndex + IndexGenerator::GetTriangleindexLen(); m_pointDrawIndex = m_lineDrawIndex + IndexGenerator::GetLineindexLen(); - memcpy((u16*)map.pData + m_triangleDrawIndex, TIBuffer, 2*IndexGenerator::GetTriangleindexLen()); - memcpy((u16*)map.pData + m_lineDrawIndex, LIBuffer, 2*IndexGenerator::GetLineindexLen()); - memcpy((u16*)map.pData + m_pointDrawIndex, PIBuffer, 2*IndexGenerator::GetPointindexLen()); - D3D::context->Unmap(m_indexBuffer, 0); + memcpy((u16*)map.pData + m_triangleDrawIndex, TIBuffer, sizeof(u16) * IndexGenerator::GetTriangleindexLen()); + memcpy((u16*)map.pData + m_lineDrawIndex, LIBuffer, sizeof(u16) * IndexGenerator::GetLineindexLen()); + memcpy((u16*)map.pData + m_pointDrawIndex, PIBuffer, sizeof(u16) * IndexGenerator::GetPointindexLen()); + D3D::context->Unmap(m_indexBuffers[m_activeIndexBuffer], 0); m_indexBufferCursor += iCount; } @@ -139,9 +149,9 @@ static const float LINE_PT_TEX_OFFSETS[8] = { void VertexManager::Draw(UINT stride) { - D3D::context->IASetVertexBuffers(0, 1, &m_vertexBuffer, &stride, &m_vertexDrawOffset); - D3D::context->IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R16_UINT, 0); - + D3D::context->IASetVertexBuffers(0, 1, &m_vertexBuffers[m_activeVertexBuffer], &stride, &m_vertexDrawOffset); + D3D::context->IASetIndexBuffer(m_indexBuffers[m_activeIndexBuffer], DXGI_FORMAT_R16_UINT, 0); + if (IndexGenerator::GetNumTriangles() > 0) { D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -226,8 +236,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) @@ -259,12 +269,11 @@ void VertexManager::vFlush() GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); goto shader_fail; } - + LoadBuffers(); unsigned int stride = g_nativeVertexFmt->GetVertexStride(); g_nativeVertexFmt->SetupVertexPointers(); - g_renderer->ApplyState(useDstAlpha); - LoadBuffers(); + g_renderer->ResumePixelPerf(false); Draw(stride); g_renderer->PausePixelPerf(false); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h index a387be5155..9e6b7f2dca 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h @@ -32,10 +32,11 @@ public: ~VertexManager(); NativeVertexFormat* CreateNativeVertexFormat(); - -private: void CreateDeviceObjects(); void DestroyDeviceObjects(); + +private: + void LoadBuffers(); void Draw(UINT stride); // temp @@ -46,9 +47,12 @@ private: UINT m_vertexDrawOffset; UINT m_triangleDrawIndex; UINT m_lineDrawIndex; - UINT m_pointDrawIndex; - ID3D11Buffer* m_indexBuffer; - ID3D11Buffer* m_vertexBuffer; + UINT m_pointDrawIndex; + UINT m_activeVertexBuffer; + UINT m_activeIndexBuffer; + typedef ID3D11Buffer* PID3D11Buffer; + PID3D11Buffer* m_indexBuffers; + PID3D11Buffer* m_vertexBuffers; LineGeometryShader m_lineShader; PointGeometryShader m_pointShader; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index 161321cf08..f858021e77 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -90,6 +90,7 @@ void InitBackendInfo() g_Config.backend_info.APIType = API_D3D11; g_Config.backend_info.bUseRGBATextures = true; // the GX formats barely match any D3D11 formats + g_Config.backend_info.bUseMinimalMipCount = true; g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bSupportsDualSourceBlend = true; g_Config.backend_info.bSupportsFormatReinterpretation = true; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp index 0a87a1baf5..1903bce989 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp @@ -149,15 +149,12 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) { - const float scaleX = Renderer::GetXFBScaleX(); - const float scaleY = Renderer::GetXFBScaleY(); - TargetRectangle targetSource; - targetSource.top = (int)(sourceRc.top *scaleY); - targetSource.bottom = (int)(sourceRc.bottom *scaleY); - targetSource.left = (int)(sourceRc.left *scaleX); - targetSource.right = (int)(sourceRc.right * scaleX); + targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight()); + targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight()); + targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth()); + targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth()); *width = targetSource.right - targetSource.left; *height = targetSource.bottom - targetSource.top; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp index bfaf21ec7e..d68228273c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp @@ -19,7 +19,7 @@ #include "D3DBase.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "MemoryUtil.h" #include "VertexShaderGen.h" diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index fda9a02d25..151d80b16f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "StringUtil.h" #include "Common.h" @@ -54,6 +53,11 @@ #include "Core.h" #include "Movie.h" #include "BPFunctions.h" +#include "FPSCounter.h" +#include "ConfigManager.h" + +#include + namespace DX9 { @@ -69,148 +73,6 @@ static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; -// State translation lookup tables -static const D3DBLEND d3dSrcFactors[8] = -{ - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_DESTCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_SRCALPHA, - D3DBLEND_INVSRCALPHA, - D3DBLEND_DESTALPHA, - D3DBLEND_INVDESTALPHA -}; - -static const D3DBLEND d3dDestFactors[8] = -{ - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_SRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_SRCALPHA, - D3DBLEND_INVSRCALPHA, - D3DBLEND_DESTALPHA, - D3DBLEND_INVDESTALPHA -}; - -// 0 0x00 -// 1 Source & destination -// 2 Source & ~destination -// 3 Source -// 4 ~Source & destination -// 5 Destination -// 6 Source ^ destination = Source & ~destination | ~Source & destination -// 7 Source | destination - -// 8 ~(Source | destination) -// 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination -// 10 ~Destination -// 11 Source | ~destination -// 12 ~Source -// 13 ~Source | destination -// 14 ~(Source & destination) -// 15 0xff - -static const D3DBLENDOP d3dLogicOpop[16] = -{ - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_SUBTRACT, - D3DBLENDOP_ADD, - D3DBLENDOP_REVSUBTRACT, - D3DBLENDOP_ADD, - D3DBLENDOP_MAX, - D3DBLENDOP_ADD, - - D3DBLENDOP_MAX, - D3DBLENDOP_MAX, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD -}; - -static const D3DBLEND d3dLogicOpSrcFactors[16] = -{ - D3DBLEND_ZERO, - D3DBLEND_DESTCOLOR, - D3DBLEND_ONE, - D3DBLEND_ONE, - D3DBLEND_DESTCOLOR, - D3DBLEND_ZERO, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVDESTCOLOR, - - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_ONE -}; - -static const D3DBLEND d3dLogicOpDestFactors[16] = -{ - D3DBLEND_ZERO, - D3DBLEND_ZERO, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE, - - D3DBLEND_INVDESTCOLOR, - D3DBLEND_SRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE -}; - -static const D3DCULL d3dCullModes[4] = -{ - D3DCULL_NONE, - D3DCULL_CCW, - D3DCULL_CW, - D3DCULL_CCW -}; - -static const D3DCMPFUNC d3dCmpFuncs[8] = -{ - D3DCMP_NEVER, - D3DCMP_LESS, - D3DCMP_EQUAL, - D3DCMP_LESSEQUAL, - D3DCMP_GREATER, - D3DCMP_NOTEQUAL, - D3DCMP_GREATEREQUAL, - D3DCMP_ALWAYS -}; - -static const D3DTEXTUREFILTERTYPE d3dMipFilters[4] = -{ - D3DTEXF_NONE, - D3DTEXF_POINT, - D3DTEXF_LINEAR, - D3DTEXF_NONE, //reserved -}; - -static const D3DTEXTUREADDRESS d3dClamps[4] = -{ - D3DTADDRESS_CLAMP, - D3DTADDRESS_WRAP, - D3DTADDRESS_MIRROR, - D3DTADDRESS_WRAP //reserved -}; - void SetupDeviceObjects() { D3D::font.Init(); @@ -224,6 +86,7 @@ void SetupDeviceObjects() // To avoid shader compilation stutters, read back all shaders from cache. VertexShaderCache::Init(); PixelShaderCache::Init(); + g_vertex_manager->CreateDeviceObjects(); // Texture cache will recreate themselves over time. } @@ -242,11 +105,14 @@ void TeardownDeviceObjects() VertexShaderCache::Shutdown(); PixelShaderCache::Shutdown(); TextureConverter::Shutdown(); + g_vertex_manager->DestroyDeviceObjects(); } // Init functions Renderer::Renderer() { + InitFPSCounter(); + st = new char[32768]; int fullScreenRes, x, y, w_temp, h_temp; @@ -274,19 +140,16 @@ Renderer::Renderer() s_backbuffer_width = D3D::GetBackBufferWidth(); s_backbuffer_height = D3D::GetBackBufferHeight(); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastAA = g_ActiveConfig.iMultisampleMode; int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); @@ -353,11 +216,11 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) } -void formatBufferDump(const char *in, char *out, int w, int h, int p) +void formatBufferDump(const u8* in, u8* out, int w, int h, int p) { for (int y = 0; y < h; y++) { - const char *line = in + (h - y - 1) * p; + auto line = in + (h - y - 1) * p; for (int x = 0; x < w; x++) { memcpy(out, line, 3); @@ -423,10 +286,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format DWORD color_mask = 0; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - color_mask = D3DCOLORWRITEENABLE_ALPHA; - if (bpmem.blendmode.colorupdate) - color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + color_mask = D3DCOLORWRITEENABLE_ALPHA; + if (bpmem.blendmode.colorupdate) + color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; + } D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask); } @@ -701,8 +567,8 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) // If GX viewport is off the render target, we must clamp our viewport // within the bounds. Use the correction matrix to compensate. ViewportCorrectionMatrix(vpCorrection, - intendedX, intendedY, intendedWd, intendedHt, - X, Y, Wd, Ht); + (float)intendedX, (float)intendedY, (float)intendedWd, (float)intendedHt, + (float)X, (float)Y, (float)Wd, (float)Ht); D3DVIEWPORT9 vp; vp.X = X; @@ -788,6 +654,32 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const D3DBLEND d3dSrcFactors[8] = + { + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_DESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_SRCALPHA, + D3DBLEND_INVSRCALPHA, + (target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE, + (target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO + }; + const D3DBLEND d3dDestFactors[8] = + { + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_SRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_SRCALPHA, + D3DBLEND_INVSRCALPHA, + (target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE, + (target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO + }; + if (bpmem.blendmode.logicopenable && !forceUpdate) return; @@ -800,8 +692,8 @@ void Renderer::SetBlendMode(bool forceUpdate) } else { - D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))); - if (bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))) + D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, bpmem.blendmode.blendenable); + if (bpmem.blendmode.blendenable) { D3D::SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD); D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[bpmem.blendmode.srcfactor]); @@ -831,25 +723,22 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -882,8 +771,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->SetDepthStencilSurface(NULL); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); D3DVIEWPORT9 vp; // Clear full target screen (edges, borders etc) @@ -903,10 +791,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } - int X = dst_rect.left; - int Y = dst_rect.top; - int Width = dst_rect.right - dst_rect.left; - int Height = dst_rect.bottom - dst_rect.top; + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // Sanity check if (X < 0) X = 0; @@ -949,7 +837,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (!g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = -1; + drawRc.bottom = 1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -963,20 +858,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // The following code disables auto stretch. Kept for reference. // scale draw area for a 1 to 1 pixel mapping with the draw target - //float vScale = (float)fbHeight / (float)dst_rect.GetHeight(); - //float hScale = (float)fbWidth / (float)dst_rect.GetWidth(); + //float vScale = (float)fbHeight / (float)GetTargetRectangle().GetHeight(); + //float hScale = (float)fbWidth / (float)GetTargetRectangle().GetWidth(); //drawRc.top *= vScale; //drawRc.bottom *= vScale; //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = -1; - drawRc.bottom = 1; - drawRc.left = -1; - drawRc.right = 1; - } xfbSource->Draw(sourceRc, drawRc, Width, Height); } @@ -1013,7 +901,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (s_bScreenshot) { std::lock_guard lk(s_criticalScreenshot); - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, GetTargetRectangle()); s_bScreenshot = false; } @@ -1027,8 +915,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface); if (!bLastFrameDumped) { - s_recordWidth = dst_rect.GetWidth(); - s_recordHeight = dst_rect.GetHeight(); + s_recordWidth = GetTargetRectangle().GetWidth(); + s_recordHeight = GetTargetRectangle().GetHeight(); bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); if (!bAVIDumping) { @@ -1045,17 +933,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (bAVIDumping) { D3DLOCKED_RECT rect; - if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, dst_rect.AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) + if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, GetTargetRectangle().AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) { - if (!frame_data || w != s_recordWidth || h != s_recordHeight) + if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight) { - delete[] frame_data; - frame_data = new char[3 * s_recordWidth * s_recordHeight]; + frame_data.resize(3 * s_recordWidth * s_recordHeight); w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((const char*)rect.pBits, frame_data, s_recordWidth, s_recordHeight, rect.Pitch); - AVIDump::AddFrame(frame_data); + formatBufferDump((const u8*)rect.pBits, &frame_data[0], s_recordWidth, s_recordHeight, rect.Pitch); + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); ScreenShootMEMSurface->UnlockRect(); } } @@ -1065,12 +952,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - if (frame_data) - { - delete[] frame_data; - frame_data = 0; - w = h = 0; - } + std::vector().swap(frame_data); + w = h = 0; AVIDump::Stop(); bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); @@ -1086,28 +969,36 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps); } + if (SConfig::GetInstance().m_ShowLag) + { + char lag[10]; + StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount); + D3D::font.DrawTextScaled(0, 18, 20, 20, 0.0f, 0xFF00FFFF, lag); + } + if (g_ActiveConfig.bShowInputDisplay) { char inputDisplay[1000]; StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str()); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay); } + Renderer::DrawDebugText(); if (g_ActiveConfig.bOverlayStats) { Statistics::ToString(st); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, st); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st); } else if (g_ActiveConfig.bOverlayProjStats) { Statistics::ToStringProj(st); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, st); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st); } OSD::DrawMessages(); D3D::EndFrame(); - frameCount++; + ++frameCount; GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); @@ -1124,15 +1015,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(w); + FramebufferManagerBase::SetLastXfbHeight(h); } u32 newAA = g_ActiveConfig.iMultisampleMode; @@ -1141,14 +1030,12 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_LastAA = newAA; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface()); @@ -1168,20 +1055,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0); } - // Place messages on the picture, then copy it to the screen - // --------------------------------------------------------------------- - // Count FPS. - // ------------- - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // Begin new frame // Set default viewport and scissor, for the clear to work correctly @@ -1205,8 +1080,17 @@ void Renderer::ApplyState(bool bUseDstAlpha) { if (bUseDstAlpha) { + // TODO: WTF is this crap? We're enabling color writing regardless of the actual GPU state here... D3D::ChangeRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA); D3D::ChangeRenderState(D3DRS_ALPHABLENDENABLE, false); + if(bpmem.zmode.testenable && bpmem.zmode.updateenable) + { + //This is needed to draw to the correct pixels in multi-pass algorithms + //this avoid z-figthing and grants that you write to the same pixels + //affected by the last pass + D3D::ChangeRenderState(D3DRS_ZWRITEENABLE, false); + D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL); + } } } @@ -1214,7 +1098,11 @@ void Renderer::RestoreState() { D3D::RefreshRenderState(D3DRS_COLORWRITEENABLE); D3D::RefreshRenderState(D3DRS_ALPHABLENDENABLE); - + if(bpmem.zmode.testenable && bpmem.zmode.updateenable) + { + D3D::RefreshRenderState(D3DRS_ZWRITEENABLE); + D3D::RefreshRenderState(D3DRS_ZFUNC); + } // TODO: Enable this code. Caused glitches for me however (neobrain) // for (unsigned int i = 0; i < 8; ++i) // D3D::dev->SetTexture(i, NULL); @@ -1252,11 +1140,31 @@ void Renderer::RestoreAPIState() void Renderer::SetGenerationMode() { + const D3DCULL d3dCullModes[4] = + { + D3DCULL_NONE, + D3DCULL_CCW, + D3DCULL_CW, + D3DCULL_CCW + }; + D3D::SetRenderState(D3DRS_CULLMODE, d3dCullModes[bpmem.genMode.cullmode]); } void Renderer::SetDepthMode() { + const D3DCMPFUNC d3dCmpFuncs[8] = + { + D3DCMP_NEVER, + D3DCMP_LESS, + D3DCMP_EQUAL, + D3DCMP_LESSEQUAL, + D3DCMP_GREATER, + D3DCMP_NOTEQUAL, + D3DCMP_GREATEREQUAL, + D3DCMP_ALWAYS + }; + if (bpmem.zmode.testenable) { D3D::SetRenderState(D3DRS_ZENABLE, TRUE); @@ -1273,7 +1181,83 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + // D3D9 doesn't support logic blending, so this is a huge hack + + // 0 0x00 + // 1 Source & destination + // 2 Source & ~destination + // 3 Source + // 4 ~Source & destination + // 5 Destination + // 6 Source ^ destination = Source & ~destination | ~Source & destination + // 7 Source | destination + // 8 ~(Source | destination) + // 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination + // 10 ~Destination + // 11 Source | ~destination + // 12 ~Source + // 13 ~Source | destination + // 14 ~(Source & destination) + // 15 0xff + const D3DBLENDOP d3dLogicOpop[16] = + { + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_SUBTRACT, + D3DBLENDOP_ADD, + D3DBLENDOP_REVSUBTRACT, + D3DBLENDOP_ADD, + D3DBLENDOP_MAX, + D3DBLENDOP_ADD, + D3DBLENDOP_MAX, + D3DBLENDOP_MAX, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD + }; + const D3DBLEND d3dLogicOpSrcFactors[16] = + { + D3DBLEND_ZERO, + D3DBLEND_DESTCOLOR, + D3DBLEND_ONE, + D3DBLEND_ONE, + D3DBLEND_DESTCOLOR, + D3DBLEND_ZERO, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_ONE + }; + const D3DBLEND d3dLogicOpDestFactors[16] = + { + D3DBLEND_ZERO, + D3DBLEND_ZERO, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_SRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE + }; + + if (bpmem.blendmode.logicopenable) { D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, true); D3D::SetRenderState(D3DRS_BLENDOP, d3dLogicOpop[bpmem.blendmode.logicmode]); @@ -1301,6 +1285,21 @@ void Renderer::SetLineWidth() void Renderer::SetSamplerState(int stage, int texindex) { + const D3DTEXTUREFILTERTYPE d3dMipFilters[4] = + { + D3DTEXF_NONE, + D3DTEXF_POINT, + D3DTEXF_LINEAR, + D3DTEXF_NONE, //reserved + }; + const D3DTEXTUREADDRESS d3dClamps[4] = + { + D3DTADDRESS_CLAMP, + D3DTADDRESS_WRAP, + D3DTADDRESS_MIRROR, + D3DTADDRESS_WRAP //reserved + }; + const FourTexUnits &tex = bpmem.tex[texindex]; const TexMode0 &tm0 = tex.texMode0[stage]; const TexMode1 &tm1 = tex.texMode1[stage]; @@ -1314,13 +1313,11 @@ void Renderer::SetSamplerState(int stage, int texindex) { min = (tm0.min_filter & 4) ? D3DTEXF_LINEAR : D3DTEXF_POINT; mag = tm0.mag_filter ? D3DTEXF_LINEAR : D3DTEXF_POINT; - mip = (tm0.min_filter == 8) ? D3DTEXF_NONE : d3dMipFilters[tm0.min_filter & 3]; - if((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) - mip = D3DTEXF_NONE; + mip = d3dMipFilters[tm0.min_filter & 3]; } if (texindex) stage += 4; - + if (mag == D3DTEXF_LINEAR && min == D3DTEXF_LINEAR && g_ActiveConfig.iMaxAnisotropy) { min = D3DTEXF_ANISOTROPIC; @@ -1331,8 +1328,8 @@ void Renderer::SetSamplerState(int stage, int texindex) D3D::SetSamplerState(stage, D3DSAMP_ADDRESSU, d3dClamps[tm0.wrap_s]); D3D::SetSamplerState(stage, D3DSAMP_ADDRESSV, d3dClamps[tm0.wrap_t]); - //float SuperSampleCoeficient = (s_LastAA < 3)? s_LastAA + 1 : s_LastAA - 1;// uncoment this changes to conserve detail when incresing ssaa level - float lodbias = (tm0.lod_bias / 32.0f);// + (s_LastAA)?(log(SuperSampleCoeficient) / log(2.0f)):0; + + float lodbias = (s32)tm0.lod_bias / 32.0f; D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 2be29048d3..f105d0f774 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -72,10 +72,9 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { D3D::ReplaceTexture2D(texture, temp, width, height, expanded_width, d3d_fmt, swap_r_b, level); - // D3D9 will automatically generate mip maps if necessary } void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat, @@ -227,6 +226,8 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, u TCacheEntry* entry = new TCacheEntry(D3D::CreateTexture2D(temp, width, height, expanded_width, d3d_fmt, swap_r_b, tex_levels)); entry->swap_r_b = swap_r_b; entry->d3d_fmt = d3d_fmt; + + entry->Load(width, height, expanded_width, 0); return entry; } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h index 4a7cddd575..fc338e623f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h @@ -44,7 +44,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int levels, bool autogen_mips = false); + unsigned int expanded_width, unsigned int levels); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index 9f55da15fa..661cf36e76 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -39,9 +39,12 @@ // internal state for loading vertices extern NativeVertexFormat *g_nativeVertexFmt; - namespace DX9 { +//This are the initially requeted size for the buffers expresed in elements +const u32 IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 16; +const u32 VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16; +const u32 MAXVBUFFER_COUNT = 2; inline void DumpBadShaders() { @@ -62,8 +65,202 @@ inline void DumpBadShaders() #endif } -void VertexManager::Draw(int stride) +void VertexManager::CreateDeviceObjects() { + NumVBuffers = 0; + VBuffers = NULL; + IBuffers = NULL; + D3DCAPS9 DeviceCaps = D3D::GetCaps(); + u32 devicevMaxBufferSize = DeviceCaps.MaxPrimitiveCount * 3 * DeviceCaps.MaxStreamStride; + //Calculate Device Dependant size + CurrentVBufferSize = (VBUFFER_SIZE > devicevMaxBufferSize) ? devicevMaxBufferSize : VBUFFER_SIZE; + CurrentIBufferSize = (IBUFFER_SIZE > DeviceCaps.MaxVertexIndex) ? DeviceCaps.MaxVertexIndex : IBUFFER_SIZE; + //if device caps are not enough for Vbuffer fall back to vertex arrays + if (CurrentIBufferSize < MAXIBUFFERSIZE || CurrentVBufferSize < MAXVBUFFERSIZE) return; + + VBuffers = new LPDIRECT3DVERTEXBUFFER9[MAXVBUFFER_COUNT]; + IBuffers = new LPDIRECT3DINDEXBUFFER9[MAXVBUFFER_COUNT]; + + bool Fail = false; + for (CurrentVBuffer = 0; CurrentVBuffer < MAXVBUFFER_COUNT; CurrentVBuffer++) + { + VBuffers[CurrentVBuffer] = NULL; + IBuffers[CurrentVBuffer] = NULL; + } + for (CurrentVBuffer = 0; CurrentVBuffer < MAXVBUFFER_COUNT; CurrentVBuffer++) + { + if(FAILED( D3D::dev->CreateVertexBuffer( CurrentVBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &VBuffers[CurrentVBuffer], NULL ) ) ) + { + Fail = true; + break; + } + if( FAILED( D3D::dev->CreateIndexBuffer( CurrentIBufferSize * sizeof(u16), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &IBuffers[CurrentVBuffer], NULL ) ) ) + { + Fail = true; + return; + } + } + NumVBuffers = CurrentVBuffer; + CurrentVBuffer = 0; + CurrentIBuffer = 0; + CurrentIBufferIndex = CurrentIBufferSize; + CurrentVBufferIndex = CurrentVBufferSize; + + if (Fail) + { + NumVBuffers--; + if (NumVBuffers < 2) + { + //Error creating Vertex buffers. clean and fall to Vertex arrays + NumVBuffers = MAXVBUFFER_COUNT; + DestroyDeviceObjects(); + } + } +} +void VertexManager::DestroyDeviceObjects() +{ + D3D::dev->SetStreamSource( 0, NULL, 0, 0); + D3D::dev->SetIndices(NULL); + for (int i = 0; i < MAXVBUFFER_COUNT; i++) + { + if(VBuffers) + { + if (VBuffers[i]) + { + VBuffers[i]->Release(); + VBuffers[i] = NULL; + } + } + + if (IBuffers[i]) + { + IBuffers[i]->Release(); + IBuffers[i] = NULL; + } + } + if(VBuffers) + delete [] VBuffers; + if(IBuffers) + delete [] IBuffers; + VBuffers = NULL; + IBuffers = NULL; +} + +void VertexManager::PrepareVBuffers(int stride) +{ + if (!NumVBuffers) + { + return; + } + u8* pVertices; + u16* pIndices; + int datasize = IndexGenerator::GetNumVerts() * stride; + int TdataSize = IndexGenerator::GetTriangleindexLen(); + int LDataSize = IndexGenerator::GetLineindexLen(); + int PDataSize = IndexGenerator::GetPointindexLen(); + int IndexDataSize = TdataSize + LDataSize + PDataSize; + DWORD LockMode = D3DLOCK_NOOVERWRITE; + + if (CurrentVBufferIndex > CurrentVBufferSize - datasize) + { + LockMode = D3DLOCK_DISCARD; + CurrentVBufferIndex = 0; + CurrentVBuffer = (CurrentVBuffer + 1) % NumVBuffers; + } + + if(FAILED(VBuffers[CurrentVBuffer]->Lock(CurrentVBufferIndex, datasize,(VOID**)(&pVertices), LockMode))) + { + DestroyDeviceObjects(); + return; + } + memcpy(pVertices, LocalVBuffer, datasize); + VBuffers[CurrentVBuffer]->Unlock(); + + LockMode = D3DLOCK_NOOVERWRITE; + + if (CurrentIBufferIndex > CurrentIBufferSize - IndexDataSize) + { + LockMode = D3DLOCK_DISCARD; + CurrentIBufferIndex = 0; + CurrentIBuffer = (CurrentIBuffer + 1) % NumVBuffers; + } + + if(FAILED(IBuffers[CurrentIBuffer]->Lock(CurrentIBufferIndex * sizeof(u16), IndexDataSize * sizeof(u16), (VOID**)(&pIndices), LockMode ))) + { + DestroyDeviceObjects(); + return; + } + if(TdataSize) + { + memcpy(pIndices, TIBuffer, TdataSize * sizeof(u16)); + pIndices += TdataSize; + } + if(LDataSize) + { + memcpy(pIndices, LIBuffer, LDataSize * sizeof(u16)); + pIndices += LDataSize; + } + if(PDataSize) + { + memcpy(pIndices, PIBuffer, PDataSize * sizeof(u16)); + } + IBuffers[CurrentIBuffer]->Unlock(); + D3D::dev->SetStreamSource( 0, VBuffers[CurrentVBuffer], CurrentVBufferIndex, stride); + if(CurrentIBufferIndex == 0) + { + D3D::dev->SetIndices(IBuffers[CurrentIBuffer]); + } +} + +void VertexManager::DrawVB(int stride) +{ + if (IndexGenerator::GetNumTriangles() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_TRIANGLELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex, + IndexGenerator::GetNumTriangles()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumLines() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_LINELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen(), + IndexGenerator::GetNumLines()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumPoints() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_POINTLIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen(), + IndexGenerator::GetNumPoints()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + +} + +void VertexManager::DrawVA(int stride) +{ if (IndexGenerator::GetNumTriangles() > 0) { if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( @@ -105,7 +302,7 @@ void VertexManager::Draw(int stride) DumpBadShaders(); } INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } + } } void VertexManager::vFlush() @@ -136,8 +333,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) @@ -153,7 +350,7 @@ void VertexManager::vFlush() // set global constants VertexShaderManager::SetConstants(); PixelShaderManager::SetConstants(); - + int stride = g_nativeVertexFmt->GetVertexStride(); if (!PixelShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components)) { GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); @@ -165,17 +362,14 @@ void VertexManager::vFlush() goto shader_fail; } - - int stride = g_nativeVertexFmt->GetVertexStride(); - g_nativeVertexFmt->SetupVertexPointers(); - - Draw(stride); + PrepareVBuffers(stride); + g_nativeVertexFmt->SetupVertexPointers(); + if(NumVBuffers){ DrawVB(stride);} else { DrawVA(stride);} bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; if (useDstAlpha) { - DWORD write = 0; if (!PixelShaderCache::SetShader(DSTALPHA_ALPHA_PASS, g_nativeVertexFmt->m_components)) { GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); @@ -183,12 +377,17 @@ void VertexManager::vFlush() } // update alpha only g_renderer->ApplyState(true); - Draw(stride); + if(NumVBuffers){ DrawVB(stride);} else { DrawVA(stride);} g_renderer->RestoreState(); } GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true); shader_fail: + if(NumVBuffers) + { + CurrentIBufferIndex += IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen(); + CurrentVBufferIndex += IndexGenerator::GetNumVerts() * stride; + } ResetBuffer(); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h index 0d12616ac5..aa4e9ed57b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h @@ -31,9 +31,21 @@ class VertexManager : public ::VertexManager public: NativeVertexFormat* CreateNativeVertexFormat(); void GetElements(NativeVertexFormat* format, D3DVERTEXELEMENT9** elems, int* num); - + void CreateDeviceObjects(); + void DestroyDeviceObjects(); private: - void Draw(int stride); + u32 CurrentVBufferIndex; + u32 CurrentVBufferSize; + u32 CurrentIBufferIndex; + u32 CurrentIBufferSize; + u32 NumVBuffers; + u32 CurrentVBuffer; + u32 CurrentIBuffer; + LPDIRECT3DVERTEXBUFFER9 *VBuffers; + LPDIRECT3DINDEXBUFFER9 *IBuffers; + void PrepareVBuffers(int stride); + void DrawVB(int stride); + void DrawVA(int stride); // temp void vFlush(); }; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 1d1a2db112..8085ae4991 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -49,7 +49,7 @@ #include "D3DUtil.h" #include "EmuWindow.h" #include "VideoState.h" -#include "render.h" +#include "Render.h" #include "DLCache.h" #include "IniFile.h" #include "Core.h" @@ -93,6 +93,7 @@ void InitBackendInfo() const int maxConstants = (shaderModel < 3) ? 32 : ((shaderModel < 4) ? 224 : 65536); g_Config.backend_info.APIType = shaderModel < 3 ? API_D3D9_SM20 :API_D3D9_SM30; g_Config.backend_info.bUseRGBATextures = false; + g_Config.backend_info.bUseMinimalMipCount = true; g_Config.backend_info.bSupports3DVision = true; g_Config.backend_info.bSupportsDualSourceBlend = false; g_Config.backend_info.bSupportsFormatReinterpretation = true; @@ -169,9 +170,9 @@ void VideoBackend::Video_Prepare() s_swapRequested = FALSE; // internal interfaces - g_renderer = new Renderer; - g_texture_cache = new TextureCache; g_vertex_manager = new VertexManager; + g_renderer = new Renderer; + g_texture_cache = new TextureCache; // VideoCommon BPInit(); Fifo_Init(); @@ -209,9 +210,9 @@ void VideoBackend::Shutdown() // internal interfaces PixelShaderCache::Shutdown(); VertexShaderCache::Shutdown(); - delete g_vertex_manager; delete g_texture_cache; delete g_renderer; + delete g_vertex_manager; g_renderer = NULL; g_texture_cache = NULL; } diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt index 834e905faa..fe83deb68b 100644 --- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt @@ -13,11 +13,22 @@ set(SRCS Src/FramebufferManager.cpp Src/VertexManager.cpp) set(LIBS videocommon - GLEW SOIL common - ${OPENGL_LIBRARIES} ${X11_LIBRARIES}) +if(USE_EGL) + set(LIBS ${LIBS} + EGL) +endif() + +if(USE_GLES) + set(LIBS ${LIBS} + GLESv2) +else() + set(LIBS ${LIBS} + GLEW + ${OPENGL_LIBRARIES}) +endif() if(wxWidgets_FOUND) set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 8d73bfda05..1b71329917 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -249,4 +249,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 5110023ee3..01ea415263 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -18,7 +18,6 @@ #include "Globals.h" #include "VideoConfig.h" #include "IniFile.h" -#include "Setup.h" #include "Core.h" #include "Host.h" #include "VideoBackend.h" @@ -29,59 +28,8 @@ #include "GLUtil.h" -#if defined(_WIN32) -#include "EmuWindow.h" -static HDC hDC = NULL; // Private GDI Device Context -static HGLRC hRC = NULL; // Permanent Rendering Context -#else GLWindow GLWin; -#endif - -// Handles OpenGL and the window - -// Window dimensions. -static int s_backbuffer_width; -static int s_backbuffer_height; - -void OpenGL_SwapBuffers() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->SwapBuffers(); -#elif defined(__APPLE__) - [GLWin.cocoaCtx flushBuffer]; -#elif defined(_WIN32) - SwapBuffers(hDC); -#elif defined(HAVE_X11) && HAVE_X11 - glXSwapBuffers(GLWin.dpy, GLWin.win); -#endif -} - -u32 OpenGL_GetBackbufferWidth() -{ - return s_backbuffer_width; -} - -u32 OpenGL_GetBackbufferHeight() -{ - return s_backbuffer_height; -} - -void OpenGL_SetWindowText(const char *text) -{ -#if defined(USE_WX) && USE_WX - // Handled by Host_UpdateTitle() -#elif defined(__APPLE__) - [GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]]; -#elif defined(_WIN32) - TCHAR temp[512]; - swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text); - EmuWindow::SetWindowText(temp); -#elif defined(HAVE_X11) && HAVE_X11 - // Tell X to ask the window manager to set the window title. - // (X itself doesn't provide window title functionality.) - XStoreName(GLWin.dpy, GLWin.win, text); -#endif -} +cInterfaceBase *GLInterface; namespace OGL { @@ -89,20 +37,7 @@ namespace OGL // Draw messages on top of the screen unsigned int VideoBackend::PeekMessages() { -#ifdef _WIN32 - // TODO: peekmessage - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -#else - return false; -#endif + return GLInterface->PeekMessages(); } // Show the current FPS @@ -110,538 +45,105 @@ void VideoBackend::UpdateFPSDisplay(const char *text) { char temp[100]; snprintf(temp, sizeof temp, "%s | OpenGL | %s", scm_rev_str, text); - OpenGL_SetWindowText(temp); + return GLInterface->UpdateFPSDisplay(temp); } } - -#if defined(HAVE_X11) && HAVE_X11 -void XEventThread(); - -void CreateXWindow(void) +void InitInterface() { - Atom wmProtocols[1]; - - // Setup window attributes - GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, - GLWin.parent, GLWin.vi->visual, AllocNone); - GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; - GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); - GLWin.attr.border_pixel = 0; - - // Create the window - GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, - GLWin.vi->depth, InputOutput, GLWin.vi->visual, - CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); - wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); - XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); - XMapRaised(GLWin.evdpy, GLWin.win); - XSync(GLWin.evdpy, True); - - GLWin.xEventThread = std::thread(XEventThread); + #ifdef ANDROID + GLInterface = new cInterfaceBase; + #elif defined(USE_EGL) && USE_EGL + GLInterface = new cInterfaceEGL; + #elif defined(USE_WX) && USE_WX + GLInterface = new cInterfaceWX; + #elif defined(__APPLE__) + GLInterface = new cInterfaceAGL; + #elif defined(_WIN32) + GLInterface = new cInterfaceWGL; + #elif defined(HAVE_X11) && HAVE_X11 + GLInterface = new cInterfaceGLX; + #endif } -void DestroyXWindow(void) +GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) { - XUnmapWindow(GLWin.dpy, GLWin.win); - GLWin.win = 0; - if (GLWin.xEventThread.joinable()) - GLWin.xEventThread.join(); - XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); -} - -void XEventThread() -{ - // Free look variables - static bool mouseLookEnabled = false; - static bool mouseMoveEnabled = false; - static float lastMouse[2]; - while (GLWin.win) - { - XEvent event; - KeySym key; - for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) - { - XNextEvent(GLWin.evdpy, &event); - switch(event.type) { - case KeyPress: - key = XLookupKeysym((XKeyEvent*)&event, 0); - switch (key) - { - case XK_3: - OSDChoice = 1; - // Toggle native resolution - g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; - break; - case XK_4: - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - break; - case XK_5: - OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - break; - case XK_6: - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - break; - default: - break; - } - if (g_Config.bFreeLook) - { - static float debugSpeed = 1.0f; - switch (key) - { - case XK_parenleft: - debugSpeed /= 2.0f; - break; - case XK_parenright: - debugSpeed *= 2.0f; - break; - case XK_w: - VertexShaderManager::TranslateView(0.0f, debugSpeed); - break; - case XK_s: - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - break; - case XK_a: - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - break; - case XK_d: - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - break; - case XK_r: - VertexShaderManager::ResetView(); - break; - } - } - break; - case ButtonPress: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseMoveEnabled = true; - break; - case 3: // Right button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseLookEnabled = true; - break; - } - } - break; - case ButtonRelease: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - mouseMoveEnabled = false; - break; - case 3: // Right button - mouseLookEnabled = false; - break; - } - } - break; - case MotionNotify: - if (g_Config.bFreeLook) - { - if (mouseLookEnabled) - { - VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, - (event.xmotion.y - lastMouse[1]) / 200.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - - if (mouseMoveEnabled) - { - VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, - (event.xmotion.y - lastMouse[1]) / 50.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - } - break; - case ConfigureNotify: - Window winDummy; - unsigned int borderDummy, depthDummy; - XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, - &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); - s_backbuffer_width = GLWin.width; - s_backbuffer_height = GLWin.height; - break; - case ClientMessage: - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) - Host_Message(WM_USER_STOP); - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "RESIZE", False)) - XMoveResizeWindow(GLWin.evdpy, GLWin.win, - event.xclient.data.l[1], event.xclient.data.l[2], - event.xclient.data.l[3], event.xclient.data.l[4]); - break; - default: - break; - } - } - Common::SleepCurrentThread(20); - } -} -#endif - -// Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool OpenGL_Create(void *&window_handle) -{ - int _tx, _ty, _twidth, _theight; - Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); - - // Control window size and picture scaling - s_backbuffer_width = _twidth; - s_backbuffer_height = _theight; - -#if defined(USE_WX) && USE_WX - GLWin.panel = (wxPanel *)window_handle; - GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, - wxPoint(0, 0), wxSize(_twidth, _theight)); - GLWin.glCanvas->Show(true); - if (GLWin.glCtxt == NULL) // XXX dirty hack - GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); - -#elif defined(__APPLE__) - NSRect size; - NSUInteger style = NSMiniaturizableWindowMask; - NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 }; - NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] - initWithAttributes: attr]; - if (fmt == nil) { - ERROR_LOG(VIDEO, "failed to create pixel format"); - return NULL; - } - - GLWin.cocoaCtx = [[NSOpenGLContext alloc] - initWithFormat: fmt shareContext: nil]; - [fmt release]; - if (GLWin.cocoaCtx == nil) { - ERROR_LOG(VIDEO, "failed to create context"); - return NULL; - } - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { - size = [[NSScreen mainScreen] frame]; - style |= NSBorderlessWindowMask; - } else { - size = NSMakeRect(_tx, _ty, _twidth, _theight); - style |= NSResizableWindowMask | NSTitledWindowMask; - } - - GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size - styleMask: style backing: NSBackingStoreBuffered defer: NO]; - if (GLWin.cocoaWin == nil) { - ERROR_LOG(VIDEO, "failed to create window"); - return NULL; - } - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { - CGDisplayCapture(CGMainDisplayID()); - [GLWin.cocoaWin setLevel: CGShieldingWindowLevel()]; - } - - [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; - [GLWin.cocoaWin makeKeyAndOrderFront: nil]; - -#elif defined(_WIN32) - window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait...")); - if (window_handle == NULL) - { - Host_SysMessage("failed to create window"); - return false; - } - - // Show the window - EmuWindow::Show(); - - PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - 32, // Select Our Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // 8bit Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 24Bit Z-Buffer (Depth Buffer) - 8, // 8bit Stencil Buffer - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored - }; - - GLuint PixelFormat; // Holds The Results After Searching For A Match - - if (!(hDC=GetDC(EmuWindow::GetWnd()))) { - PanicAlert("(1) Can't create an OpenGL Device context. Fail."); - return false; - } - if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) { - PanicAlert("(2) Can't find a suitable PixelFormat."); - return false; - } - if (!SetPixelFormat(hDC, PixelFormat, &pfd)) { - PanicAlert("(3) Can't set the PixelFormat."); - return false; - } - if (!(hRC = wglCreateContext(hDC))) { - PanicAlert("(4) Can't create an OpenGL rendering context."); - return false; - } - // -------------------------------------- - -#elif defined(HAVE_X11) && HAVE_X11 - int glxMajorVersion, glxMinorVersion; - - // attributes for a single buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - None}; - - // attributes for a double buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, - GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, - None }; - - int attrListDefault[] = { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - None }; - - GLWin.dpy = XOpenDisplay(0); - GLWin.evdpy = XOpenDisplay(0); - GLWin.parent = (Window)window_handle; - GLWin.screen = DefaultScreen(GLWin.dpy); - if (GLWin.parent == 0) - GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); - - glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); - NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); - - // Get an appropriate visual - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); - if (GLWin.vi == NULL) - { - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl); - if (GLWin.vi != NULL) - { - ERROR_LOG(VIDEO, "Only single buffered visual!"); - } - else - { - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault); - if (GLWin.vi == NULL) - { - ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)"); - return false; - } - } - } - else - NOTICE_LOG(VIDEO, "Got double buffered visual!"); - - // Create a GLX context. - GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE); - if (!GLWin.ctx) - { - PanicAlert("Unable to create GLX context."); - return false; - } - - GLWin.x = _tx; - GLWin.y = _ty; - GLWin.width = _twidth; - GLWin.height = _theight; - - CreateXWindow(); - window_handle = (void *)GLWin.win; -#endif - return true; -} - -bool OpenGL_MakeCurrent() -{ - // connect the glx-context to the window -#if defined(USE_WX) && USE_WX - return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); -#elif defined(__APPLE__) - [GLWin.cocoaCtx makeCurrentContext]; -#elif defined(_WIN32) - return wglMakeCurrent(hDC, hRC) ? true : false; -#elif defined(HAVE_X11) && HAVE_X11 -#if defined(HAVE_WX) && (HAVE_WX) - Host_GetRenderWindowSize(GLWin.x, GLWin.y, - (int&)GLWin.width, (int&)GLWin.height); - XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y, - GLWin.width, GLWin.height); -#endif - return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); -#endif - return true; -} - -// Update window width, size and etc. Called from Render.cpp -void OpenGL_Update() -{ -#if defined(USE_WX) && USE_WX - int width, height; - - GLWin.panel->GetSize(&width, &height); - if (width == s_backbuffer_width && height == s_backbuffer_height) - return; - - GLWin.glCanvas->SetFocus(); - GLWin.glCanvas->SetSize(0, 0, width, height); - GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(__APPLE__) - int width, height; - - width = [[GLWin.cocoaWin contentView] frame].size.width; - height = [[GLWin.cocoaWin contentView] frame].size.height; - if (width == s_backbuffer_width && height == s_backbuffer_height) - return; - - [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; - [GLWin.cocoaCtx update]; - [GLWin.cocoaCtx makeCurrentContext]; - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(_WIN32) - RECT rcWindow; - if (!EmuWindow::GetParentWnd()) - { - // We are not rendering to a child window - use client size. - GetClientRect(EmuWindow::GetWnd(), &rcWindow); - } - else - { - // We are rendering to a child window - use parent size. - GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); - } - - // Get the new window width and height - // See below for documentation - int width = rcWindow.right - rcWindow.left; - int height = rcWindow.bottom - rcWindow.top; - - // If we are rendering to a child window - if (EmuWindow::GetParentWnd() != 0 && - (s_backbuffer_width != width || s_backbuffer_height != height) && - width >= 4 && height >= 4) - { - ::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE); - s_backbuffer_width = width; - s_backbuffer_height = height; - } -#endif -} - -// Close backend -void OpenGL_Shutdown() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->Hide(); - // XXX GLWin.glCanvas->Destroy(); - // XXX delete GLWin.glCtxt; -#elif defined(__APPLE__) - [GLWin.cocoaWin close]; - [GLWin.cocoaCtx clearDrawable]; - [GLWin.cocoaCtx release]; -#elif defined(_WIN32) - if (hRC) - { - if (!wglMakeCurrent(NULL, NULL)) - NOTICE_LOG(VIDEO, "Could not release drawing context."); - - if (!wglDeleteContext(hRC)) - ERROR_LOG(VIDEO, "Release Rendering Context Failed."); - - hRC = NULL; - } - - if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) - { - ERROR_LOG(VIDEO, "Release Device Context Failed."); - hDC = NULL; - } + // generate objects + GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); + GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); + GLuint programID = glCreateProgram(); + GLint Result = GL_FALSE; + char stringBuffer[1024]; + GLsizei stringBufferUsage = 0; -#elif defined(HAVE_X11) && HAVE_X11 - DestroyXWindow(); - if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL)) - NOTICE_LOG(VIDEO, "Could not release drawing context."); - if (GLWin.ctx) - { - glXDestroyContext(GLWin.dpy, GLWin.ctx); - XCloseDisplay(GLWin.dpy); - XCloseDisplay(GLWin.evdpy); - GLWin.ctx = NULL; + // compile vertex shader + glShaderSource(vertexShaderID, 1, &vertexShader, NULL); + glCompileShader(vertexShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader); + } else { + DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader); + } + bool shader_errors = !Result; +#endif + + // compile fragment shader + glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL); + glCompileShader(fragmentShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader); + } else { + DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader); + } + shader_errors |= !Result; +#endif + + // link them + glAttachShader(programID, vertexShaderID); + glAttachShader(programID, fragmentShaderID); + glLinkProgram(programID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetProgramiv(programID, GL_LINK_STATUS, &Result); + glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); + } else if(!Result && !shader_errors) { + ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); } #endif + + // cleanup + glDeleteShader(vertexShaderID); + glDeleteShader(fragmentShaderID); + + return programID; } + GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) { GLint err = glGetError(); if (err != GL_NO_ERROR) { - ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x - %s\n", - file, line, function, err, gluErrorString(err)); + ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n", + file, line, function, err); } return err; } void OpenGL_ReportARBProgramError() { +#ifndef USE_GLES const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB); if (pstr != NULL && pstr[0] != 0) { @@ -651,10 +153,12 @@ void OpenGL_ReportARBProgramError() ERROR_LOG(VIDEO, "%s", (char*)pstr); ERROR_LOG(VIDEO, "\n"); } +#endif } bool OpenGL_ReportFBOError(const char *function, const char *file, int line) { +#ifndef USE_GLES unsigned int fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); if (fbo_status != GL_FRAMEBUFFER_COMPLETE_EXT) { @@ -687,6 +191,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line) file, line, function, error); return false; } +#endif return true; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 23c31a1bb7..09d38bb731 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -20,26 +20,7 @@ #include "VideoConfig.h" #include "MathUtil.h" -#include "Thread.h" - -#ifdef _WIN32 -#define GLEW_STATIC -#include -#include -#elif defined HAVE_X11 && HAVE_X11 -#include -#include -#include -#include -#elif defined __APPLE__ -#include -#import -#endif - -#if defined USE_WX && USE_WX -#include "wx/wx.h" -#include "wx/glcanvas.h" -#endif +#include "GLInterface.h" #ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils #define GL_DEPTH_STENCIL_EXT 0x84F9 @@ -48,53 +29,28 @@ #define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 #endif +#ifdef USE_GLES +#define TEX2D GL_TEXTURE_2D +#define PREC "highp" +#define TEXTYPE "sampler2D" +#define TEXFUNC "texture2D" +#else +#define TEX2D GL_TEXTURE_RECTANGLE_ARB +#define PREC +#define TEXTYPE "sampler2DRect" +#define TEXFUNC "texture2DRect" +#endif + + #ifndef _WIN32 #include -typedef struct { -#if defined(USE_WX) && USE_WX - wxGLCanvas *glCanvas; - wxGLContext *glCtxt; - wxPanel *panel; -#elif defined(__APPLE__) - NSWindow *cocoaWin; - NSOpenGLContext *cocoaCtx; -#elif defined(HAVE_X11) && HAVE_X11 - int screen; - Window win; - Window parent; - // dpy used for glx stuff, evdpy for window events etc. - // evdpy is to be used by XEventThread only - Display *dpy, *evdpy; - XVisualInfo *vi; - GLXContext ctx; - XSetWindowAttributes attr; - std::thread xEventThread; - int x, y; - unsigned int width, height; #endif -} GLWindow; +void InitInterface(); -extern GLWindow GLWin; - -#endif - -// Public OpenGL util - -// Initialization / upkeep -bool OpenGL_Create(void *&); -void OpenGL_Shutdown(); -void OpenGL_Update(); -bool OpenGL_MakeCurrent(); -void OpenGL_SwapBuffers(); - -// Get status -u32 OpenGL_GetBackbufferWidth(); -u32 OpenGL_GetBackbufferHeight(); - -// Set things -void OpenGL_SetWindowText(const char *text); +// Helpers +GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); // Error reporting - use the convenient macros. void OpenGL_ReportARBProgramError(); @@ -126,4 +82,7 @@ extern CGprofile g_cgvProf, g_cgfProf; // use GLSL shaders across the whole pipeline. Yikes! //#define USE_DUAL_SOURCE_BLEND +// TODO: should be removed if we use glsl a lot +#define DEBUG_GLSL + #endif // _GLINIT_H_ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index ae20649433..0528bd1878 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -17,7 +17,7 @@ #include "GLUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "MemoryUtil.h" #include "VertexShaderGen.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 19f18ae855..dca8e4e30e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -61,6 +61,8 @@ #include "Movie.h" #include "Host.h" #include "BPFunctions.h" +#include "FPSCounter.h" +#include "ConfigManager.h" #include "main.h" // Local #ifdef _WIN32 @@ -130,58 +132,6 @@ const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_ static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; static std::vector s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR -static const GLenum glSrcFactors[8] = -{ - GL_ZERO, - GL_ONE, - GL_DST_COLOR, - GL_ONE_MINUS_DST_COLOR, - GL_SRC_ALPHA, - GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA -}; - -static const GLenum glDestFactors[8] = { - GL_ZERO, - GL_ONE, - GL_SRC_COLOR, - GL_ONE_MINUS_SRC_COLOR, - GL_SRC_ALPHA, - GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA -}; - -static const GLenum glCmpFuncs[8] = { - GL_NEVER, - GL_LESS, - GL_EQUAL, - GL_LEQUAL, - GL_GREATER, - GL_NOTEQUAL, - GL_GEQUAL, - GL_ALWAYS -}; - -static const GLenum glLogicOpCodes[16] = { - GL_CLEAR, - GL_AND, - GL_AND_REVERSE, - GL_COPY, - GL_AND_INVERTED, - GL_NOOP, - GL_XOR, - GL_OR, - GL_NOR, - GL_EQUIV, - GL_INVERT, - GL_OR_REVERSE, - GL_COPY_INVERTED, - GL_OR_INVERTED, - GL_NAND, - GL_SET -}; #if defined HAVE_CG && HAVE_CG void HandleCgError(CGcontext ctx, CGerror err, void* appdata) @@ -251,6 +201,8 @@ Renderer::Renderer() s_fps=0; s_blendMode = 0; + InitFPSCounter(); + #if defined HAVE_CG && HAVE_CG g_cgcontext = cgCreateContext(); cgGetError(); @@ -319,29 +271,12 @@ Renderer::Renderer() return; // TODO: fail // Decide frambuffer size - s_backbuffer_width = (int)OpenGL_GetBackbufferWidth(); - s_backbuffer_height = (int)OpenGL_GetBackbufferHeight(); + s_backbuffer_width = (int)GLInterface->GetBackBufferWidth(); + s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); // Handle VSync on/off -#ifdef __APPLE__ int swapInterval = g_ActiveConfig.bVSync ? 1 : 0; -#if defined USE_WX && USE_WX - NSOpenGLContext *ctx = GLWin.glCtxt->GetWXGLContext(); -#else - NSOpenGLContext *ctx = GLWin.cocoaCtx; -#endif - [ctx setValues: &swapInterval forParameter: NSOpenGLCPSwapInterval]; -#elif defined _WIN32 - if (WGLEW_EXT_swap_control) - wglSwapIntervalEXT(g_ActiveConfig.bVSync ? 1 : 0); - else - ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); -#elif defined(HAVE_X11) && HAVE_X11 - if (glXSwapIntervalSGI) - glXSwapIntervalSGI(g_ActiveConfig.bVSync ? 1 : 0); - else - ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); -#endif + GLInterface->SwapInterval(swapInterval); // check the max texture width and height GLint max_texture_size; @@ -359,16 +294,14 @@ Renderer::Renderer() if (!GLEW_ARB_texture_non_power_of_two) WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported."); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + // TODO: Move these somewhere else? + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); // Because of the fixed framebuffer size we need to disable the resolution // options while running @@ -519,7 +452,7 @@ Renderer::~Renderer() void Renderer::DrawDebugInfo() { // Reset viewport for drawing text - glViewport(0, 0, OpenGL_GetBackbufferWidth(), OpenGL_GetBackbufferHeight()); + glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight()); // Draw various messages on the screen, like FPS, statistics, etc. char debugtext_buffer[8192]; char *p = debugtext_buffer; @@ -528,6 +461,9 @@ void Renderer::DrawDebugInfo() if (g_ActiveConfig.bShowFPS) p+=sprintf(p, "FPS: %d\n", s_fps); + if (SConfig::GetInstance().m_ShowLag) + p+=sprintf(p, "Lag: %llu\n", Movie::g_currentLagCount); + if (g_ActiveConfig.bShowInputDisplay) p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str()); @@ -593,18 +529,23 @@ void Renderer::DrawDebugInfo() void Renderer::RenderText(const char *text, int left, int top, u32 color) { - const int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); - const int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); + const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); + const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + s_pfont->printMultilineText(text, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, 0, nBackbufferWidth, nBackbufferHeight); GL_REPORT_ERRORD(); + + glDisable(GL_BLEND); } TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) @@ -636,10 +577,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format GLenum ColorMask = GL_FALSE, AlphaMask = GL_FALSE; - if (bpmem.blendmode.colorupdate) - ColorMask = GL_TRUE; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - AlphaMask = GL_TRUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.colorupdate) + ColorMask = GL_TRUE; + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + AlphaMask = GL_TRUE; + } glColorMask(ColorMask, ColorMask, ColorMask, AlphaMask); } @@ -912,6 +856,32 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const GLenum glSrcFactors[8] = + { + GL_ZERO, + GL_ONE, + GL_DST_COLOR, + GL_ONE_MINUS_DST_COLOR, + GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA + (target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE, + (target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO + }; + const GLenum glDestFactors[8] = + { + GL_ZERO, + GL_ONE, + GL_SRC_COLOR, + GL_ONE_MINUS_SRC_COLOR, + GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA + (target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE, + (target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO + }; + // blend mode bit mask // 0 - blend enable // 2 - reverse subtract enable (else add) @@ -955,10 +925,10 @@ void Renderer::SetBlendMode(bool forceUpdate) if (changes & 0x1F8) { -#ifdef USE_DUAL_SOURCE_BLEND GLenum srcFactor = glSrcFactors[(newval >> 3) & 7]; - GLenum srcFactorAlpha = srcFactor; GLenum dstFactor = glDestFactors[(newval >> 6) & 7]; +#ifdef USE_DUAL_SOURCE_BLEND + GLenum srcFactorAlpha = srcFactor; GLenum dstFactorAlpha = dstFactor; if (useDualSource) { @@ -979,53 +949,53 @@ void Renderer::SetBlendMode(bool forceUpdate) // blend RGB change glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha); #else - glBlendFunc(glSrcFactors[(newval >> 3) & 7], glDestFactors[(newval >> 6) & 7]); + glBlendFunc(srcFactor, dstFactor); #endif } s_blendMode = newval; } +void DumpFrame(const std::vector& data, int w, int h) +{ +#if defined(HAVE_LIBAV) || defined(_WIN32) + if (g_ActiveConfig.bDumpFrames && !data.empty()) + { + AVIDump::AddFrame(&data[0], w, h); + } +#endif +} + // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { static int w = 0, h = 0; - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - #ifdef _WIN32 - AVIDump::AddFrame(frame_data); - #elif defined HAVE_LIBAV - AVIDump::AddFrame((u8*)frame_data, w, h); - #endif + DumpFrame(frame_data, w, h); Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); - if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0)) { - if (g_ActiveConfig.bDumpFrames && frame_data) - { -#ifdef _WIN32 - AVIDump::AddFrame(frame_data); -#elif defined HAVE_LIBAV - AVIDump::AddFrame((u8*)frame_data, w, h); -#endif - } + DumpFrame(frame_data, w, h); Core::Callback_VideoCopiedToXFB(false); return; } ResetAPIState(); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, true, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + TargetRectangle flipped_trc = GetTargetRectangle(); + + // Flip top and bottom for some reason; TODO: Fix the code to suck less? + int tmp = flipped_trc.top; + flipped_trc.top = flipped_trc.bottom; + flipped_trc.bottom = tmp; // Textured triangles are necessary because of post-processing shaders @@ -1034,7 +1004,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OGL::TextureCache::DisableStage(i); // Update GLViewPort - glViewport(dst_rect.left, dst_rect.bottom, dst_rect.GetWidth(), dst_rect.GetHeight()); + glViewport(flipped_trc.left, flipped_trc.bottom, flipped_trc.GetWidth(), flipped_trc.GetHeight()); GL_REPORT_ERRORD(); @@ -1065,7 +1035,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (!g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = 1; + drawRc.bottom = -1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -1079,21 +1056,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // The following code disables auto stretch. Kept for reference. // scale draw area for a 1 to 1 pixel mapping with the draw target - //float vScale = (float)fbHeight / (float)dst_rect.GetHeight(); - //float hScale = (float)fbWidth / (float)dst_rect.GetWidth(); + //float vScale = (float)fbHeight / (float)flipped_trc.GetHeight(); + //float hScale = (float)fbWidth / (float)flipped_trc.GetWidth(); //drawRc.top *= vScale; //drawRc.bottom *= vScale; //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = 1; - drawRc.bottom = -1; - drawRc.left = -1; - drawRc.right = 1; - } - // Tell the OSD Menu about the current internal resolution OSDInternalW = xfbSource->sourceRc.GetWidth(); OSDInternalH = xfbSource->sourceRc.GetHeight(); @@ -1165,7 +1134,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (s_bScreenshot) { std::lock_guard lk(s_criticalScreenshot); - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, flipped_trc); // Reset settings s_sScreenshotName.clear(); s_bScreenshot = false; @@ -1176,16 +1145,15 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { std::lock_guard lk(s_criticalScreenshot); - if (!frame_data || w != dst_rect.GetWidth() || - h != dst_rect.GetHeight()) + if (frame_data.empty() || w != flipped_trc.GetWidth() || + h != flipped_trc.GetHeight()) { - if (frame_data) delete[] frame_data; - w = dst_rect.GetWidth(); - h = dst_rect.GetHeight(); - frame_data = new char[3 * w * h]; + w = flipped_trc.GetWidth(); + h = flipped_trc.GetHeight(); + frame_data.resize(3 * w * h); } glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { if (!bLastFrameDumped) @@ -1206,12 +1174,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } if (bAVIDumping) { - #ifdef _WIN32 - AVIDump::AddFrame(frame_data); - #else - FlipImageData((u8*)frame_data, w, h); - AVIDump::AddFrame((u8*)frame_data, w, h); + #ifndef _WIN32 + FlipImageData(&frame_data[0], w, h); #endif + + AVIDump::AddFrame(&frame_data[0], w, h); } bLastFrameDumped = true; @@ -1223,12 +1190,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - if (frame_data) - { - delete[] frame_data; - frame_data = NULL; - w = h = 0; - } + std::vector().swap(frame_data); + w = h = 0; AVIDump::Stop(); bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); @@ -1240,11 +1203,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { std::lock_guard lk(s_criticalScreenshot); std::string movie_file_name; - w = dst_rect.GetWidth(); - h = dst_rect.GetHeight(); - frame_data = new char[3 * w * h]; + w = GetTargetRectangle().GetWidth(); + h = GetTargetRectangle().GetHeight(); + frame_data.resize(3 * w * h); glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]); if (GL_REPORT_ERROR() == GL_NO_ERROR) { if (!bLastFrameDumped) @@ -1255,21 +1218,17 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { - char msg [255]; - sprintf(msg, "Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h); - OSD::AddMessage(msg, 2000); + OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h).c_str(), 2000); } } if (pFrameDump) { - FlipImageData((u8*)frame_data, w, h); - pFrameDump.WriteBytes(frame_data, w * 3 * h); + FlipImageData(&frame_data[0], w, h); + pFrameDump.WriteBytes(&frame_data[0], w * 3 * h); pFrameDump.Flush(); } bLastFrameDumped = true; } - - delete[] frame_data; } else { @@ -1283,24 +1242,22 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons SetWindowSize(fbWidth, fbHeight); - OpenGL_Update(); // just updates the render window position and the backbuffer size + GLInterface->Update(); // just updates the render window position and the backbuffer size bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int const last_w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int const last_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(last_w); + FramebufferManagerBase::SetLastXfbHeight(last_h); } bool WindowResized = false; - int W = (int)OpenGL_GetBackbufferWidth(); - int H = (int)OpenGL_GetBackbufferHeight(); + int W = (int)GLInterface->GetBackBufferWidth(); + int H = (int)GLInterface->GetBackBufferHeight(); if (W != s_backbuffer_width || H != s_backbuffer_height || s_LastEFBScale != g_ActiveConfig.iEFBScale) { WindowResized = true; @@ -1311,11 +1268,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (xfbchanged || WindowResized || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)) { - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(dst_rect); - - if (CalculateTargetSize() || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)) + if (CalculateTargetSize(s_backbuffer_width, s_backbuffer_height) || s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode) { s_LastMultisampleMode = g_ActiveConfig.iMultisampleMode; s_MSAASamples = GetNumMSAASamples(s_LastMultisampleMode); @@ -1328,20 +1283,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } } - // Place messages on the picture, then copy it to the screen - // --------------------------------------------------------------------- - // Count FPS. - // ------------- - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // --------------------------------------------------------------------- GL_REPORT_ERRORD(); @@ -1359,7 +1302,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons GL_REPORT_ERRORD(); // Copy the rendered frame to the real window - OpenGL_SwapBuffers(); + GLInterface->Swap(); GL_REPORT_ERRORD(); @@ -1455,6 +1398,18 @@ void Renderer::SetGenerationMode() void Renderer::SetDepthMode() { + const GLenum glCmpFuncs[8] = + { + GL_NEVER, + GL_LESS, + GL_EQUAL, + GL_LEQUAL, + GL_GREATER, + GL_NOTEQUAL, + GL_GEQUAL, + GL_ALWAYS + }; + if (bpmem.zmode.testenable) { glEnable(GL_DEPTH_TEST); @@ -1472,7 +1427,27 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + const GLenum glLogicOpCodes[16] = + { + GL_CLEAR, + GL_AND, + GL_AND_REVERSE, + GL_COPY, + GL_AND_INVERTED, + GL_NOOP, + GL_XOR, + GL_OR, + GL_NOR, + GL_EQUIV, + GL_INVERT, + GL_OR_REVERSE, + GL_COPY_INVERTED, + GL_OR_INVERTED, + GL_NAND, + GL_SET + }; + + if (bpmem.blendmode.logicopenable) { glEnable(GL_COLOR_LOGIC_OP); glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 7a62131f90..ee918ee6c0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -58,24 +58,6 @@ namespace OGL static u32 s_TempFramebuffer = 0; -static const GLint c_MinLinearFilter[8] = { - GL_NEAREST, - GL_NEAREST_MIPMAP_NEAREST, - GL_NEAREST_MIPMAP_LINEAR, - GL_NEAREST, - GL_LINEAR, - GL_LINEAR_MIPMAP_NEAREST, - GL_LINEAR_MIPMAP_LINEAR, - GL_LINEAR, -}; - -static const GLint c_WrapSettings[4] = { - GL_CLAMP_TO_EDGE, - GL_REPEAT, - GL_MIRRORED_REPEAT, - GL_REPEAT, -}; - bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level) { int width = std::max(virtual_width >> level, 1); @@ -196,12 +178,14 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, entry.pcfmt = pcfmt; entry.bHaveMipMaps = tex_levels != 1; + + entry.Load(width, height, expanded_width, 0); return &entry; } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { //glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, texture); @@ -212,16 +196,7 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, if (expanded_width != width) glPixelStorei(GL_UNPACK_ROW_LENGTH, expanded_width); - if (bHaveMipMaps && autogen_mips) - { - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); - glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); - } - else - { - glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); - } + glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); if (expanded_width != width) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); @@ -330,15 +305,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo srcRect); u8* dst = Memory::GetPointer(addr); - u64 hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples); + u64 const new_hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples); // Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date if (!g_ActiveConfig.bEFBCopyCacheEnable) TextureCache::MakeRangeDynamic(addr,encoded_size); - else if (!TextureCache::Find(addr, hash)) + else if (!TextureCache::Find(addr, new_hash)) TextureCache::MakeRangeDynamic(addr,encoded_size); - this->hash = hash; + hash = new_hash; } FramebufferManager::SetFramebuffer(0); @@ -357,35 +332,43 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1) { - // TODO: not used anywhere - TexMode0 mode = newmode; - //mode1 = newmode1; - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, - (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); - - if (bHaveMipMaps) + const GLint c_MinLinearFilter[8] = { - // TODO: not used anywhere - if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4) - mode.min_filter += 4; // take equivalent forced linear + GL_NEAREST, + GL_NEAREST_MIPMAP_NEAREST, + GL_NEAREST_MIPMAP_LINEAR, + GL_NEAREST, + GL_LINEAR, + GL_LINEAR_MIPMAP_NEAREST, + GL_LINEAR_MIPMAP_LINEAR, + GL_LINEAR, + }; + const GLint c_WrapSettings[4] = + { + GL_CLAMP_TO_EDGE, + GL_REPEAT, + GL_MIRRORED_REPEAT, + GL_REPEAT, + }; - int filt = newmode.min_filter; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod >> 4); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod >> 4); - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (newmode.lod_bias / 32.0f)); - } - else - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, - (g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + int filt = newmode.min_filter; + if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4) + filt += 4; // take equivalent forced linear + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); + + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod / 16.f); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod / 16.f); + glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (s32)newmode.lod_bias / 32.0f); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]); + // TODO: Reset anisotrop when changed to 1 if (g_Config.iMaxAnisotropy >= 1) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, - (float)(1 << g_ActiveConfig.iMaxAnisotropy)); + (float)(1 << g_ActiveConfig.iMaxAnisotropy)); } TextureCache::~TextureCache() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h index 30f44b797d..a26aa4049e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h @@ -54,7 +54,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips = false); + unsigned int expanded_width, unsigned int level); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 85a23e1c1d..87d79fdb38 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -70,6 +70,16 @@ VertexManager::VertexManager() GL_REPORT_ERRORD(); } +void VertexManager::CreateDeviceObjects() +{ + + +} +void VertexManager::DestroyDeviceObjects() +{ + +} + void VertexManager::Draw() { if (IndexGenerator::GetNumTriangles() > 0) @@ -119,8 +129,8 @@ void VertexManager::vFlush() xfregs.postMtxInfo[i].index, xfregs.postMtxInfo[i].normalize); } - PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, - bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alphaFunc.hex>>16)&0xff); + PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, + bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff); #endif (void)GL_REPORT_ERROR(); @@ -155,8 +165,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h index 0f22054855..5cec1bf97e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h @@ -33,7 +33,8 @@ public: VertexManager(); NativeVertexFormat* CreateNativeVertexFormat(); - + void CreateDeviceObjects(); + void DestroyDeviceObjects(); private: void Draw(); // temp diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 329d131ded..266ac2a8ae 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -88,7 +88,6 @@ Make AA apply instantly during gameplay if possible #include "TextureConverter.h" #include "PostProcessing.h" #include "OnScreenDisplay.h" -#include "Setup.h" #include "DLCache.h" #include "FramebufferManager.h" #include "Core.h" @@ -132,6 +131,7 @@ void InitBackendInfo() { g_Config.backend_info.APIType = API_OPENGL; g_Config.backend_info.bUseRGBATextures = false; + g_Config.backend_info.bUseMinimalMipCount = false; g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bSupportsDualSourceBlend = false; // supported, but broken g_Config.backend_info.bSupportsFormatReinterpretation = false; @@ -168,7 +168,8 @@ bool VideoBackend::Initialize(void *&window_handle) g_Config.VerifyValidity(); UpdateActiveConfig(); - if (!OpenGL_Create(window_handle)) + InitInterface(); + if (!GLInterface->Create(window_handle)) return false; s_BackendInitialized = true; @@ -180,7 +181,7 @@ bool VideoBackend::Initialize(void *&window_handle) // Run from the graphics thread void VideoBackend::Video_Prepare() { - OpenGL_MakeCurrent(); + GLInterface->MakeCurrent(); g_renderer = new Renderer; @@ -206,7 +207,9 @@ void VideoBackend::Video_Prepare() GL_REPORT_ERRORD(); VertexLoaderManager::Init(); TextureConverter::Init(); +#ifndef _M_GENERIC DLCache::Init(); +#endif // Notify the core that the video backend is ready Host_Message(WM_USER_CREATE); @@ -221,7 +224,9 @@ void VideoBackend::Shutdown() s_efbAccessRequested = false; s_FifoShuttingDown = false; s_swapRequested = false; +#ifndef _M_GENERIC DLCache::Shutdown(); +#endif Fifo_Shutdown(); PostProcessing::Shutdown(); @@ -240,7 +245,7 @@ void VideoBackend::Shutdown() g_renderer = NULL; g_texture_cache = NULL; } - OpenGL_Shutdown(); + GLInterface->Shutdown(); } } diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt index 0ba90d1537..15db15e654 100644 --- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt @@ -26,13 +26,25 @@ if(wxWidgets_FOUND) endif(wxWidgets_FOUND) set(LIBS videocommon - GLEW SOIL common - ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${wxWidgets_LIBRARIES}) +if(USE_EGL) + set(LIBS ${LIBS} + EGL) +endif() +if(USE_GLES) + set(SRCS ${SRCS} + ../Plugin_VideoOGL/Src/GLUtil.cpp) + set(LIBS ${LIBS} + GLESv2) +else() + set(LIBS ${LIBS} + GLEW + ${OPENGL_LIBRARIES}) +endif() if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) set(LIBS ${LIBS} clrun) endif() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index 4de9f435fa..dde31ab7d3 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -126,7 +126,46 @@ void SWBPWritten(int address, int newvalue) PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5); break; } - + + case BPMEM_PRELOAD_MODE: + if (newvalue != 0) + { + // TODO: Not quite sure if this is completely correct (likely not) + // NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature. + + BPS_TmemConfig& tmem_cfg = bpmem.tmem_config; + u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC? + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; + u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; + + if (tmem_cfg.preload_tile_info.type != 3) + { + if (tmem_addr_even + size > TMEM_SIZE) + size = TMEM_SIZE - tmem_addr_even; + + memcpy(texMem + tmem_addr_even, src_ptr, size); + } + else // RGBA8 tiles (and CI14, but that might just be stupid libogc!) + { + // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything + u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; + + for (unsigned int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + { + if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || + tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) + break; + + memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); + memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE); + tmem_addr_even += TMEM_LINE_SIZE; + tmem_addr_odd += TMEM_LINE_SIZE; + src_ptr += TMEM_LINE_SIZE * 2; + } + } + } + break; + case BPMEM_TEV_REGISTER_L: // Reg 1 case BPMEM_TEV_REGISTER_L+2: // Reg 2 case BPMEM_TEV_REGISTER_L+4: // Reg 3 diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp index e9a3525d84..c4755b50bf 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp @@ -65,6 +65,13 @@ namespace Clipper OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES]; OutputVertexData *Vertices[NUM_INDICES]; + void DoState(PointerWrap &p) + { + p.DoArray(m_ViewOffset,2); + for (int i = 0; i< NUM_CLIPPED_VERTICES; ++i) + ClippedVertices[i].DoState(p); + } + void Init() { for (int i = 0; i < NUM_CLIPPED_VERTICES; ++i) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h index 5e5dd4d02c..babc8b4e88 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h @@ -21,6 +21,7 @@ #include "Common.h" #include "NativeVertexFormat.h" +#include "ChunkFile.h" namespace Clipper @@ -36,6 +37,8 @@ namespace Clipper bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface); void PerspectiveDivide(OutputVertexData *vertex); + + void DoState(PointerWrap &p); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp index 8ee2243719..57fc57a906 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp @@ -62,8 +62,8 @@ void SaveTexture(const char* filename, u32 texmap, s32 mip) TexImage0& ti0 = texUnit.texImage0[subTexmap]; - int width = ti0.width + 1; - int height = ti0.height + 1; + u32 width = ti0.width + 1; + u32 height = ti0.height + 1; u8 *data = new u8[width * height * 4]; @@ -74,19 +74,23 @@ void SaveTexture(const char* filename, u32 texmap, s32 mip) delete []data; } -void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, int width, int height) +void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height) { u8 sample[4]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) { + for (u32 y = 0; y < height; y++) + { + for (u32 x = 0; x < width; x++) + { TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample); - // rgba to bgra + + // RGBA to BGRA *(dst++) = sample[2]; *(dst++) = sample[1]; *(dst++) = sample[0]; *(dst++) = sample[3]; } + } } s32 GetMaxTextureLod(u32 texmap) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h index 4b2f0b86aa..efb104458d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h @@ -22,7 +22,7 @@ namespace DebugUtil { void Init(); - void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, int width, int height); + void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height); void DumpActiveTextures(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp index 50e6998a74..95566d0e26 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp @@ -25,7 +25,6 @@ #include "DebugUtil.h" #include "HwRasterizer.h" #include "SWCommandProcessor.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" #include "HW/Memmap.h" #include "Core.h" @@ -33,7 +32,7 @@ namespace EfbCopy { void CopyToXfb() { - OpenGL_Update(); // just updates the render window position and the backbuffer size + GLInterface->Update(); // just updates the render window position and the backbuffer size if (!g_SWVideoConfig.bHwRasterizer) { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp index f2631c9238..8fdc0425a4 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp @@ -28,6 +28,7 @@ u8 efb[EFB_WIDTH*EFB_HEIGHT*6]; namespace EfbInterface { + u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; inline u32 GetColorOffset(u16 x, u16 y) @@ -40,6 +41,12 @@ namespace EfbInterface return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START; } + void DoState(PointerWrap &p) + { + p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6); + p.DoArray(efbColorTexture, EFB_WIDTH*EFB_HEIGHT*4); + } + void SetPixelAlphaOnly(u32 offset, u8 a) { switch (bpmem.zcontrol.pixel_format) @@ -355,7 +362,7 @@ namespace EfbInterface dstClr = (~srcClr) & dstClr; break; case 5: // noop - dstClr = dstClr; + // Do nothing break; case 6: // xor dstClr = srcClr ^ dstClr; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h index 15d19e7783..fdad69567c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h @@ -47,6 +47,7 @@ namespace EfbInterface void UpdateColorTexture(); extern u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; // RGBA format + void DoState(PointerWrap &p); } #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index 8736066524..a1fd7c4733 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -29,163 +29,354 @@ namespace HwRasterizer { - float efbHalfWidth; - float efbHalfHeight; - bool hasTexture; + float efbHalfWidth; + float efbHalfHeight; + bool hasTexture; - u8 *temp; + u8 *temp; - void Init() - { - efbHalfWidth = EFB_WIDTH / 2.0f; - efbHalfHeight = 480 / 2.0f; + // Programs + static GLuint colProg, texProg, clearProg; - temp = (u8*)AllocateMemoryPages(TEMP_SIZE); - } + // Color + static GLint col_apos = -1, col_atex = -1; + // Tex + static GLint tex_apos = -1, tex_atex = -1, tex_utex = -1; + // Clear shader + static GLint clear_apos = -1, clear_ucol = -1; - void LoadTexture() - { - FourTexUnits &texUnit = bpmem.tex[0]; - u32 imageAddr = texUnit.texImage3[0].image_base; + void CreateShaders() + { + // Color Vertices + static const char *fragcolText = + "varying " PREC " vec4 TexCoordOut;\n" + "void main() {\n" + " gl_FragColor = TexCoordOut;\n" + "}\n"; + // Texture Vertices + static const char *fragtexText = + "varying " PREC " vec4 TexCoordOut;\n" + "uniform " TEXTYPE " Texture;\n" + "void main() {\n" + " gl_FragColor = " TEXFUNC "(Texture, TexCoordOut.xy);\n" + "}\n"; + // Clear shader + static const char *fragclearText = + "uniform " PREC " vec4 Color;\n" + "void main() {\n" + " gl_FragColor = Color;\n" + "}\n"; + // Generic passthrough vertice shaders + static const char *vertShaderText = + "attribute vec4 pos;\n" + "attribute vec4 TexCoordIn;\n " + "varying vec4 TexCoordOut;\n " + "void main() {\n" + " gl_Position = pos;\n" + " TexCoordOut = TexCoordIn;\n" + "}\n"; + static const char *vertclearText = + "attribute vec4 pos;\n" + "void main() {\n" + " gl_Position = pos;\n" + "}\n"; - TexCacheEntry &cacheEntry = textures[imageAddr]; - cacheEntry.Update(); + // Color Program + colProg = OpenGL_CompileProgram(vertShaderText, fragcolText); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, cacheEntry.texture); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST); - } + // Texture Program + texProg = OpenGL_CompileProgram(vertShaderText, fragtexText); - void BeginTriangles() - { - // disabling depth test sometimes allows more things to be visible - glEnable(GL_DEPTH_TEST); - glEnable(GL_BLEND); + // Clear Program + clearProg = OpenGL_CompileProgram(vertclearText, fragclearText); - hasTexture = bpmem.tevorders[0].enable0; + // Color attributes + col_apos = glGetAttribLocation(colProg, "pos"); + col_atex = glGetAttribLocation(colProg, "TexCoordIn"); + // Texture attributes + tex_apos = glGetAttribLocation(texProg, "pos"); + tex_atex = glGetAttribLocation(texProg, "TexCoordIn"); + tex_utex = glGetUniformLocation(texProg, "Texture"); + // Clear attributes + clear_apos = glGetAttribLocation(clearProg, "pos"); + clear_ucol = glGetUniformLocation(clearProg, "Color"); + } - if (hasTexture) - LoadTexture(); - } + void Init() + { + efbHalfWidth = EFB_WIDTH / 2.0f; + efbHalfHeight = 480 / 2.0f; - void EndTriangles() - { - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); + temp = (u8*)AllocateMemoryPages(TEMP_SIZE); + } + void Shutdown() + { + glDeleteProgram(colProg); + glDeleteProgram(texProg); + glDeleteProgram(clearProg); + } + void Prepare() + { + //legacy multitexturing: select texture channel only. + glActiveTexture(GL_TEXTURE0); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment +#ifndef USE_GLES + glShadeModel(GL_SMOOTH); + glDisable(GL_BLEND); + glClearDepth(1.0f); + glEnable(GL_SCISSOR_TEST); + glDisable(GL_LIGHTING); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); - glDisable(GL_DEPTH_TEST); - glDisable(GL_BLEND); - } + glClientActiveTexture(GL_TEXTURE0); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glEnable(GL_TEXTURE_RECTANGLE_ARB); + glStencilFunc(GL_ALWAYS, 0, 0); + glDisable(GL_STENCIL_TEST); +#endif + // used by hw rasterizer if it enables blending and depth test + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDepthFunc(GL_LEQUAL); - void DrawColorVertex(OutputVertexData *v) - { - glColor3ub(v->color[0][OutputVertexData::RED_C], v->color[0][OutputVertexData::GRN_C], v->color[0][OutputVertexData::BLU_C]); - glVertex3f(v->screenPosition.x / efbHalfWidth - 1.0f, 1.0f - v->screenPosition.y / efbHalfHeight, v->screenPosition.z / (float)0x00ffffff); - } + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + + CreateShaders(); + GL_REPORT_ERRORD(); + } + static float width, height; + void LoadTexture() + { + FourTexUnits &texUnit = bpmem.tex[0]; + u32 imageAddr = texUnit.texImage3[0].image_base; + // Texture Rectangle uses pixel coordinates + // While GLES uses texture coordinates +#ifdef USE_GLES + width = texUnit.texImage0[0].width; + height = texUnit.texImage0[0].height; +#else + width = 1; + height = 1; +#endif + TexCacheEntry &cacheEntry = textures[imageAddr]; + cacheEntry.Update(); - void DrawTextureVertex(OutputVertexData *v) - { - float s = v->texCoords[0].x; - float t = v->texCoords[0].y; - glTexCoord2f(s, t); + glBindTexture(TEX2D, cacheEntry.texture); + glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); + glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + GL_REPORT_ERRORD(); + } - float x = (v->screenPosition.x / efbHalfWidth) - 1.0f; - float y = 1.0f - (v->screenPosition.y / efbHalfHeight); - float z = v->screenPosition.z; - glVertex3f(x, y, z); - } + void BeginTriangles() + { + // disabling depth test sometimes allows more things to be visible + glEnable(GL_DEPTH_TEST); + glEnable(GL_BLEND); - void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) - { - glBegin(GL_TRIANGLES); - if (hasTexture) - { - DrawTextureVertex(v0); - DrawTextureVertex(v1); - DrawTextureVertex(v2); - } - else - { - DrawColorVertex(v0); - DrawColorVertex(v1); - DrawColorVertex(v2); - } - glEnd(); - } + hasTexture = bpmem.tevorders[0].enable0; - void Clear() - { - u8 r = (bpmem.clearcolorAR & 0x00ff); - u8 g = (bpmem.clearcolorGB & 0xff00) >> 8; - u8 b = (bpmem.clearcolorGB & 0x00ff); - u8 a = (bpmem.clearcolorAR & 0xff00) >> 8; + if (hasTexture) + LoadTexture(); + } - GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f; - GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight; - GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f; - GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight; - GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff; + void EndTriangles() + { + glBindTexture(TEX2D, 0); + glDisable(GL_DEPTH_TEST); + glDisable(GL_BLEND); + } - glBegin(GL_QUADS); - glColor4ub(r, g, b, a); - glVertex3f(left, top, depth); - glColor4ub(r, g, b, a); - glVertex3f(right, top, depth); - glColor4ub(r, g, b, a); - glVertex3f(right, bottom, depth); - glColor4ub(r, g, b, a); - glVertex3f(left, bottom, depth); - glEnd(); - } + void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { + float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; + float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); + float z0 = v0->screenPosition.z / (float)0x00ffffff; - TexCacheEntry::TexCacheEntry() - { - Create(); - } + float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; + float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); + float z1 = v1->screenPosition.z / (float)0x00ffffff; - void TexCacheEntry::Create() - { - FourTexUnits &texUnit = bpmem.tex[0]; + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; + float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); + float z2 = v2->screenPosition.z / (float)0x00ffffff; - texImage0.hex = texUnit.texImage0[0].hex; - texImage1.hex = texUnit.texImage1[0].hex; - texImage2.hex = texUnit.texImage2[0].hex; - texImage3.hex = texUnit.texImage3[0].hex; - texTlut.hex = texUnit.texTlut[0].hex; + float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f; + float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f; + float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f; - int width = texImage0.width; - int height = texImage0.height; + float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f; + float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f; + float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f; - DebugUtil::GetTextureBGRA(temp, 0, 0, width, height); + float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f; + float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f; + float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f; - glGenTextures(1, (GLuint *)&texture); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); - } + static const GLfloat verts[3][3] = { + { x0, y0, z0 }, + { x1, y1, z1 }, + { x2, y2, z2 } + }; + static const GLfloat col[3][4] = { + { r0, g0, b0, 1.0f }, + { r1, g1, b1, 1.0f }, + { r2, g2, b2, 1.0f } + }; + { + glUseProgram(colProg); + glEnableVertexAttribArray(col_apos); + glEnableVertexAttribArray(col_atex); - void TexCacheEntry::Destroy() - { - if (texture == 0) - return; + glVertexAttribPointer(col_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(col_atex, 4, GL_FLOAT, GL_FALSE, 0, col); + glDrawArrays(GL_TRIANGLES, 0, 3); + glDisableVertexAttribArray(col_atex); + glDisableVertexAttribArray(col_apos); + } + GL_REPORT_ERRORD(); + } - glDeleteTextures(1, &texture); - texture = 0; - } + void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { + float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; + float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); + float z0 = v0->screenPosition.z; - void TexCacheEntry::Update() - { - FourTexUnits &texUnit = bpmem.tex[0]; + float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; + float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); + float z1 = v1->screenPosition.z; - // extra checks cause textures to be reloaded much more - if (texUnit.texImage0[0].hex != texImage0.hex || - //texUnit.texImage1[0].hex != texImage1.hex || - //texUnit.texImage2[0].hex != texImage2.hex || - texUnit.texImage3[0].hex != texImage3.hex || - texUnit.texTlut[0].hex != texTlut.hex) - { - Destroy(); - Create(); - } - } + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; + float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); + float z2 = v2->screenPosition.z; + float s0 = v0->texCoords[0].x / width; + float t0 = v0->texCoords[0].y / height; + + float s1 = v1->texCoords[0].x / width; + float t1 = v1->texCoords[0].y / height; + + float s2 = v2->texCoords[0].x / width; + float t2 = v2->texCoords[0].y / height; + + static const GLfloat verts[3][3] = { + { x0, y0, z0 }, + { x1, y1, z1 }, + { x2, y2, z2 } + }; + static const GLfloat tex[3][2] = { + { s0, t0 }, + { s1, t1 }, + { s2, t2 } + }; + { + glUseProgram(texProg); + glEnableVertexAttribArray(tex_apos); + glEnableVertexAttribArray(tex_atex); + + glVertexAttribPointer(tex_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(tex_atex, 2, GL_FLOAT, GL_FALSE, 0, tex); + glUniform1i(tex_utex, 0); + glDrawArrays(GL_TRIANGLES, 0, 3); + glDisableVertexAttribArray(tex_atex); + glDisableVertexAttribArray(tex_apos); + } + GL_REPORT_ERRORD(); + } + + void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { + if (hasTexture) + DrawTextureVertex(v0, v1, v2); + else + DrawColorVertex(v0, v1, v2); + } + + void Clear() + { + u8 r = (bpmem.clearcolorAR & 0x00ff); + u8 g = (bpmem.clearcolorGB & 0xff00) >> 8; + u8 b = (bpmem.clearcolorGB & 0x00ff); + u8 a = (bpmem.clearcolorAR & 0xff00) >> 8; + + GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f; + GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight; + GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f; + GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight; + GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff; + static const GLfloat verts[4][3] = { + { left, top, depth }, + { right, top, depth }, + { right, bottom, depth }, + { left, bottom, depth } + }; + { + glUseProgram(clearProg); + glVertexAttribPointer(clear_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glUniform4f(clear_ucol, r, g, b, a); + glEnableVertexAttribArray(col_apos); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDisableVertexAttribArray(col_apos); + } + GL_REPORT_ERRORD(); + } + + TexCacheEntry::TexCacheEntry() + { + Create(); + } + + void TexCacheEntry::Create() + { + FourTexUnits &texUnit = bpmem.tex[0]; + + texImage0.hex = texUnit.texImage0[0].hex; + texImage1.hex = texUnit.texImage1[0].hex; + texImage2.hex = texUnit.texImage2[0].hex; + texImage3.hex = texUnit.texImage3[0].hex; + texTlut.hex = texUnit.texTlut[0].hex; + + int image_width = texImage0.width; + int image_height = texImage0.height; + + DebugUtil::GetTextureBGRA(temp, 0, 0, image_width, image_height); + + glGenTextures(1, (GLuint *)&texture); + glBindTexture(TEX2D, texture); +#ifdef USE_GLES + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)image_width, (GLsizei)image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); +#else + glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)image_width, (GLsizei)image_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); +#endif + GL_REPORT_ERRORD(); + } + + void TexCacheEntry::Destroy() + { + if (texture == 0) + return; + + glDeleteTextures(1, &texture); + texture = 0; + } + + void TexCacheEntry::Update() + { + FourTexUnits &texUnit = bpmem.tex[0]; + + // extra checks cause textures to be reloaded much more + if (texUnit.texImage0[0].hex != texImage0.hex || + //texUnit.texImage1[0].hex != texImage1.hex || + //texUnit.texImage2[0].hex != texImage2.hex || + texUnit.texImage3[0].hex != texImage3.hex || + texUnit.texTlut[0].hex != texTlut.hex) + { + Destroy(); + Create(); + } + } } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h index 568c313215..9f07a44b19 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h @@ -28,6 +28,9 @@ struct OutputVertexData; namespace HwRasterizer { void Init(); + void Shutdown(); + + void Prepare(); void BeginTriangles(); void EndTriangles(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h index d19844105f..e2d87e207e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h @@ -19,6 +19,7 @@ #define _NATIVEVERTEXFORMAT_H #include "Vec3.h" +#include "ChunkFile.h" #ifdef WIN32 #define LOADERDECL __cdecl @@ -92,6 +93,18 @@ struct OutputVertexData #undef LINTERP #undef LINTERP_INT } + void DoState(PointerWrap &p) + { + mvPosition.DoState(p); + p.Do(projectedPosition); + screenPosition.DoState(p); + for (int i = 0; i < 3;++i) + normal[i].DoState(p); + p.DoArray(color, sizeof color); + for (int i = 0; i < 8;++i) + texCoords[i].DoState(p); + } + }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index 0091e4eaca..4848cb4d43 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -35,7 +35,6 @@ typedef void (*DecodingFunction)(u32); namespace OpcodeDecoder { - static DecodingFunction currentFunction = NULL; static u32 minCommandSize; static u16 streamSize; @@ -46,6 +45,20 @@ static bool inObjectStream; static u8 lastPrimCmd; +void DoState(PointerWrap &p) +{ + p.Do(minCommandSize); + // Not sure what is wrong with this. Something(s) in here is causing dolphin to crash/hang when loading states saved from another run of dolphin. Doesn't seem too important anyway... + //vertexLoader.DoState(p); + p.Do(readOpcode); + p.Do(inObjectStream); + p.Do(lastPrimCmd); + p.Do(streamSize); + p.Do(streamAddress); + if (p.GetMode() == PointerWrap::MODE_READ) + ResetDecoding(); +} + void DecodePrimitiveStream(u32 iBufferSize) { u32 vertexSize = vertexLoader.GetVertexSize(); @@ -125,7 +138,9 @@ void DecodeStandard(u32 bufferSize) if (Cmd == GX_NOP) return; - + // Causes a SIGBUS error on Android + // XXX: Investigate +#ifndef ANDROID // check if switching in or out of an object // only used for debuggging if (inObjectStream && (Cmd & 0x87) != lastPrimCmd) @@ -139,7 +154,7 @@ void DecodeStandard(u32 bufferSize) lastPrimCmd = Cmd & 0x87; DebugUtil::OnObjectBegin(); } - +#endif switch(Cmd) { case GX_NOP: diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h index 635fcc24ee..53715b2832 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h @@ -20,6 +20,7 @@ #define _OPCODEDECODER_H_ #include "CommonTypes.h" +#include "ChunkFile.h" namespace OpcodeDecoder { @@ -57,6 +58,8 @@ namespace OpcodeDecoder bool CommandRunnable(u32 iBufferSize); void Run(u32 iBufferSize); + + void DoState(PointerWrap &p); } #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index c9c3b8c26c..d30c3d7033 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -63,6 +63,28 @@ s32 scissorBottom = 0; Tev tev; RasterBlock rasterBlock; +void DoState(PointerWrap &p) +{ + ZSlope.DoState(p); + WSlope.DoState(p); + for (int i=0;i<2;++i) + for (int n=0; n<4; ++n) + ColorSlopes[i][n].DoState(p); + for (int i=0;i<8;++i) + for (int n=0; n<3; ++n) + TexSlopes[i][n].DoState(p); + p.Do(vertex0X); + p.Do(vertex0Y); + p.Do(vertexOffsetX); + p.Do(vertexOffsetY); + p.Do(scissorLeft); + p.Do(scissorTop); + p.Do(scissorRight); + p.Do(scissorBottom); + tev.DoState(p); + p.Do(rasterBlock); +} + void Init() { tev.Init(); @@ -126,7 +148,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi) if (z < 0 || z > 0x00ffffff) return; - if (bpmem.zcontrol.zcomploc) + if (bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && g_SWVideoConfig.bZComploc) { // TODO: Verify that perf regs are being incremented even if test is disabled if (++SWPixelEngine::pereg.perfZcompInputZcomplocLo == 0) @@ -379,7 +401,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer float w[3] = { 1.0f / v0->projectedPosition.w, 1.0f / v1->projectedPosition.w, 1.0f / v2->projectedPosition.w }; InitSlope(&WSlope, w[0], w[1], w[2], fltdx31, fltdx12, fltdy12, fltdy31); - if (!bpmem.genMode.zfreeze) + if (!bpmem.genMode.zfreeze || !g_SWVideoConfig.bZFreeze) InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h index f8850571a9..784c4a8d62 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h @@ -19,6 +19,7 @@ #define _RASTERIZER_H_ #include "NativeVertexFormat.h" +#include "ChunkFile.h" namespace Rasterizer { @@ -37,6 +38,12 @@ namespace Rasterizer float f0; float GetValue(float dx, float dy) { return f0 + (dfdx * dx) + (dfdy * dy); } + void DoState(PointerWrap &p) + { + p.Do(dfdx); + p.Do(dfdy); + p.Do(f0); + } }; struct RasterBlockPixel @@ -53,6 +60,8 @@ namespace Rasterizer s32 TextureLod[16]; bool TextureLinear[16]; }; + + void DoState(PointerWrap &p); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp index b9afc1abb5..6cc4ee4dc8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp @@ -57,6 +57,15 @@ CPReg cpreg; // shared between gfx and emulator thread void DoState(PointerWrap &p) { p.Do(cpreg); + p.DoArray(commandBuffer, commandBufferSize); + p.Do(readPos); + p.Do(writePos); + p.Do(et_UpdateInterrupts); + p.Do(interruptSet); + p.Do(interruptWaiting); + + // Is this right? + p.DoArray(g_pVideoData,writePos); } // does it matter that there is no synchronization between threads during writes? @@ -115,15 +124,15 @@ void RunGpu() if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread) { // We are going to do FP math on the main thread so have to save the current state - SaveSSEState(); - LoadDefaultSSEState(); + FPURoundMode::SaveSIMDState(); + FPURoundMode::LoadDefaultSIMDState(); // run the opcode decoder do { RunBuffer(); } while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr); - LoadSSEState(); + FPURoundMode::LoadSIMDState(); } } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp index ad19eb87ee..a621542ea0 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp @@ -53,6 +53,8 @@ void DoState(PointerWrap &p) p.Do(pereg); p.Do(g_bSignalTokenInterrupt); p.Do(g_bSignalFinishInterrupt); + p.Do(et_SetTokenOnMainThread); + p.Do(et_SetFinishOnMainThread); } void UpdateInterrupts(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3923ed0840..fb472cfdba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -16,17 +16,23 @@ // http://code.google.com/p/dolphin-emu/ #include "Common.h" +#include #include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "../../Plugin_VideoOGL/Src/RasterFont.h" #include "SWRenderer.h" #include "SWStatistics.h" -#include "../../Plugin_VideoOGL/Src/RasterFont.h" - -#define VSYNC_ENABLED 0 static GLuint s_RenderTarget = 0; +static GLint attr_pos = -1, attr_tex = -1; +static GLint uni_tex = -1; +static GLuint program; + +// Rasterfont isn't compatible with GLES +#ifndef USE_GLES RasterFont* s_pfont = NULL; +#endif void SWRenderer::Init() { @@ -34,84 +40,76 @@ void SWRenderer::Init() void SWRenderer::Shutdown() { - glDeleteTextures(1, &s_RenderTarget); + glDeleteProgram(program); + glDeleteTextures(1, &s_RenderTarget); +#ifndef USE_GLES + delete s_pfont; + s_pfont = 0; +#endif +} - delete s_pfont; - s_pfont = 0; +void CreateShaders() +{ + static const char *fragShaderText = + "varying " PREC " vec2 TexCoordOut;\n" + "uniform sampler2D Texture;\n" + "void main() {\n" + " " PREC " vec4 tmpcolor;\n" + " tmpcolor = texture2D(Texture, TexCoordOut);\n" + " gl_FragColor = tmpcolor;\n" + "}\n"; + static const char *vertShaderText = + "attribute vec4 pos;\n" + "attribute vec2 TexCoordIn;\n " + "varying vec2 TexCoordOut;\n " + "void main() {\n" + " gl_Position = pos;\n" + " TexCoordOut = TexCoordIn;\n" + "}\n"; + + program = OpenGL_CompileProgram(vertShaderText, fragShaderText); + + glUseProgram(program); + + uni_tex = glGetUniformLocation(program, "Texture"); + attr_pos = glGetAttribLocation(program, "pos"); + attr_tex = glGetAttribLocation(program, "TexCoordIn"); + + } void SWRenderer::Prepare() { - OpenGL_MakeCurrent(); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment + glGenTextures(1, &s_RenderTarget); - // Init extension support. - if (glewInit() != GLEW_OK) { - ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); - return; - } - - // Handle VSync on/off -#ifdef _WIN32 - if (WGLEW_EXT_swap_control) - wglSwapIntervalEXT(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?"); -#elif defined(HAVE_X11) && HAVE_X11 - if (glXSwapIntervalSGI) - glXSwapIntervalSGI(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)"); + CreateShaders(); + // TODO: Enable for GLES once RasterFont supports GLES +#ifndef USE_GLES + s_pfont = new RasterFont(); + glEnable(GL_TEXTURE_2D); #endif - - glStencilFunc(GL_ALWAYS, 0, 0); - // used by hw rasterizer if it enables blending and depth test - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDepthFunc(GL_LEQUAL); - - glShadeModel(GL_SMOOTH); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glClearDepth(1.0f); - glEnable(GL_SCISSOR_TEST); - - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment - - glDisable(GL_LIGHTING); - glDisable(GL_BLEND); - glDisable(GL_STENCIL_TEST); - //glDisable(GL_SCISSOR_TEST); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - s_pfont = new RasterFont(); - - // legacy multitexturing: select texture channel only. - glActiveTexture(GL_TEXTURE0); - glClientActiveTexture(GL_TEXTURE0); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - - glGenTextures(1, &s_RenderTarget); - glEnable(GL_TEXTURE_RECTANGLE_ARB); + GL_REPORT_ERRORD(); } void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { - int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); - int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); +#ifndef USE_GLES + int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); + int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); s_pfont->printMultilineText(pstr, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, 0, nBackbufferWidth, nBackbufferHeight); +#endif } void SWRenderer::DrawDebugText() { - char debugtext_buffer[8192]; + char debugtext_buffer[8192]; char *p = debugtext_buffer; p[0] = 0; @@ -139,48 +137,57 @@ void SWRenderer::DrawDebugText() void SWRenderer::DrawTexture(u8 *texture, int width, int height) { - GLsizei glWidth = (GLsizei)OpenGL_GetBackbufferWidth(); - GLsizei glHeight = (GLsizei)OpenGL_GetBackbufferHeight(); + GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); + GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight(); // Update GLViewPort glViewport(0, 0, glWidth, glHeight); - glScissor(0, 0, glWidth, glHeight); + glScissor(0, 0, glWidth, glHeight); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, s_RenderTarget); - glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glBindTexture(GL_TEXTURE_2D, s_RenderTarget); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + + glUseProgram(program); + static const GLfloat verts[4][2] = { + { -1, -1}, // Left top + { -1, 1}, // left bottom + { 1, 1}, // right bottom + { 1, -1} // right top + }; + static const GLfloat texverts[4][2] = { + {0, 1}, + {0, 0}, + {1, 0}, + {1, 1} + }; + + glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); + glEnableVertexAttribArray(attr_pos); + glEnableVertexAttribArray(attr_tex); + glUniform1i(uni_tex, 0); + glActiveTexture(GL_TEXTURE0); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDisableVertexAttribArray(attr_pos); + glDisableVertexAttribArray(attr_tex); + + glBindTexture(GL_TEXTURE_2D, 0); GL_REPORT_ERRORD(); - - GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)glHeight; - - glBegin(GL_QUADS); - glTexCoord2f(0, v_max); glVertex2f(-1, -1); - glTexCoord2f(0, 0); glVertex2f(-1, 1); - glTexCoord2f(u_max, 0); glVertex2f( 1, 1); - glTexCoord2f(u_max, v_max); glVertex2f( 1, -1); - glEnd(); - - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); } void SWRenderer::SwapBuffer() { - DrawDebugText(); + DrawDebugText(); - glFlush(); + glFlush(); - OpenGL_SwapBuffers(); + GLInterface->Swap(); - GL_REPORT_ERRORD(); - - swstats.ResetFrame(); + swstats.ResetFrame(); - // Clear framebuffer - glClearColor(0, 0, 0, 0); - glClearDepth(1.0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp index 0e2cc7f99f..1c1eeb2005 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp @@ -72,27 +72,27 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType) tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac); //TexMtx - const int tmDesc[8] = { + const u32 tmDesc[8] = { g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx, g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx }; // Colors - const int colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1}; + const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1}; colElements[0] = m_CurrentVat->g0.Color0Elements; colElements[1] = m_CurrentVat->g0.Color1Elements; - const int colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp}; + const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp}; // TextureCoord - const int tcDesc[8] = { + const u32 tcDesc[8] = { g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, - g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; - const int tcElements[8] = { + const u32 tcElements[8] = { m_CurrentVat->g0.Tex0CoordElements, m_CurrentVat->g1.Tex1CoordElements, m_CurrentVat->g1.Tex2CoordElements, m_CurrentVat->g1.Tex3CoordElements, m_CurrentVat->g1.Tex4CoordElements, m_CurrentVat->g2.Tex5CoordElements, m_CurrentVat->g2.Tex6CoordElements, m_CurrentVat->g2.Tex7CoordElements }; - const int tcFormat[8] = { + const u32 tcFormat[8] = { m_CurrentVat->g0.Tex0CoordFormat, m_CurrentVat->g1.Tex1CoordFormat, m_CurrentVat->g1.Tex2CoordFormat, m_CurrentVat->g1.Tex3CoordFormat, m_CurrentVat->g1.Tex4CoordFormat, m_CurrentVat->g2.Tex5CoordFormat, m_CurrentVat->g2.Tex6CoordFormat, m_CurrentVat->g2.Tex7CoordFormat @@ -328,4 +328,15 @@ void SWVertexLoader::LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData vertexLoader->m_texCoordLoader[index](); } - +void SWVertexLoader::DoState(PointerWrap &p) +{ + p.DoArray(m_AttributeLoaders, sizeof m_AttributeLoaders); + p.Do(m_VertexSize); + p.Do(*m_CurrentVat); + p.Do(m_positionLoader); + p.Do(m_normalLoader); + p.DoArray(m_colorLoader, sizeof m_colorLoader); + p.Do(m_NumAttributeLoaders); + m_SetupUnit->DoState(p); + p.Do(m_TexGenSpecialCase); +} \ No newline at end of file diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h index 91a0d8e911..e05346a7a5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h @@ -22,6 +22,7 @@ #include "NativeVertexFormat.h" #include "CPMemLoader.h" +#include "ChunkFile.h" class SetupUnit; @@ -69,7 +70,7 @@ public: u32 GetVertexSize() { return m_VertexSize; } void LoadVertex(); - + void DoState(PointerWrap &p); }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp index 05a6cdddf2..07947e0ee7 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp @@ -35,6 +35,9 @@ SWVideoConfig::SWVideoConfig() bDumpObjects = false; bDumpFrames = false; + bZComploc = true; + bZFreeze = true; + bDumpTevStages = false; bDumpTevTextureFetches = false; @@ -52,6 +55,8 @@ void SWVideoConfig::Load(const char* ini_file) iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); + iniFile.Get("Rendering", "ZComploc", &bZComploc, true); + iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true); iniFile.Get("Info", "ShowStats", &bShowStats, false); @@ -74,6 +79,8 @@ void SWVideoConfig::Save(const char* ini_file) iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); + iniFile.Set("Rendering", "ZComploc", &bZComploc); + iniFile.Set("Rendering", "ZFreeze", &bZFreeze); iniFile.Set("Info", "ShowStats", bShowStats); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h index 14eae78b51..c042ae8cc5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h @@ -36,6 +36,10 @@ struct SWVideoConfig : NonCopyable bool bHwRasterizer; + // Emulation features + bool bZComploc; + bool bZFreeze; + bool bShowStats; bool bDumpTextures; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 100ff55bf4..9d15619f55 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -39,6 +39,11 @@ #include "FileUtil.h" #include "VideoBackend.h" #include "Core.h" +#include "OpcodeDecoder.h" +#include "SWVertexLoader.h" +#include "SWStatistics.h" + +#define VSYNC_ENABLED 0 namespace SW { @@ -68,31 +73,61 @@ void VideoSoftware::ShowConfig(void *_hParent) bool VideoSoftware::Initialize(void *&window_handle) { - g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); + g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); + InitInterface(); - if (!OpenGL_Create(window_handle)) + if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); return false; } - InitBPMemory(); - InitXFMemory(); - SWCommandProcessor::Init(); - SWPixelEngine::Init(); - OpcodeDecoder::Init(); - Clipper::Init(); - Rasterizer::Init(); - HwRasterizer::Init(); - SWRenderer::Init(); - DebugUtil::Init(); + InitBPMemory(); + InitXFMemory(); + SWCommandProcessor::Init(); + SWPixelEngine::Init(); + OpcodeDecoder::Init(); + Clipper::Init(); + Rasterizer::Init(); + HwRasterizer::Init(); + SWRenderer::Init(); + DebugUtil::Init(); return true; } -void VideoSoftware::DoState(PointerWrap&) +void VideoSoftware::DoState(PointerWrap& p) { - // NYI + bool software = true; + p.Do(software); + if (p.GetMode() == PointerWrap::MODE_READ && software == false) + // change mode to abort load of incompatible save state. + p.SetMode(PointerWrap::MODE_VERIFY); + + // TODO: incomplete? + SWCommandProcessor::DoState(p); + SWPixelEngine::DoState(p); + EfbInterface::DoState(p); + OpcodeDecoder::DoState(p); + Clipper::DoState(p); + p.Do(swxfregs); + p.Do(bpmem); + p.Do(swstats); + + // CP Memory + p.DoArray(arraybases, 16); + p.DoArray(arraystrides, 16); + p.Do(MatrixIndexA); + p.Do(MatrixIndexB); + p.Do(g_VtxDesc.Hex); + p.DoArray(g_VtxAttr, 8); + p.DoMarker("CP Memory"); + +} + +void VideoSoftware::CheckInvalidState() +{ + // there is no state to invalidate } void VideoSoftware::PauseAndLock(bool doLock, bool unpauseOnUnlock) @@ -124,16 +159,30 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState) void VideoSoftware::Shutdown() { + HwRasterizer::Shutdown(); SWRenderer::Shutdown(); - OpenGL_Shutdown(); + GLInterface->Shutdown(); } // This is called after Video_Initialize() from the Core void VideoSoftware::Video_Prepare() -{ - SWRenderer::Prepare(); +{ + GLInterface->MakeCurrent(); + // Init extension support. + // Required for WGL SwapInterval +#ifndef USE_GLES + if (glewInit() != GLEW_OK) { + ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); + return; + } +#endif + // Handle VSync on/off + GLInterface->SwapInterval(VSYNC_ENABLED); - INFO_LOG(VIDEO, "Video backend initialized."); + HwRasterizer::Prepare(); + SWRenderer::Prepare(); + + INFO_LOG(VIDEO, "Video backend initialized."); } // Run from the CPU thread (from VideoInterface.cpp) @@ -279,20 +328,7 @@ writeFn32 VideoSoftware::Video_PEWrite32() // Draw messages on top of the screen unsigned int VideoSoftware::PeekMessages() { -#ifdef _WIN32 - // TODO: peekmessage - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -#else - return false; -#endif + return GLInterface->PeekMessages(); } // Show the current FPS @@ -300,7 +336,7 @@ void VideoSoftware::UpdateFPSDisplay(const char *text) { char temp[100]; snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text); - OpenGL_SetWindowText(temp); + GLInterface->UpdateFPSDisplay(temp); } } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp index 6e0fab57d8..d2185e31d5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp @@ -25,13 +25,13 @@ void SetupUnit::Init(u8 primitiveType) { - m_PrimType = primitiveType; + m_PrimType = primitiveType; - m_VertexCounter = 0; - m_VertPointer[0] = &m_Vertices[0]; - m_VertPointer[1] = &m_Vertices[1]; - m_VertPointer[2] = &m_Vertices[2]; - m_VertWritePointer = m_VertPointer[0]; + m_VertexCounter = 0; + m_VertPointer[0] = &m_Vertices[0]; + m_VertPointer[1] = &m_Vertices[1]; + m_VertPointer[2] = &m_Vertices[2]; + m_VertWritePointer = m_VertPointer[0]; } void SetupUnit::SetupVertex() @@ -169,3 +169,21 @@ void SetupUnit::SetupLineStrip() void SetupUnit::SetupPoint() {} + +void SetupUnit::DoState(PointerWrap &p) +{ + // TODO: some or all of this is making the save states stop working once dolphin is closed...sometimes (usually) + // I have no idea what specifically is wrong, or if this is even important. Disabling it doesn't seem to make any noticible difference... +/* p.Do(m_PrimType); + p.Do(m_VertexCounter); + for (int i = 0; i < 3; ++i) + m_Vertices[i].DoState(p); + + if (p.GetMode() == PointerWrap::MODE_READ) + { + m_VertPointer[0] = &m_Vertices[0]; + m_VertPointer[1] = &m_Vertices[1]; + m_VertPointer[2] = &m_Vertices[2]; + m_VertWritePointer = m_VertPointer[0]; + }*/ +} diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h index 45a575afcb..f337de21a2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h @@ -21,6 +21,7 @@ #include "Common.h" #include "NativeVertexFormat.h" +#include "ChunkFile.h" class SetupUnit { @@ -45,6 +46,7 @@ public: OutputVertexData* GetVertex() { return m_VertWritePointer; } void SetupVertex(); + void DoState(PointerWrap &p); }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index 80d68833b6..c9c408a623 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -432,12 +432,12 @@ static bool AlphaCompare(int alpha, int ref, int comp) return true; } -static bool AlphaTest(int alpha) +static bool TevAlphaTest(int alpha) { - bool comp0 = AlphaCompare(alpha, bpmem.alphaFunc.ref0, bpmem.alphaFunc.comp0); - bool comp1 = AlphaCompare(alpha, bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp1); + bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0); + bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1); - switch (bpmem.alphaFunc.logic) { + switch (bpmem.alpha_test.logic) { case 0: return comp0 && comp1; // and case 1: return comp0 || comp1; // or case 2: return comp0 ^ comp1; // xor @@ -701,7 +701,7 @@ void Tev::Draw() // convert to 8 bits per component u8 output[4] = {(u8)Reg[0][ALP_C], (u8)Reg[0][BLU_C], (u8)Reg[0][GRN_C], (u8)Reg[0][RED_C]}; - if (!AlphaTest(output[ALP_C])) + if (!TevAlphaTest(output[ALP_C])) return; // z texture @@ -785,15 +785,16 @@ void Tev::Draw() output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8; } - if (!bpmem.zcontrol.zcomploc) + bool late_ztest = !bpmem.zcontrol.early_ztest || !g_SWVideoConfig.bZComploc; + if (late_ztest && bpmem.zmode.testenable) { + // TODO: Check against hw if these values get incremented even if depth testing is disabled if (++SWPixelEngine::pereg.perfZcompInputLo == 0) SWPixelEngine::pereg.perfZcompInputHi++; - if (bpmem.zmode.testenable) - { - if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) - return; - } + + if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) + return; + if (++SWPixelEngine::pereg.perfZcompOutputLo == 0) SWPixelEngine::pereg.perfZcompOutputHi++; } @@ -837,3 +838,31 @@ void Tev::SetRegColor(int reg, int comp, bool konst, s16 color) Reg[reg][comp] = color; } } + +void Tev::DoState(PointerWrap &p) +{ + p.DoArray(Reg, sizeof(Reg)); + + p.DoArray(KonstantColors, sizeof(KonstantColors)); + p.DoArray(TexColor,4); + p.DoArray(RasColor,4); + p.DoArray(StageKonst,4); + p.DoArray(Zero16,4); + + p.DoArray(FixedConstants,9); + p.Do(AlphaBump); + p.DoArray(IndirectTex, sizeof(IndirectTex)); + p.Do(TexCoord); + + p.DoArray(m_BiasLUT,4); + p.DoArray(m_ScaleLShiftLUT,4); + p.DoArray(m_ScaleRShiftLUT,4); + + p.DoArray(Position,3); + p.DoArray(Color, sizeof(Color)); + p.DoArray(Uv, 8); + p.DoArray(IndirectLod,4); + p.DoArray(IndirectLinear,4); + p.DoArray(TextureLod,16); + p.DoArray(TextureLinear,16); +} diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h index bdd265170c..1d1bc8d2ba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h @@ -19,6 +19,7 @@ #define _TEV_H_ #include "BPMemLoader.h" +#include "ChunkFile.h" class Tev { @@ -96,6 +97,8 @@ public: void SetRegColor(int reg, int comp, bool konst, s16 color); enum { ALP_C, BLU_C, GRN_C, RED_C }; + + void DoState(PointerWrap &p); }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp index cd984b987b..56101dc69d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp @@ -120,8 +120,18 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) TexImage0& ti0 = texUnit.texImage0[subTexmap]; TexTLUT& texTlut = texUnit.texTlut[subTexmap]; - u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5; - u8 *imageSrc = Memory::GetPointer(imageBase); + u8 *imageSrc, *imageSrcOdd = NULL; + if (texUnit.texImage1[subTexmap].image_type) + { + imageSrc = &texMem[texUnit.texImage1[subTexmap].tmem_even * TMEM_LINE_SIZE]; + if (ti0.format == GX_TF_RGBA8) + imageSrcOdd = &texMem[texUnit.texImage2[subTexmap].tmem_odd * TMEM_LINE_SIZE]; + } + else + { + u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5; + imageSrc = Memory::GetPointer(imageBase); + } int imageWidth = ti0.width; int imageHeight = ti0.height; @@ -182,17 +192,34 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) WrapCoord(imageSPlus1, tm0.wrap_s, imageWidth); WrapCoord(imageTPlus1, tm0.wrap_t, imageHeight); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); + if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type)) + { + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (fractS) * (fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (fractS) * (fractT)); + } + else + { + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageS, imageT, imageWidth); + SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageSPlus1, imageT, imageWidth); + AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageS, imageTPlus1, imageWidth); + AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageSPlus1, imageTPlus1, imageWidth); + AddTexel(sampledTex, texel, (fractS) * (fractT)); + } sample[0] = (u8)(texel[0] >> 14); sample[1] = (u8)(texel[1] >> 14); @@ -209,7 +236,10 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) WrapCoord(imageS, tm0.wrap_s, imageWidth); WrapCoord(imageT, tm0.wrap_t, imageHeight); - TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type)) + TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + else + TexDecoder_DecodeTexelRGBA8FromTmem(sample, imageSrc, imageSrcOdd, imageS, imageT, imageWidth); } } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h index 3a36a13307..80460edd60 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h @@ -20,6 +20,7 @@ #include #include +#include "ChunkFile.h" class Vec3 { @@ -111,6 +112,12 @@ public: { memset((void *)this,0,sizeof(float)*3); } + void DoState(PointerWrap &p) + { + p.Do(x); + p.Do(y); + p.Do(z); + } }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 2ba282788b..86fdc37b2a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -52,6 +52,9 @@ class VideoSoftware : public VideoBackend void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void DoState(PointerWrap &p); + +public: + void CheckInvalidState(); }; } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp index 792d90e61c..bd085a3edf 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp @@ -21,8 +21,6 @@ #include "FileUtil.h" #include "Core.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - template IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) : wxSpinCtrl(parent, -1, label, wxDefaultPosition, wxDefaultSize, style), @@ -30,7 +28,7 @@ IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& se { SetRange(minVal, maxVal); SetValue(m_setting); - _connect_macro_(this, IntegerSetting::UpdateValue, wxEVT_COMMAND_SPINCTRL_UPDATED, this); + Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &IntegerSetting::UpdateValue, this); } @@ -70,7 +68,7 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, // TODO: How to get the translated plugin name? choice_backend->SetStringSelection(wxString::FromAscii(g_video_backend->GetName().c_str())); - _connect_macro_(choice_backend, VideoConfigDialog::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDialog::Event_Backend, this); szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_rendering->Add(choice_backend, 1, 0, 0); diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 4bd98b9d70..bb2f7e6efa 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -20,6 +20,9 @@ true 0x00400000 + + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + \ No newline at end of file diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 5adc4159e0..5850450a5a 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props index 557e6350e7..754b4af53e 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh new file mode 100755 index 0000000000..e71e92b61a --- /dev/null +++ b/Tools/buildbot-try.sh @@ -0,0 +1,35 @@ +#! /bin/bash +# +# Submits a "buildbot try" message to the Dolphin buildbot with all the +# required options. + +opt_file=$HOME/.buildbot/options + +if ! [ -f "$opt_file" ]; then + echo >&2 "error: no .buildbot/options configuration file found" + echo >&2 "Read the docs: http://code.google.com/p/dolphin-emu/wiki/BuildbotTry" + exit 1 +fi + +if ! which buildbot >/dev/null 2>&1; then + echo >&2 "error: buildbot is not installed" + echo >&2 "Install it from your package manager, or use 'pip install buildbot'" + exit 1 +fi + +if ! git branch | grep -q '^* '; then + echo "Unable to determine the current Git branch. Input the Git branch name:" + read branchname +else + branchname=$(git branch | grep '^* ' | cut -d ' ' -f 2-) +fi + +shortrev=$(git describe --always --long --dirty=+ | sed 's/-g[0-9a-f]*\(+*\)$/\1/') + +author=$(grep try_username "$opt_file" | cut -d "'" -f 2) + +echo "Branch name: $branchname" +echo "Change author: $author" +echo "Short rev: $shortrev" + +buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $*